nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

am d9a22235: Hide Setup Wizard icon for stock keyboard 

* commit 'd9a2223570759d622c690b007369cf32f437f7e5':
  Hide Setup Wizard icon for stock keyboard
main
Tadashi G. Takaoka 2013-04-10 19:35:51 -07:00 committed by Android Git Automerger
parent 1aaaa64da8 d9a2223570
commit 9620943cc8
3 changed files with 34 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
java/res/values/setup-wizard.xml Normal file
View File

@ -0,0 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
/*
**
** Copyright 2013, The Android Open Source Project
**
** Licensed under the Apache License, Version 2.0 (the "License");
** you may not use this file except in compliance with the License.
** You may obtain a copy of the License at
**
** http://www.apache.org/licenses/LICENSE-2.0
**
** Unless required by applicable law or agreed to in writing, software
** distributed under the License is distributed on an "AS IS" BASIS,
** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
** See the License for the specific language governing permissions and
** limitations under the License.
*/
-->
<resources>
<bool name="config_setup_wizard_available">false</bool>
</resources>

5
java/src/com/android/inputmethod/latin/Settings.java
View File

@ -272,6 +272,11 @@ public final class Settings implements SharedPreferences.OnSharedPreferenceChang
public static boolean readShowSetupWizardIcon(final SharedPreferences prefs,
final Context context) {
final boolean enableSetupWizardByConfig = context.getResources().getBoolean(
R.bool.config_setup_wizard_available);
if (!enableSetupWizardByConfig) {
return false;
}
if (!prefs.contains(Settings.PREF_SHOW_SETUP_WIZARD_ICON)) {
final ApplicationInfo appInfo = context.getApplicationInfo();
final boolean isApplicationInSystemImage =

8
java/src/com/android/inputmethod/latin/SettingsFragment.java
View File

@ -165,6 +165,10 @@ public final class SettingsFragment extends InputMethodSettingsFragment
Settings.readKeyPreviewPopupEnabled(prefs, res));
}
if (!res.getBoolean(R.bool.config_setup_wizard_available)) {
removePreference(Settings.PREF_SHOW_SETUP_WIZARD_ICON, advancedSettings);
}
setPreferenceEnabled(Settings.PREF_INCLUDE_OTHER_IMES_IN_LANGUAGE_SWITCH_LIST,
Settings.readShowsLanguageSwitchKey(prefs));
@ -203,7 +207,9 @@ public final class SettingsFragment extends InputMethodSettingsFragment
final SharedPreferences prefs = getPreferenceManager().getSharedPreferences();
final CheckBoxPreference showSetupWizardIcon =
(CheckBoxPreference)findPreference(Settings.PREF_SHOW_SETUP_WIZARD_ICON);
showSetupWizardIcon.setChecked(Settings.readShowSetupWizardIcon(prefs, getActivity()));
if (showSetupWizardIcon != null) {
showSetupWizardIcon.setChecked(Settings.readShowSetupWizardIcon(prefs, getActivity()));
}
updateShowCorrectionSuggestionsSummary();
updateKeyPreviewPopupDelaySummary();
updateCustomInputStylesSummary();