From 858f8eaac75bcd1b296b41837caf3dae82d1d72a Mon Sep 17 00:00:00 2001
From: Jim Miller <jaggies@google.com>
Date: Fri, 19 Aug 2011 14:50:34 -0700
Subject: [PATCH] Fix 5021968: Add input method switcher button to lock screen.

This adds an IME switcher button to lock screen.  It is only
shown if the user has more than one applicable and enabled IME installed.

Change-Id: I5f9503a205c2edb27170825539ba4a6ef25418ed
---
 .../res/drawable-hdpi/ic_lockscreen_ime.png   | Bin 0 -> 202 bytes
 .../res/drawable-mdpi/ic_lockscreen_ime.png   | Bin 0 -> 157 bytes
 .../res/drawable-xhdpi/ic_lockscreen_ime.png  | Bin 0 -> 217 bytes
 .../keyguard_screen_password_landscape.xml    |  16 +++-
 .../keyguard_screen_password_portrait.xml     |  45 +++++++----
 .../policy/impl/PasswordUnlockScreen.java     |  70 +++++++++++++++++-
 6 files changed, 112 insertions(+), 19 deletions(-)
 create mode 100644 core/res/res/drawable-hdpi/ic_lockscreen_ime.png
 create mode 100644 core/res/res/drawable-mdpi/ic_lockscreen_ime.png
 create mode 100644 core/res/res/drawable-xhdpi/ic_lockscreen_ime.png

