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

am a327485e: Change the preference name for a theme and remove a preference settings 

Merge commit 'a327485e595c9f7676989097c830ff452085d4c9' into gingerbread-plus-aosp

* commit 'a327485e595c9f7676989097c830ff452085d4c9':
  Change the preference name for a theme and remove a preference settings
main
satok 2010-09-01 22:05:01 -07:00 committed by Android Git Automerger
parent 308acfa714 a327485e59
commit c5363012b8
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
java/res/xml/prefs.xml
View File

@ -61,14 +61,14 @@
android:defaultValue="@string/voice_mode_main" android:defaultValue="@string/voice_mode_main"
/> />
<ListPreference <!-- <ListPreference
android:key="keyboard_layout" android:key="keyboard_layout"
android:title="@string/keyboard_layout" android:title="@string/keyboard_layout"
android:persistent="true" android:persistent="true"
android:entryValues="@array/keyboard_layout_modes_values" android:entryValues="@array/keyboard_layout_modes_values"
android:entries="@array/keyboard_layout_modes" android:entries="@array/keyboard_layout_modes"
android:defaultValue="4" android:defaultValue="4"
/> />-->
<PreferenceScreen <PreferenceScreen
android:title="@string/language_selection_title" android:title="@string/language_selection_title"

2
java/src/com/android/inputmethod/latin/KeyboardSwitcher.java
View File

@ -45,7 +45,7 @@ public class KeyboardSwitcher implements SharedPreferences.OnSharedPreferenceCha
public static final int KEYBOARDMODE_WEB = R.id.mode_webentry; public static final int KEYBOARDMODE_WEB = R.id.mode_webentry;
public static final String DEFAULT_LAYOUT_ID = "4"; 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 [] { private static final int[] THEMES = new int [] {
R.layout.input_basic, R.layout.input_basic_highcontrast, R.layout.input_stone_normal, R.layout.input_basic, R.layout.input_basic_highcontrast, R.layout.input_stone_normal,
R.layout.input_stone_bold, R.layout.input_gingerbread}; R.layout.input_stone_bold, R.layout.input_gingerbread};