Show the down back instead of the left back when the IME is up.

Change-Id: Ief99935c4341b492d985c5f705b41f75e6b4d291

2 files changed, 25 insertions, 2 deletions

diff --git a/packages/SystemUI/res/drawable/ic_sysbar_back_ime.xml b/packages/SystemUI/res/drawable/ic_sysbar_back_ime.xml
new file mode 100644
index 0000000..248496d
--- /dev/null
+++ b/packages/SystemUI/res/drawable/ic_sysbar_back_ime.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2008 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true" android:drawable="@drawable/ic_sysbar_back_ime_pressed" />
+    <item android:drawable="@drawable/ic_sysbar_back_ime_default" />
+</selector>
+
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletStatusBar.java
index 1fe2aea..3cae088 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletStatusBar.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletStatusBar.java
@@ -102,7 +102,7 @@ public class TabletStatusBar extends StatusBar {
     NotificationIconArea mNotificationIconArea;
     View mNavigationArea;
 
-    View mBackButton;
+    ImageView mBackButton;
     View mHomeButton;
     View mMenuButton;
     View mRecentButton;
@@ -287,7 +287,7 @@ public class TabletStatusBar extends StatusBar {
 
         // The navigation buttons
         mNavigationArea = sb.findViewById(R.id.navigationArea);
-        mBackButton = mNavigationArea.findViewById(R.id.back);
+        mBackButton = (ImageView)mNavigationArea.findViewById(R.id.back);
         mHomeButton = mNavigationArea.findViewById(R.id.home);
         mMenuButton = mNavigationArea.findViewById(R.id.menu);
         mRecentButton = mNavigationArea.findViewById(R.id.recent_apps);
@@ -657,6 +657,8 @@ public class TabletStatusBar extends StatusBar {
         }
         mInputMethodSwitchButton.setIMEButtonVisible(token, visible);
         mInputMethodShortcutButton.setIMEButtonVisible(token, visible);
+        mBackButton.setImageResource(
+                visible ? R.drawable.ic_sysbar_back_ime : R.drawable.ic_sysbar_back);
     }
 
     private boolean isImmersive() {