Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9b1db682 authored by Jim Miller's avatar Jim Miller
Browse files

Fix issue where security view sometimes doesn't show. 

Since the code is now very careful about loading layouts, we
sometimes get into a situation where the security view isn't shown.

This CL ensures the security method is shown at least once
when the view is inflated.

Change-Id: If80a46adb868d92194610eccaf9d8d6c2a2c5b3d
parent a71984f3

core/res/res/layout-land/keyguard_host_view.xml

+1 −1
Original line number Diff line number Diff line
@@ -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

core/res/res/values/dimens.xml

+0 −3
Original line number Diff line number Diff line
@@ -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>

core/res/res/values/styles.xml

+4 −2
Original line number Diff line number Diff line
@@ -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>

policy/src/com/android/internal/policy/impl/keyguard/KeyguardHostView.java

+5 −5
Original line number Diff line number Diff line
@@ -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);

        }



        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);

policy/src/com/android/internal/policy/impl/keyguard/KeyguardViewMediator.java

+1 −1
Original line number Diff line number Diff line
@@ -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";

core/res/res/layout-sw600dp/keyguard_glow_pad_container.xml

+1 −1

File changed.

Contains only whitespace changes.