aboutsummaryrefslogtreecommitdiffstats
path: root/java/res
diff options
context:
space:
mode:
authorTadashi G. Takaoka <takaoka@google.com>2014-07-24 20:01:00 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-07-24 20:01:00 +0000
commit456cc9967831337c759ae2ba9c6a5621ef776110 (patch)
tree946f5f575e6ecfcb731ff451a9f743a2a140a55f /java/res
parent129f05867fc881aca96c21ae2b8aac7ae0440c42 (diff)
parenta270ac4a61ff64f5d262a212b0bf4c128d3ce8d7 (diff)
downloadlatinime-456cc9967831337c759ae2ba9c6a5621ef776110.tar.gz
latinime-456cc9967831337c759ae2ba9c6a5621ef776110.tar.xz
latinime-456cc9967831337c759ae2ba9c6a5621ef776110.zip
am a270ac4a: Remove unnecessary DebugSettingsActivity, use fragment directly
* commit 'a270ac4a61ff64f5d262a212b0bf4c128d3ce8d7': Remove unnecessary DebugSettingsActivity, use fragment directly
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