Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 9b1db682: Fix issue where security view sometimes doesn\'t show.

Browse Source 
* commit '9b1db682c32d103974b0f1193b50e77e254d5589':
  Fix issue where security view sometimes doesn't show.
This commit is contained in:
Jim Miller
2012-10-29 13:31:36 -07:00
committed by Android Git Automerger
parent c8896dab51 9b1db682c3
commit 3dd3a41aab
6 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/res/res/layout-land/keyguard_host_view.xml
View File

@@ -45,7 +45,7 @@
<View android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_childType="scrim"
androidprv:layout_childType="scrim"
android:background="#99000000" />
<com.android.internal.policy.impl.keyguard.KeyguardSecurityContainer

2
core/res/res/layout-sw600dp/keyguard_glow_pad_container.xml
View File

@@ -21,4 +21,4 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center" />
</merge>
</merge>

3
core/res/res/values/dimens.xml
View File

@@ -245,9 +245,6 @@
<!-- TEMP -->
<dimen name="kg_security_panel_height">600dp</dimen>
<!-- Width of security view in keyguard. -->
<dimen name="kg_glow_pad_size">500dp</dimen>
<!-- Height of security view in keyguard. -->
<dimen name="kg_security_view_height">0dp</dimen>

6
core/res/res/values/styles.xml
View File

@@ -2479,7 +2479,8 @@ please see styles_device_defaults.xml.
</style>
<!-- Keyguard PIN pad styles -->
<style name="Widget.Button.NumPadKey">
<style name="Widget.Button.NumPadKey"
parent="@android:style/Widget.Button">
<item name="android:singleLine">true</item>
<item name="android:padding">6dip</item>
<item name="android:gravity">left|center_vertical</item>
@@ -2489,7 +2490,8 @@ please see styles_device_defaults.xml.
<item name="android:textStyle">normal</item>
<item name="android:textColor">#ffffff</item>
</style>
<style name="TextAppearance.NumPadKey">
<style name="TextAppearance.NumPadKey"
parent="@android:style/TextAppearance">
<item name="android:textSize">34dp</item>
<item name="android:fontFamily">sans-serif</item>
<item name="android:textStyle">normal</item>

10
policy/src/com/android/internal/policy/impl/keyguard/KeyguardHostView.java
View File

@@ -181,14 +181,13 @@ public class KeyguardHostView extends KeyguardViewBase {
mViewStateManager.showUsabilityHints();
updateSecurityViews();
if (!(mContext instanceof Activity)) {
setSystemUiVisibility(getSystemUiVisibility() | View.STATUS_BAR_DISABLE_BACK);
}
if (KeyguardUpdateMonitor.getInstance(mContext).getIsFirstBoot()) {
showPrimarySecurityScreen(false);
}
showPrimarySecurityScreen(false);
updateSecurityViews();
}
private void updateSecurityViews() {
@@ -426,7 +425,8 @@ public class KeyguardHostView extends KeyguardViewBase {
void showPrimarySecurityScreen(boolean turningOff) {
SecurityMode securityMode = mSecurityModel.getSecurityMode();
if (DEBUG) Log.v(TAG, "showPrimarySecurityScreen(turningOff=" + turningOff + ")");
if (!turningOff && KeyguardUpdateMonitor.getInstance(mContext).isAlternateUnlockEnabled()) {
if (!turningOff && KeyguardUpdateMonitor.getInstance(mContext).isAlternateUnlockEnabled()
&& !KeyguardUpdateMonitor.getInstance(mContext).getIsFirstBoot()) {
// If we're not turning off, then allow biometric alternate.
// We'll reload it when the device comes back on.
securityMode = mSecurityModel.getAlternateFor(securityMode);

2
policy/src/com/android/internal/policy/impl/keyguard/KeyguardViewMediator.java
View File

@@ -95,7 +95,7 @@ import com.android.internal.widget.LockPatternUtils;
*/
public class KeyguardViewMediator {
private static final int KEYGUARD_DISPLAY_TIMEOUT_DELAY_DEFAULT = 30000;
final static boolean DEBUG = true;
final static boolean DEBUG = false;
private final static boolean DBG_WAKE = false;
private final static String TAG = "KeyguardViewMediator";