aboutsummaryrefslogtreecommitdiffstats
path: root/java/res
diff options
context:
space:
mode:
authorTadashi G. Takaoka <takaoka@google.com>2014-07-23 16:50:58 -0700
committerTadashi G. Takaoka <takaoka@google.com>2014-07-23 17:09:46 -0700
commita270ac4a61ff64f5d262a212b0bf4c128d3ce8d7 (patch)
tree22d05699191bca746ad1e7209bb3146cea6f4d41 /java/res
parent3f513f107ef0754da2b1c704167325151ce9b7ea (diff)
downloadlatinime-a270ac4a61ff64f5d262a212b0bf4c128d3ce8d7.tar.gz
latinime-a270ac4a61ff64f5d262a212b0bf4c128d3ce8d7.tar.xz
latinime-a270ac4a61ff64f5d262a212b0bf4c128d3ce8d7.zip
Remove unnecessary DebugSettingsActivity, use fragment directly
This CL must be checked in together with I1db2e848ab. Bug: 16522808 Change-Id: I08a1b0c300c504def609cbb53462d215d1ead15c
Diffstat (limited to 'java/res')
-rw-r--r--java/res/xml/prefs.xml1
-rw-r--r--java/res/xml/prefs_screen_debug.xml (renamed from java/res/xml/prefs_for_debug.xml)0
2 files changed, 1 insertions, 0 deletions
diff --git a/java/res/xml/prefs.xml b/java/res/xml/prefs.xml
index 550e71ada..6febb3126 100644
--- a/java/res/xml/prefs.xml
+++ b/java/res/xml/prefs.xml
@@ -199,6 +199,7 @@
android:defaultValue="true"
android:persistent="true" />
<PreferenceScreen
+ android:fragment="com.android.inputmethod.latin.settings.DebugSettings"
android:key="screen_debug"
android:title="Debug settings"
android:defaultValue="false"
diff --git a/java/res/xml/prefs_for_debug.xml b/java/res/xml/prefs_screen_debug.xml
index ae29a8a82..ae29a8a82 100644
--- a/java/res/xml/prefs_for_debug.xml
+++ b/java/res/xml/prefs_screen_debug.xml