commit 69cf85d8e3519e34ab6a9d6d19385c6ba7ab6623
author Jean Chalard <jchalard@google.com> Mon Apr 16 01:28:40 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Mon Apr 16 01:28:40 2012 -0700
tree d234263e2ce09233a8bd735a4561678b24b224a3
parent 8b833071a14b8f367d00be4a338f2407ee312516
parent 3f675f70601575a2964a3a4f5d8fcd639446238d

Merge "Fix a large native memory leak."

java/src/com/android/inputmethod/keyboard/KeyboardView.java

diff --git a/java/src/com/android/inputmethod/keyboard/KeyboardView.java b/java/src/com/android/inputmethod/keyboard/KeyboardView.java
index 804ccf6..2d587ad 100644
--- a/java/src/com/android/inputmethod/keyboard/KeyboardView.java
+++ b/java/src/com/android/inputmethod/keyboard/KeyboardView.java
@@ -713,9 +713,9 @@
         final int keyWidth = key.mWidth - key.mVisualInsetsLeft - key.mVisualInsetsRight;
         final int keyHeight = key.mHeight;
 
+        paint.setTypeface(params.mKeyTextStyle);
         paint.setTextSize(params.mKeyHintLetterSize);
         paint.setColor(params.mKeyHintLabelColor);
-        params.blendAlpha(paint);
         paint.setTextAlign(Align.CENTER);
         final float hintX = keyWidth - params.mKeyHintLetterPadding
                 - getCharWidth(KEY_LABEL_REFERENCE_CHAR, paint) / 2;

java/src/com/android/inputmethod/latin/SettingsActivity.java

diff --git a/java/src/com/android/inputmethod/latin/SettingsActivity.java b/java/src/com/android/inputmethod/latin/SettingsActivity.java
index b85a936..5567013 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 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);
-    }
 }

java/src/com/android/inputmethod/latin/Utils.java

diff --git a/java/src/com/android/inputmethod/latin/Utils.java b/java/src/com/android/inputmethod/latin/Utils.java
index 0485c88..036ff74 100644
--- a/java/src/com/android/inputmethod/latin/Utils.java
+++ b/java/src/com/android/inputmethod/latin/Utils.java
@@ -466,11 +466,12 @@
     }
 
     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)) {