commit a50673330e012f6cca02b83eca1c047b8da319e0
author Tadashi G. Takaoka <takaoka@google.com> Fri Mar 15 15:30:43 2013 +0900
committer Tadashi G. Takaoka <takaoka@google.com> Fri Mar 15 15:33:27 2013 +0900
tree 4f6e7d848b37aa16fa6d1d3f77d30e1cce1bb4be
parent 620be98feb47f7dd66ce70cbdba2128737621fa3

Disable the header list of DebugSettingsActivity

This change addresses the issue that the debug settings on 10-inch
tablet doesn't show up.

Change-Id: I60540cf21276869a3ca81b7b0154056ce7d93ff1

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

diff --git a/java/src/com/android/inputmethod/latin/DebugSettingsActivity.java b/java/src/com/android/inputmethod/latin/DebugSettingsActivity.java
index 2a501a6..e1b5a80 100644
--- a/java/src/com/android/inputmethod/latin/DebugSettingsActivity.java
+++ b/java/src/com/android/inputmethod/latin/DebugSettingsActivity.java
@@ -21,15 +21,18 @@
 import android.preference.PreferenceActivity;
 
 public final class DebugSettingsActivity extends PreferenceActivity {
+    private static final String DEFAULT_FRAGMENT = DebugSettings.class.getName();
+
     @Override
     public Intent getIntent() {
-        final Intent modIntent = new Intent(super.getIntent());
-        modIntent.putExtra(EXTRA_SHOW_FRAGMENT, DebugSettings.class.getName());
-        return modIntent;
+        final Intent intent = super.getIntent();
+        intent.putExtra(EXTRA_SHOW_FRAGMENT, DEFAULT_FRAGMENT);
+        intent.putExtra(EXTRA_NO_HEADERS, true);
+        return intent;
     }
 
     @Override
-    protected void onCreate(Bundle savedInstanceState) {
+    protected void onCreate(final Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setTitle(R.string.english_ime_debug_settings);
     }

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 ed8cf6d..99b572e 100644
--- a/java/src/com/android/inputmethod/latin/SettingsActivity.java
+++ b/java/src/com/android/inputmethod/latin/SettingsActivity.java
@@ -25,9 +25,7 @@
     @Override
     public Intent getIntent() {
         final Intent intent = super.getIntent();
-        if (!intent.hasExtra(EXTRA_SHOW_FRAGMENT)) {
-            intent.putExtra(EXTRA_SHOW_FRAGMENT, DEFAULT_FRAGMENT);
-        }
+        intent.putExtra(EXTRA_SHOW_FRAGMENT, DEFAULT_FRAGMENT);
         intent.putExtra(EXTRA_NO_HEADERS, true);
         return intent;
     }