From 5169fc57e38cda45d6fda4b47b727167dd937cc8 Mon Sep 17 00:00:00 2001 From: Jim Miller Date: Thu, 15 Apr 2010 17:50:03 -0700 Subject: Manual merge of Ida6a4cdd3abcbcab7e2fe8450a25c0dc36765f04 Fix 2572446: Also watch keyboard changes in PIN/Password unlock. The PIN/Password unlock screen was monitoring orientation changes. However, while docked, this isn't useful since orientation remains fixed. This change makes PasswordUnlockScreen also looks for changes to config.hardKeyboardHidden. Tested: WVGA device while docked and opening/closing the keyboard. Change-Id: Iaadb277028f2dd1f85fd0f627a686a86ac51a2ed --- .../internal/policy/impl/PasswordUnlockScreen.java | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'policy') diff --git a/policy/com/android/internal/policy/impl/PasswordUnlockScreen.java b/policy/com/android/internal/policy/impl/PasswordUnlockScreen.java index a0e4f93..39f2917 100644 --- a/policy/com/android/internal/policy/impl/PasswordUnlockScreen.java +++ b/policy/com/android/internal/policy/impl/PasswordUnlockScreen.java @@ -60,7 +60,7 @@ public class PasswordUnlockScreen extends LinearLayout implements KeyguardScreen private PasswordEntryKeyboardHelper mKeyboardHelper; private int mCreationOrientation; - private int mKeyboardHidden; + private int mCreationHardKeyboardHidden; private CountDownTimer mCountdownTimer; private TextView mTitle; @@ -73,7 +73,7 @@ public class PasswordUnlockScreen extends LinearLayout implements KeyguardScreen KeyguardScreenCallback callback) { super(context); - mKeyboardHidden = configuration.hardKeyboardHidden; + mCreationHardKeyboardHidden = configuration.hardKeyboardHidden; mCreationOrientation = configuration.orientation; mUpdateMonitor = updateMonitor; mCallback = callback; @@ -102,7 +102,7 @@ public class PasswordUnlockScreen extends LinearLayout implements KeyguardScreen mKeyboardHelper.setKeyboardMode(isAlpha ? PasswordEntryKeyboardHelper.KEYBOARD_MODE_ALPHA : PasswordEntryKeyboardHelper.KEYBOARD_MODE_NUMERIC); - mKeyboardView.setVisibility(mKeyboardHidden == Configuration.HARDKEYBOARDHIDDEN_NO + mKeyboardView.setVisibility(mCreationHardKeyboardHidden == Configuration.HARDKEYBOARDHIDDEN_NO ? View.INVISIBLE : View.VISIBLE); mPasswordEntry.requestFocus(); @@ -213,8 +213,10 @@ public class PasswordUnlockScreen extends LinearLayout implements KeyguardScreen @Override protected void onAttachedToWindow() { super.onAttachedToWindow(); - if (getResources().getConfiguration().orientation != mCreationOrientation) { - mCallback.recreateMe(getResources().getConfiguration()); + Configuration config = getResources().getConfiguration(); + if (config.orientation != mCreationOrientation + || config.hardKeyboardHidden != mCreationHardKeyboardHidden) { + mCallback.recreateMe(config); } } @@ -222,7 +224,8 @@ public class PasswordUnlockScreen extends LinearLayout implements KeyguardScreen @Override protected void onConfigurationChanged(Configuration newConfig) { super.onConfigurationChanged(newConfig); - if (newConfig.orientation != mCreationOrientation) { + if (newConfig.orientation != mCreationOrientation + || newConfig.hardKeyboardHidden != mCreationHardKeyboardHidden) { mCallback.recreateMe(newConfig); } } -- cgit v1.1