2 files changed, 5 insertions, 10 deletions
diff --git a/java/src/com/android/inputmethod/latin/SettingsActivity.java b/java/src/com/android/inputmethod/latin/SettingsActivity.java
index b85a936ad..556701364 100644
--- a/java/src/com/android/inputmethod/latin/SettingsActivity.java
+++ b/java/src/com/android/inputmethod/latin/SettingsActivity.java
@@ -17,7 +17,6 @@
 package com.android.inputmethod.latin;
 
 import android.content.Intent;
-import android.os.Bundle;
 import android.preference.PreferenceActivity;
 
 public class SettingsActivity extends PreferenceActivity {
@@ -25,12 +24,7 @@ public class SettingsActivity extends PreferenceActivity {
     public Intent getIntent() {
         final Intent modIntent = new Intent(super.getIntent());
         modIntent.putExtra(EXTRA_SHOW_FRAGMENT, Settings.class.getName());
+        modIntent.putExtra(EXTRA_NO_HEADERS, true);
         return modIntent;
     }
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setTitle(R.string.english_ime_settings);
-    }
 }
diff --git a/java/src/com/android/inputmethod/latin/Utils.java b/java/src/com/android/inputmethod/latin/Utils.java
index 0485c881b..036ff74b8 100644
--- a/java/src/com/android/inputmethod/latin/Utils.java
+++ b/java/src/com/android/inputmethod/latin/Utils.java
@@ -466,11 +466,12 @@ public class Utils {
     }
 
     private static final String HARDWARE_PREFIX = Build.HARDWARE + ",";
-    private static final HashMap<Integer, String> sDeviceOverrideValueMap =
-            new HashMap<Integer, String>();
+    private static final HashMap<String, String> sDeviceOverrideValueMap =
+            new HashMap<String, String>();
 
     public static String getDeviceOverrideValue(Resources res, int overrideResId, String defValue) {
-        final Integer key = overrideResId;
+        final int orientation = res.getConfiguration().orientation;
+        final String key = overrideResId + "-" + orientation;
         if (!sDeviceOverrideValueMap.containsKey(key)) {
             String overrideValue = defValue;
             for (final String element : res.getStringArray(overrideResId)) {