diff --git a/core/res/res/drawable-hdpi/ic_lockscreen_ime.png b/core/res/res/drawable-hdpi/ic_lockscreen_ime.png
new file mode 100644
index 0000000000000000000000000000000000000000..29a7989372fc4b33e22060675ff403da4e15bea7
GIT binary patch
literal 202
zcmeAS@N?(olHy`uVBq!ia0vp^x**KK1|+Sd9?b$$6FprVLn02py`jk0U?AXfG4gEd
zhYXwJ4>V+$`;QeXeo5kRbnJSu?O}h;r6;O)1*410uZl7AN||I_Sm3ySLA2-MC29w@
zde2hHUHQV2qo$pI<%^{ao-Z85`^`4L-n2X2nmv|vmXg~7;~th5RTo7J&42yd6aU#j
zY{6@{;3NAN?=IfhdrBqq>3wFffz52PbD1BxNNk&ScGWwe;}|?${an^LB{Ts5z@kwY

literal 0
HcmV?d00001

diff --git a/core/res/res/drawable-mdpi/ic_lockscreen_ime.png b/core/res/res/drawable-mdpi/ic_lockscreen_ime.png
new file mode 100644
index 0000000000000000000000000000000000000000..b27e059260ceed0ffc33dceeeb852c76ff6f1459
GIT binary patch
literal 157
zcmeAS@N?(olHy`uVBq!ia0vp^azHH0!3HGvF1f=4q*6Rx978;gC;$2X-~O-z!?D0_
zcU?I_vFi*QEvLS<<UFF=qI1tj+5Z<`Ubm#A<Uy{+PazNa>$=%(`c^);teE!k#7Vy!
zO|v5!RA;o$IC|Kw?{;HE`>AR7*dOh=*mhvW(ZynySr{0K=5IePb6-*wXdi>8tDnm{
Hr-UW|5pz5R

literal 0
HcmV?d00001

diff --git a/core/res/res/drawable-xhdpi/ic_lockscreen_ime.png b/core/res/res/drawable-xhdpi/ic_lockscreen_ime.png
new file mode 100644
index 0000000000000000000000000000000000000000..a40ddebf87c05a5c6041aaf5f15387690d7943b6
GIT binary patch
literal 217
zcmeAS@N?(olHy`uVBq!ia0vp^HXzKw1|+Ti+$;i83p`yMLo)8Yy=lnB<S4*$;N^D7
z-_xs4{XKePd+*Ez8gf}1%A@D%>4+GY7`=QqOOufe3H)Q5vt(EG%2k&iOv|41b#eOP
zmhTOF7q8CxD_V2&=Cyf^jg9x4C)?EAxa+)^nVDHz_rbw12?>daOh#sZ{yM$s_36%$
uj3DuZ2g*&;XT7{)^w{ui0E!KDQ>BmWYn&0=bZ#Zktqh*7elF{r5}E*$R!<oK

literal 0
HcmV?d00001

diff --git a/core/res/res/layout/keyguard_screen_password_landscape.xml b/core/res/res/layout/keyguard_screen_password_landscape.xml
index 4c44049c1de38..bc86ab7c1f6f2 100644
--- a/core/res/res/layout/keyguard_screen_password_landscape.xml
+++ b/core/res/res/layout/keyguard_screen_password_landscape.xml
@@ -133,13 +133,14 @@
 
     <!-- Column 2 - password entry field and PIN keyboard -->
     <LinearLayout
-        android:orientation="vertical"
+        android:orientation="horizontal"
         android:layout_width="270dip"
         android:layout_gravity="center_vertical">
 
         <EditText android:id="@+id/passwordEntry"
             android:layout_height="wrap_content"
-            android:layout_width="match_parent"
+            android:layout_width="0dip"
+            android:layout_weight="1"
             android:gravity="center"
             android:singleLine="true"
             android:textStyle="normal"
@@ -153,6 +154,17 @@
             android:suggestionsEnabled="false"
             />
 
+        <ImageView android:id="@+id/switch_ime_button"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:src="@drawable/ic_lockscreen_ime"
+            android:clickable="true"
+            android:padding="8dip"
+            android:layout_gravity="center"
+            android:background="?android:attr/selectableItemBackground"
+            android:visibility="gone"
+            />
+
     </LinearLayout>
 
     <!-- Numeric keyboard -->
diff --git a/core/res/res/layout/keyguard_screen_password_portrait.xml b/core/res/res/layout/keyguard_screen_password_portrait.xml
index 1d0ea54791e9f..994c4399d8472 100644
--- a/core/res/res/layout/keyguard_screen_password_portrait.xml
+++ b/core/res/res/layout/keyguard_screen_password_portrait.xml
@@ -95,22 +95,39 @@
         />
 
     <!-- Password entry field -->
-    <EditText android:id="@+id/passwordEntry"
-        android:layout_height="wrap_content"
-        android:layout_width="match_parent"
+    <LinearLayout
         android:layout_gravity="center_vertical|fill_horizontal"
-        android:gravity="center_horizontal"
-        android:singleLine="true"
-        android:textStyle="normal"
-        android:inputType="textPassword"
-        android:textSize="36sp"
+        android:orientation="horizontal"
         android:layout_marginLeft="16dip"
-        android:layout_marginRight="16dip"
-        android:background="@drawable/lockscreen_password_field_dark"
-        android:textAppearance="?android:attr/textAppearanceMedium"
-        android:textColor="#ffffffff"
-        android:imeOptions="actionDone"
-        android:suggestionsEnabled="false"/>
+        android:layout_marginRight="16dip">
+
+        <EditText android:id="@+id/passwordEntry"
+            android:layout_width="0dip"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:gravity="center_horizontal"
+            android:singleLine="true"
+            android:textStyle="normal"
+            android:inputType="textPassword"
+            android:textSize="36sp"
+            android:background="@drawable/lockscreen_password_field_dark"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:textColor="#ffffffff"
+            android:imeOptions="actionDone"
+            android:suggestionsEnabled="false"/>
+
+        <ImageView android:id="@+id/switch_ime_button"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:src="@drawable/ic_lockscreen_ime"
+            android:clickable="true"
+            android:padding="8dip"
+            android:layout_gravity="center"
+            android:background="?android:attr/selectableItemBackground"
+            android:visibility="gone"
+            />
+
+    </LinearLayout>
 
     <!-- Numeric keyboard -->
     <com.android.internal.widget.PasswordEntryKeyboardView android:id="@+id/keyboard"
diff --git a/policy/src/com/android/internal/policy/impl/PasswordUnlockScreen.java b/policy/src/com/android/internal/policy/impl/PasswordUnlockScreen.java
index 7c1f93a2ad147..d70b3bb2ba901 100644
--- a/policy/src/com/android/internal/policy/impl/PasswordUnlockScreen.java
+++ b/policy/src/com/android/internal/policy/impl/PasswordUnlockScreen.java
@@ -16,6 +16,8 @@
 
 package com.android.internal.policy.impl;
 
+import java.util.List;
+
 import android.app.admin.DevicePolicyManager;
 import android.content.Context;
 import android.content.res.Configuration;
@@ -27,18 +29,18 @@ import com.android.internal.widget.PasswordEntryKeyboardView;
 import android.os.CountDownTimer;
 import android.os.SystemClock;
 import android.security.KeyStore;
-import android.telephony.TelephonyManager;
 import android.text.Editable;
 import android.text.InputType;
 import android.text.TextWatcher;
 import android.text.method.DigitsKeyListener;
 import android.text.method.TextKeyListener;
-import android.util.Log;
 import android.view.KeyEvent;
 import android.view.LayoutInflater;
 import android.view.View;
-import android.view.View.OnClickListener;
 import android.view.inputmethod.EditorInfo;
+import android.view.inputmethod.InputMethodInfo;
+import android.view.inputmethod.InputMethodManager;
+import android.view.inputmethod.InputMethodSubtype;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.LinearLayout;
@@ -159,6 +161,68 @@ public class PasswordUnlockScreen extends LinearLayout implements KeyguardScreen
                 }
             }
         });
