diff --git a/java/res/drawable/keyboard_background_4.png b/java/res/drawable/keyboard_background_4.png
deleted file mode 100644
index 74fc2e7627753059f4f1143ec60b702b7dabd936..0000000000000000000000000000000000000000
Binary files a/java/res/drawable/keyboard_background_4.png and /dev/null differ
diff --git a/java/res/drawable/keyboard_background_5.png b/java/res/drawable/keyboard_background_5.png
deleted file mode 100644
index 2e0fb289fc89ec798592502f3ef1974b99960f2a..0000000000000000000000000000000000000000
Binary files a/java/res/drawable/keyboard_background_5.png and /dev/null differ
diff --git a/java/res/layout/input3.xml b/java/res/layout/input3.xml
deleted file mode 100755
index a4295f7f47dff11671e70b12a48b59de44658439..0000000000000000000000000000000000000000
--- a/java/res/layout/input3.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2010, 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.
-*/
--->
-
-<com.android.inputmethod.latin.LatinKeyboardView
- xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:latin="http://schemas.android.com/apk/res/com.google.android.inputmethod.latin"
- android:id="@android:id/keyboardView"
- android:layout_alignParentBottom="true"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:background="@drawable/keyboard_background_4"
-
- latin:keyBackground="@drawable/btn_keyboard_key2"
- />
diff --git a/java/res/layout/input4.xml b/java/res/layout/input4.xml
deleted file mode 100755
index b5da9d48f6760e87c7c78b2c643e0c8a05415ad1..0000000000000000000000000000000000000000
--- a/java/res/layout/input4.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2010, 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.
-*/
--->
-
-<com.android.inputmethod.latin.LatinKeyboardView
- xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:latin="http://schemas.android.com/apk/res/com.google.android.inputmethod.latin"
- android:id="@android:id/keyboardView"
- android:layout_alignParentBottom="true"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:background="@drawable/keyboard_background_4"
-
- latin:keyBackground="@drawable/btn_keyboard_key3"
- />
diff --git a/java/res/layout/input5.xml b/java/res/layout/input5.xml
deleted file mode 100755
index 2de11dfffaff4a7b82f34d3b8225a2a51f494a63..0000000000000000000000000000000000000000
--- a/java/res/layout/input5.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2010, 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.
-*/
--->
-
-<com.android.inputmethod.latin.LatinKeyboardView
- xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:latin="http://schemas.android.com/apk/res/com.google.android.inputmethod.latin"
- android:id="@android:id/keyboardView"
- android:layout_alignParentBottom="true"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:background="@drawable/keyboard_background_5"
-
- latin:keyBackground="@drawable/btn_keyboard_key2"
- />
diff --git a/java/res/layout/input6.xml b/java/res/layout/input6.xml
deleted file mode 100755
index 54f31044fa2da1e113b26bceaac1799fc3b3bfa4..0000000000000000000000000000000000000000
--- a/java/res/layout/input6.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2010, 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.
-*/
--->
-
-<com.android.inputmethod.latin.LatinKeyboardView
- xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:latin="http://schemas.android.com/apk/res/com.google.android.inputmethod.latin"
- android:id="@android:id/keyboardView"
- android:layout_alignParentBottom="true"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:background="@drawable/keyboard_background_5"
-
- latin:keyBackground="@drawable/btn_keyboard_key3"
- />
diff --git a/java/res/values/strings.xml b/java/res/values/strings.xml
index e310da7f692f785b3fab949b5bff7f0ab96475bd..64b8dbe59efd38f15cf23fbb212df09fbb675def 100644
--- a/java/res/values/strings.xml
+++ b/java/res/values/strings.xml
@@ -332,19 +332,11 @@
<string name="keyboard_layout">Keyboard Theme</string>
<string name="layout_basic" translatable="false">Basic</string>
<string name="layout_high_contrast" translatable="false">Basic (High Contrast)</string>
- <string name="layout_blue_ribbon" translatable="false">Blue Ribbon</string>
- <string name="layout_dazzle" translatable="false">Dazzle</string>
- <string name="layout_blue_ribbon_high" translatable="false">Blue Ribbon (High Contrast)</string>
- <string name="layout_dazzle_high" translatable="false">Dazzle (High Contrast)</string>
<string name="layout_stone" translatable="false">Default</string>
<string-array name="keyboard_layout_modes" translatable="false">
<item>@string/layout_basic</item>
<item>@string/layout_high_contrast</item>
- <item>@string/layout_blue_ribbon</item>
- <item>@string/layout_blue_ribbon_high</item>
- <item>@string/layout_dazzle</item>
- <item>@string/layout_dazzle_high</item>
<item>@string/layout_stone</item>
</string-array>
@@ -352,10 +344,6 @@
<item>0</item>
<item>1</item>
<item>2</item>
- <item>3</item>
- <item>4</item>
- <item>5</item>
- <item>6</item>
</string-array>
<string name="prefs_debug_mode">Debug (Temporary)</string>
diff --git a/java/src/com/android/inputmethod/latin/KeyboardSwitcher.java b/java/src/com/android/inputmethod/latin/KeyboardSwitcher.java
index 3c0ab5a4e6ed5b3e2b658c86d69c4eab9469e84d..665e16aeca0f14a32d0312c1d9765d2500629675 100644
--- a/java/src/com/android/inputmethod/latin/KeyboardSwitcher.java
+++ b/java/src/com/android/inputmethod/latin/KeyboardSwitcher.java
@@ -48,12 +48,10 @@ public class KeyboardSwitcher implements SharedPreferences.OnSharedPreferenceCha
public static final int KEYBOARDMODE_IM = R.id.mode_im;
public static final int KEYBOARDMODE_WEB = R.id.mode_webentry;
- public static final String DEFAULT_LAYOUT_ID = "6";
+ public static final String DEFAULT_LAYOUT_ID = "2";
public static final String PREF_KEYBOARD_LAYOUT = "keyboard_layout";
private static final int[] LAYOUTS = new int [] {
- R.layout.input, R.layout.input2, R.layout.input3, R.layout.input4, R.layout.input5,
- R.layout.input6, R.layout.input7
- };
+ R.layout.input, R.layout.input2, R.layout.input7};
private static final int SYMBOLS_MODE_STATE_NONE = 0;
private static final int SYMBOLS_MODE_STATE_BEGIN = 1;
diff --git a/java/src/com/android/inputmethod/latin/LatinImeLogger.java b/java/src/com/android/inputmethod/latin/LatinImeLogger.java
index 1e467d9a6195ab05a26478ad461f74fa11da068a..42d5689d23ff0cb9bbce263b6416d169cb5c7067 100644
--- a/java/src/com/android/inputmethod/latin/LatinImeLogger.java
+++ b/java/src/com/android/inputmethod/latin/LatinImeLogger.java
@@ -263,6 +263,10 @@ public class LatinImeLogger implements SharedPreferences.OnSharedPreferenceChang
if (sLOGPRINT) {
Log.d(TAG, "Log theme Id. (1)");
}
+ // TODO: Not to convert theme ID here. Currently "2" is treated as "6" in a log server.
+ if (mThemeId == "2") {
+ mThemeId = "6";
+ }
mLogBuffer.add(new LogEntry (time, ID_THEME_ID,
new String[] {mThemeId}));
}