summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Adam Powell <adamp@google.com> 2011-08-22 17:02:24 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 2011-08-22 17:02:24 -0700
commitdce2ff8681c97658b1b520fd9cc244ef7a603664 (patch)
tree444f3bc3d82aeed3081357a6292121cb4a833094
parent0ddc899dc5f2acebb1daa19369dbfe81d257690d (diff)
parent53376cb1798aa5f8bad6c9ba0dfc4b05530d6fe9 (diff)
Merge "Fix bug 5185375 - ICS Fit+Finish: Full-screen IME"
-rw-r--r--core/res/res/layout/input_method_extract_view.xml1
-rw-r--r--core/res/res/values/themes.xml4
2 files changed, 2 insertions, 3 deletions
diff --git a/core/res/res/layout/input_method_extract_view.xml b/core/res/res/layout/input_method_extract_view.xml
index 60bc24c246ab..a3e4961ff5ff 100644
--- a/core/res/res/layout/input_method_extract_view.xml
+++ b/core/res/res/layout/input_method_extract_view.xml
@@ -40,7 +40,6 @@
android:layout_height="match_parent"
android:paddingLeft="8dip"
android:paddingRight="8dip"
- android:background="@android:drawable/keyboard_accessory_bg_landscape"
>
<android.inputmethodservice.ExtractButton android:id="@+id/inputExtractAction"
diff --git a/core/res/res/values/themes.xml b/core/res/res/values/themes.xml
index dd8bdd85938a..903fc047883f 100644
--- a/core/res/res/values/themes.xml
+++ b/core/res/res/values/themes.xml
@@ -717,9 +717,9 @@ please see themes_device_defaults.xml.
{@link android.inputmethodservice.InputMethodService} class.
this inherits from Theme.Panel, but sets up IME appropriate animations
and a few custom attributes. -->
- <style name="Theme.Holo.InputMethod" parent="Theme.Holo.Panel">
+ <style name="Theme.Holo.InputMethod" parent="Theme.Holo.Light.Panel">
<item name="android:windowAnimationStyle">@android:style/Animation.InputMethod</item>
- <item name="android:imeFullscreenBackground">@android:drawable/input_method_fullscreen_background_holo</item>
+ <item name="android:imeFullscreenBackground">@android:drawable/screen_background_selector_light</item>
<item name="android:imeExtractEnterAnimation">@android:anim/input_method_extract_enter</item>
<item name="android:imeExtractExitAnimation">@android:anim/input_method_extract_exit</item>
</style>