+
+        // If there's more than one IME, enable the IME switcher button
+        View switchImeButton = findViewById(R.id.switch_ime_button);
+        final InputMethodManager imm = (InputMethodManager) getContext().getSystemService(
+                Context.INPUT_METHOD_SERVICE);
+        if (switchImeButton != null && hasMultipleEnabledIMEsOrSubtypes(imm, false)) {
+            switchImeButton.setVisibility(View.VISIBLE);
+            switchImeButton.setOnClickListener(new OnClickListener() {
+                public void onClick(View v) {
+                    mCallback.pokeWakelock(); // Leave the screen on a bit longer
+                    imm.showInputMethodPicker();
+                }
+            });
+        }
+    }
+
+    /**
+     * Method adapted from com.android.inputmethod.latin.Utils
+     *
+     * @param imm The input method manager
+     * @param shouldIncludeAuxiliarySubtypes
+     * @return true if we have multiple IMEs to choose from
+     */
+    private boolean hasMultipleEnabledIMEsOrSubtypes(InputMethodManager imm,
+            final boolean shouldIncludeAuxiliarySubtypes) {
+        final List<InputMethodInfo> enabledImis = imm.getEnabledInputMethodList();
+
+        // Number of the filtered IMEs
+        int filteredImisCount = 0;
+
+        for (InputMethodInfo imi : enabledImis) {
+            // We can return true immediately after we find two or more filtered IMEs.
+            if (filteredImisCount > 1) return true;
+            final List<InputMethodSubtype> subtypes =
+                    imm.getEnabledInputMethodSubtypeList(imi, true);
+            // IMEs that have no subtypes should be counted.
+            if (subtypes.isEmpty()) {
+                ++filteredImisCount;
+                continue;
+            }
+
+            int auxCount = 0;
+            for (InputMethodSubtype subtype : subtypes) {
+                if (subtype.isAuxiliary()) {
+                    ++auxCount;
+                }
+            }
+            final int nonAuxCount = subtypes.size() - auxCount;
+
+            // IMEs that have one or more non-auxiliary subtypes should be counted.
+            // If shouldIncludeAuxiliarySubtypes is true, IMEs that have two or more auxiliary
+            // subtypes should be counted as well.
+            if (nonAuxCount > 0 || (shouldIncludeAuxiliarySubtypes && auxCount > 1)) {
+                ++filteredImisCount;
+                continue;
+            }
+        }
+
+        return filteredImisCount > 1
+        // imm.getEnabledInputMethodSubtypeList(null, false) will return the current IME's enabled
+        // input method subtype (The current IME should be LatinIME.)
+                || imm.getEnabledInputMethodSubtypeList(null, false).size() > 1;
     }
 
     @Override