aboutsummaryrefslogtreecommitdiffstats
path: root/java
diff options
context:
space:
mode:
authorKen Wakasa <kwakasa@google.com>2010-09-17 02:41:51 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-09-17 02:41:51 -0700
commit941fa185accfce2a03c3c0b4c6092d50f40bdbad (patch)
tree2f6e86f13e02ba0744a56e2a61e7ad7a57f79057 /java
parent300362f20982974d07876dee01b4550b8e54d449 (diff)
parent86fa29ade9beb1d4b41b4b7b13a006abc23b0ac0 (diff)
downloadlatinime-941fa185accfce2a03c3c0b4c6092d50f40bdbad.tar.gz
latinime-941fa185accfce2a03c3c0b4c6092d50f40bdbad.tar.xz
latinime-941fa185accfce2a03c3c0b4c6092d50f40bdbad.zip
am 86fa29ad: DO NOT MERGE. Get rid of the user feedback preference from Gingerbread.
Merge commit '86fa29ade9beb1d4b41b4b7b13a006abc23b0ac0' into gingerbread-plus-aosp * commit '86fa29ade9beb1d4b41b4b7b13a006abc23b0ac0': DO NOT MERGE. Get rid of the user feedback preference from Gingerbread.
Diffstat (limited to 'java')
-rw-r--r--java/res/xml/prefs.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/java/res/xml/prefs.xml b/java/res/xml/prefs.xml
index 2e6dffaf4..a554ad27b 100644
--- a/java/res/xml/prefs.xml
+++ b/java/res/xml/prefs.xml
@@ -51,13 +51,13 @@
android:defaultValue="true"
/>
- <CheckBoxPreference
+ <!-- <CheckBoxPreference
android:key="enable_logging"
android:title="@string/prefs_enable_log"
android:summary="@string/prefs_description_log"
android:persistent="true"
android:defaultValue="false"
- />
+ />-->
<ListPreference
android:key="settings_key"