summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdrian Roos <roosa@google.com>2014-10-20 15:25:27 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-10-20 15:25:27 +0000
commit7850cb330f25f42fb1499aabb157f0fdec2178b7 (patch)
tree14e427d2436985f06b4d610b5cfa9033edaadc01
parentbfa827f30285677cfc49d12d50181c1c840472f9 (diff)
parent0c458aa5158245fef31c78b84be28e574cf8515e (diff)
downloadframeworks_base-7850cb330f25f42fb1499aabb157f0fdec2178b7.zip
frameworks_base-7850cb330f25f42fb1499aabb157f0fdec2178b7.tar.gz
frameworks_base-7850cb330f25f42fb1499aabb157f0fdec2178b7.tar.bz2
am 0c458aa5: am 7356a713: Merge "Keyguard: Show IME automatically on tablets" into lmp-mr1-dev
* commit '0c458aa5158245fef31c78b84be28e574cf8515e': Keyguard: Show IME automatically on tablets
-rw-r--r--core/res/res/values-sw600dp/bools.xml1
-rw-r--r--core/res/res/values/bools.xml1
-rw-r--r--packages/Keyguard/res/values-sw600dp/bools.xml1
3 files changed, 0 insertions, 3 deletions
diff --git a/core/res/res/values-sw600dp/bools.xml b/core/res/res/values-sw600dp/bools.xml
index ddc48c5..00f45c1 100644
--- a/core/res/res/values-sw600dp/bools.xml
+++ b/core/res/res/values-sw600dp/bools.xml
@@ -19,7 +19,6 @@
<bool name="show_ongoing_ime_switcher">true</bool>
<bool name="kg_share_status_area">false</bool>
<bool name="kg_sim_puk_account_full_screen">false</bool>
- <bool name="kg_show_ime_at_screen_on">false</bool>
<!-- No camera for you, tablet user -->
<bool name="kg_enable_camera_default_widget">false</bool>
<bool name="kg_center_small_widgets_vertically">true</bool>
diff --git a/core/res/res/values/bools.xml b/core/res/res/values/bools.xml
index 18e4f2f..457131a 100644
--- a/core/res/res/values/bools.xml
+++ b/core/res/res/values/bools.xml
@@ -18,7 +18,6 @@
<bool name="kg_enable_camera_default_widget">true</bool>
<bool name="kg_center_small_widgets_vertically">false</bool>
<bool name="kg_top_align_page_shrink_on_bouncer_visible">true</bool>
- <bool name="kg_show_ime_at_screen_on">true</bool>
<bool name="action_bar_embed_tabs">true</bool>
<bool name="action_bar_embed_tabs_pre_jb">false</bool>
<bool name="split_action_bar_is_narrow">true</bool>
diff --git a/packages/Keyguard/res/values-sw600dp/bools.xml b/packages/Keyguard/res/values-sw600dp/bools.xml
index ddc48c5..00f45c1 100644
--- a/packages/Keyguard/res/values-sw600dp/bools.xml
+++ b/packages/Keyguard/res/values-sw600dp/bools.xml
@@ -19,7 +19,6 @@
<bool name="show_ongoing_ime_switcher">true</bool>
<bool name="kg_share_status_area">false</bool>
<bool name="kg_sim_puk_account_full_screen">false</bool>
- <bool name="kg_show_ime_at_screen_on">false</bool>
<!-- No camera for you, tablet user -->
<bool name="kg_enable_camera_default_widget">false</bool>
<bool name="kg_center_small_widgets_vertically">true</bool>