From 9b40747aaa98ad4e8f423d7d1a9ed0f736f18dba Mon Sep 17 00:00:00 2001
From: satok <satok@google.com>
Date: Tue, 7 Dec 2010 14:36:51 +0900
Subject: Move IME button to right side by new desing spec

Bug: 3212206

- And remove mic icon

Change-Id: I46481db9afe500b244da66e1615795bf55e9a734
---
 packages/SystemUI/res/layout-xlarge/status_bar.xml | 24 ++++++++--------------
 .../statusbar/tablet/InputMethodButton.java        |  3 ++-
 .../systemui/statusbar/tablet/TabletStatusBar.java |  3 ---
 3 files changed, 10 insertions(+), 20 deletions(-)

diff --git a/packages/SystemUI/res/layout-xlarge/status_bar.xml b/packages/SystemUI/res/layout-xlarge/status_bar.xml
index cd67d1a..f074e98 100644
--- a/packages/SystemUI/res/layout-xlarge/status_bar.xml
+++ b/packages/SystemUI/res/layout-xlarge/status_bar.xml
@@ -35,6 +35,14 @@
             android:layout_alignParentRight="true"
             android:orientation="horizontal"
             >
+            <com.android.systemui.statusbar.tablet.InputMethodButton
+                android:id="@+id/imeSwitchButton"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:layout_marginLeft="8dip"
+                android:src="@drawable/ic_sysbar_ime_default"
+                android:visibility="invisible"
+                />
             <com.android.systemui.statusbar.tablet.NotificationIconArea
                 android:id="@+id/notificationIcons"
                 android:layout_width="wrap_content"
@@ -191,22 +199,6 @@
                     android:visibility="gone"
                     />
             </com.android.systemui.statusbar.tablet.ShirtPocket>
-            <com.android.systemui.statusbar.tablet.InputMethodButton
-                android:id="@+id/imeSwitchButton"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:layout_marginLeft="8dip"
-                android:src="@drawable/ic_sysbar_ime_default"
-                android:visibility="invisible"
-                />
-            <com.android.systemui.statusbar.tablet.InputMethodButton
-                android:id="@+id/imeShortcutButton"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:layout_marginLeft="8dip"
-                android:src="@drawable/ic_sysbar_ime_default"
-                android:visibility="invisible"
-                />
         </LinearLayout>
 
         <!-- lights out mode: "shadow" views -->
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/tablet/InputMethodButton.java b/packages/SystemUI/src/com/android/systemui/statusbar/tablet/InputMethodButton.java
index 5f14f74..66ed727 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/tablet/InputMethodButton.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/tablet/InputMethodButton.java
@@ -45,7 +45,8 @@ public class InputMethodButton extends ImageView {
     private static final boolean DEBUG = false;
 
     private static final int ID_IME_SWITCH_BUTTON = R.id.imeSwitchButton;
-    private static final int ID_IME_SHORTCUT_BUTTON = R.id.imeShortcutButton;
+    // IME shortcut button is disabled.
+    private static final int ID_IME_SHORTCUT_BUTTON = 0;
 
     // other services we wish to talk to
     private final InputMethodManager mImm;
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 b0f6a18..f561d04 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletStatusBar.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletStatusBar.java
@@ -108,7 +108,6 @@ public class TabletStatusBar extends StatusBar {
     View mRecentButton;
 
     InputMethodButton mInputMethodSwitchButton;
-    InputMethodButton mInputMethodShortcutButton;
 
     NotificationPanel mNotificationPanel;
     NotificationPeekPanel mNotificationPeekWindow;
@@ -304,7 +303,6 @@ public class TabletStatusBar extends StatusBar {
 
         // The bar contents buttons
         mInputMethodSwitchButton = (InputMethodButton) sb.findViewById(R.id.imeSwitchButton);
-        mInputMethodShortcutButton = (InputMethodButton) sb.findViewById(R.id.imeShortcutButton);
 
         // "shadows" of the status bar features, for lights-out mode
         mBackShadow = sb.findViewById(R.id.back_shadow);
@@ -698,7 +696,6 @@ public class TabletStatusBar extends StatusBar {
             Slog.d(TAG, (visible?"showing":"hiding") + " the IME button");
         }
         mInputMethodSwitchButton.setIMEButtonVisible(token, visible);
-        mInputMethodShortcutButton.setIMEButtonVisible(token, visible);
         mBackButton.setImageResource(
                 visible ? R.drawable.ic_sysbar_back_ime : R.drawable.ic_sysbar_back);
     }
-- 
cgit v1.1