From a84a69f2eb3e3ddb11aa01670d9aeda1cdba4068 Mon Sep 17 00:00:00 2001
From: Daniel Sandler <dsandler@google.com>
Date: Fri, 8 Oct 2010 10:39:46 -0400
Subject: [PATCH] Start of input method control on system bar.

This change creates a new icon to the right of the
notification area for the IMM to expose control over the
current IME. Currently it shows the IME subtype picker.

TODO: Connect directly to the IMMService to show the correct
icon (and hide the icon entirely when the input panel is not
visible).

Bug: 2975425
Change-Id: If07f30867b81950a0a86b00807a41e2ff2af389c
---
 .../drawable-mdpi/ic_sysbar_ime_default.png   | Bin 0 -> 384 bytes
 .../SystemUI/res/layout-xlarge/status_bar.xml |  12 ++++-
 .../statusbar/tablet/InputMethodButton.java   |  51 ++++++++++++++++++
 3 files changed, 62 insertions(+), 1 deletion(-)
 create mode 100644 packages/SystemUI/res/drawable-mdpi/ic_sysbar_ime_default.png
 create mode 100644 packages/SystemUI/src/com/android/systemui/statusbar/tablet/InputMethodButton.java

diff --git a/packages/SystemUI/res/drawable-mdpi/ic_sysbar_ime_default.png b/packages/SystemUI/res/drawable-mdpi/ic_sysbar_ime_default.png
new file mode 100644
index 0000000000000000000000000000000000000000..bf33c9466440dfef47bb1e10af9c712d043e8693
GIT binary patch
literal 384
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTC&H|6fVg?3oArNM~bhqvg0|TRx
zr;B4q2J74D2YH(fcw9Y0^Y)gv`W+GJIV|FHMYQUCub0WX6wNM{e|gL@KPCzkKDu%4
zw`1<Cwq6#G1_bI;5?FKOvBkZh-Ts$Lw$@~y+n)Qo&v4(ab=}#8`q`6>%3VHA3UBbt
zd%51Un7MlL`EJ*u>V8-I^TqSkSKj4U<k4Ja6JRWQVsTFFo+qE4734aYPu8$~a`V)+
z9VdP-=T&I@{^?^K^Zi|u&Ya(K;8vO3?N{@I8~^;_Rt$AGzIR*DwbCr*_r+QpTvo|^
zzs2$K((^f7I&;5H>PubilxmY5Ygg~bI%Uozja*sx`~TOJYff0w_CICe(dl*fWbVa3
zIyifQ&W3HdS_<ZiZ+Tv<@W?A>E?Vo%w9s{7UDZ;Tzc1aHR2&fKx9|^!P_ZuVwOTFz
QfI-UO>FVdQ&MBb@0OO#dYybcN

literal 0
HcmV?d00001

diff --git a/packages/SystemUI/res/layout-xlarge/status_bar.xml b/packages/SystemUI/res/layout-xlarge/status_bar.xml
index 6aee011274bd2..494dfa88b727b 100644
--- a/packages/SystemUI/res/layout-xlarge/status_bar.xml
+++ b/packages/SystemUI/res/layout-xlarge/status_bar.xml
@@ -28,11 +28,11 @@
         >
 
         <ImageView
-            class="com.android.systemui.statusbar.tablet.NotificationIconArea$MoreView"
             android:id="@+id/expand"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:src="@drawable/ic_sysbar_open"
+            android:background="@drawable/ic_sysbar_icon_bg"
             android:paddingLeft="6dip"
             android:onClick="notificationIconsClicked"
             />
@@ -100,8 +100,18 @@
                 android:background="@drawable/sysbar_hidenotification_handle"
                 android:layout_marginLeft="8dip"
                 />
+            <com.android.systemui.statusbar.tablet.InputMethodButton
+                android:id="@+id/imeButton"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:layout_marginLeft="8dip"
+                android:src="@drawable/ic_sysbar_ime_default"
+                android:background="@drawable/ic_sysbar_icon_bg"
+                android:visibility="visible"
+                />
         </com.android.systemui.statusbar.tablet.NotificationIconArea>
 
+
         <FrameLayout
             android:id="@+id/ticker"
             android:layout_width="wrap_content"
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/tablet/InputMethodButton.java b/packages/SystemUI/src/com/android/systemui/statusbar/tablet/InputMethodButton.java
new file mode 100644
index 0000000000000..ba682b7492d45
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/tablet/InputMethodButton.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright (C) 2010 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.
+ */
+
+package com.android.systemui.statusbar.tablet;
+
+import android.content.Context;
+import android.util.Slog;
+import android.view.View;
+import android.util.AttributeSet;
+import android.widget.ImageView;
+import android.view.inputmethod.InputMethodManager;
+
+import com.android.server.InputMethodManagerService;
+
+public class InputMethodButton extends ImageView {
+
+    // other services we wish to talk to
+    InputMethodManager mImm;
+
+    public InputMethodButton(Context context, AttributeSet attrs) {
+        super(context, attrs);
+
+        // IME hookup
+        mImm = (InputMethodManager) getContext().getSystemService(Context.INPUT_METHOD_SERVICE);
+        
+        // TODO: read the current icon & visibility state directly from the service
+
+        // TODO: register for notifications about changes to visibility & subtype from service
+
+        setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                mImm.showInputMethodSubtypePicker();
+            }
+        });
+    }
+}
+