From a50673330e012f6cca02b83eca1c047b8da319e0 Mon Sep 17 00:00:00 2001 From: "Tadashi G. Takaoka" Date: Fri, 15 Mar 2013 15:30:43 +0900 Subject: [PATCH] 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 --- .../inputmethod/latin/DebugSettingsActivity.java | 11 +++++++---- .../android/inputmethod/latin/SettingsActivity.java | 4 +--- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/java/src/com/android/inputmethod/latin/DebugSettingsActivity.java b/java/src/com/android/inputmethod/latin/DebugSettingsActivity.java index 2a501a665..e1b5a802e 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.os.Bundle; 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); } diff --git a/java/src/com/android/inputmethod/latin/SettingsActivity.java b/java/src/com/android/inputmethod/latin/SettingsActivity.java index ed8cf6d8f..99b572e06 100644 --- a/java/src/com/android/inputmethod/latin/SettingsActivity.java +++ b/java/src/com/android/inputmethod/latin/SettingsActivity.java @@ -25,9 +25,7 @@ public final class SettingsActivity extends PreferenceActivity { @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; }