aboutsummaryrefslogtreecommitdiffstats
path: root/java/src
diff options
context:
space:
mode:
authorTadashi G. Takaoka <takaoka@google.com>2013-03-15 15:30:43 +0900
committerTadashi G. Takaoka <takaoka@google.com>2013-03-15 15:33:27 +0900
commita50673330e012f6cca02b83eca1c047b8da319e0 (patch)
tree4f6e7d848b37aa16fa6d1d3f77d30e1cce1bb4be /java/src
parent620be98feb47f7dd66ce70cbdba2128737621fa3 (diff)
downloadlatinime-a50673330e012f6cca02b83eca1c047b8da319e0.tar.gz
latinime-a50673330e012f6cca02b83eca1c047b8da319e0.tar.xz
latinime-a50673330e012f6cca02b83eca1c047b8da319e0.zip
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
Diffstat (limited to 'java/src')
-rw-r--r--java/src/com/android/inputmethod/latin/DebugSettingsActivity.java11
-rw-r--r--java/src/com/android/inputmethod/latin/SettingsActivity.java4
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;
}