diff options
| author |   satok <satok@google.com> | 2010-09-01 22:07:20 -0700 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2010-09-01 22:07:20 -0700 |
| commit | 11b448528bf7be966e8d0406d3c6462dcf8e32b6 (patch) | |
| tree | d03e220ed4c3ea295a4413a0649876d022eb1511 /java | |
| parent | ee01bf14089dead86a6a662d82cdafebba6cdab2 (diff) | |
| parent | c5363012b846733e9a3b7ce7de5b04e58644bedc (diff) | |
| download | latinime-11b448528bf7be966e8d0406d3c6462dcf8e32b6.tar.gz latinime-11b448528bf7be966e8d0406d3c6462dcf8e32b6.tar.xz latinime-11b448528bf7be966e8d0406d3c6462dcf8e32b6.zip | |
am c5363012: am a327485e: Change the preference name for a theme and remove a preference settings
Merge commit 'c5363012b846733e9a3b7ce7de5b04e58644bedc'
* commit 'c5363012b846733e9a3b7ce7de5b04e58644bedc':
Change the preference name for a theme and remove a preference settings
Diffstat (limited to 'java')
| -rw-r--r-- | java/res/xml/prefs.xml | 4 | ||||
| -rw-r--r-- | java/src/com/android/inputmethod/latin/KeyboardSwitcher.java | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/java/res/xml/prefs.xml b/java/res/xml/prefs.xml index 20e839b3d..be484b28f 100644 --- a/java/res/xml/prefs.xml +++ b/java/res/xml/prefs.xml @@ -61,14 +61,14 @@ android:defaultValue="@string/voice_mode_main" /> - <ListPreference + <!-- <ListPreference android:key="keyboard_layout" android:title="@string/keyboard_layout" android:persistent="true" android:entryValues="@array/keyboard_layout_modes_values" android:entries="@array/keyboard_layout_modes" android:defaultValue="4" - /> + />--> <PreferenceScreen android:title="@string/language_selection_title" diff --git a/java/src/com/android/inputmethod/latin/KeyboardSwitcher.java b/java/src/com/android/inputmethod/latin/KeyboardSwitcher.java index 223198b0b..9c0a5a3aa 100644 --- a/java/src/com/android/inputmethod/latin/KeyboardSwitcher.java +++ b/java/src/com/android/inputmethod/latin/KeyboardSwitcher.java @@ -45,7 +45,7 @@ public class KeyboardSwitcher implements SharedPreferences.OnSharedPreferenceCha public static final int KEYBOARDMODE_WEB = R.id.mode_webentry; public static final String DEFAULT_LAYOUT_ID = "4"; - public static final String PREF_KEYBOARD_LAYOUT = "keyboard_layout"; + public static final String PREF_KEYBOARD_LAYOUT = "pref_keyboard_layout_20100902"; private static final int[] THEMES = new int [] { R.layout.input_basic, R.layout.input_basic_highcontrast, R.layout.input_stone_normal, R.layout.input_stone_bold, R.layout.input_gingerbread}; |