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

Commit a9f16669 authored by Adam Cohen's avatar Adam Cohen Committed by Android (Google) Code Review
Browse files

Merge "Fading side pages as per mock" into jb-mr1-lockscreen-dev

parents ff872257 6fb841fa

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

+4 −0
Original line number Diff line number Diff line
@@ -321,5 +321,9 @@ public class KeyguardAccountView extends LinearLayout implements KeyguardSecurit 
        mSecurityMessageDisplay = display;

        reset();

    }



    @Override

    public void showUsabilityHint() {

    }

}

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

+4 −0
Original line number Diff line number Diff line
@@ -218,4 +218,8 @@ public class KeyguardFaceUnlockView extends LinearLayout implements KeyguardSecu 
    public void setSecurityMessageDisplay(SecurityMessageDisplay display) {

        mSecurityMessageDisplay = display;

    }



    @Override

    public void showUsabilityHint() {

    }

}

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

+9 −4
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ public class KeyguardHostView extends KeyguardViewBase { 


    private AppWidgetHost mAppWidgetHost;

    private KeyguardWidgetPager mAppWidgetContainer;

    private ViewFlipper mSecurityViewContainer;

    private KeyguardSecurityViewFlipper mSecurityViewContainer;

    private KeyguardSelectorView mKeyguardSelectorView;

    private KeyguardTransportControlView mTransportControl;

    private boolean mEnableMenuKey;
@@ -175,10 +175,11 @@ public class KeyguardHostView extends KeyguardViewBase { 
        mViewStateManager.setPagedView(mAppWidgetContainer);

        mViewStateManager.setChallengeLayout(slider != null ? slider :

                (ChallengeLayout) findViewById(R.id.multi_pane_challenge));



        mSecurityViewContainer = (ViewFlipper) findViewById(R.id.view_flipper);

        mSecurityViewContainer = (KeyguardSecurityViewFlipper) findViewById(R.id.view_flipper);

        mKeyguardSelectorView = (KeyguardSelectorView) findViewById(R.id.keyguard_selector_view);

        mViewStateManager.setSecurityViewContainer(mSecurityViewContainer);



        mViewStateManager.showUsabilityHints();



        updateSecurityViews();

        if (!(mContext instanceof Activity)) {
@@ -717,6 +718,10 @@ public class KeyguardHostView extends KeyguardViewBase { 
        // layout is blank but forcing a layout causes it to reappear (e.g. with with

        // hierarchyviewer).

        requestLayout();



        if (mViewStateManager != null) {

            mViewStateManager.showUsabilityHints();

        }

    }



    @Override
@@ -1069,7 +1074,7 @@ public class KeyguardHostView extends KeyguardViewBase { 
                @Override

                public void showUnlockHint() {

                    if (mKeyguardSelectorView != null) {

                        mKeyguardSelectorView.ping();

                        mKeyguardSelectorView.showUsabilityHint();

                    }

                }

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

+4 −0
Original line number Diff line number Diff line
@@ -113,5 +113,9 @@ public class KeyguardPINView extends KeyguardAbsKeyInputView 


        mPasswordEntry.requestFocus();

    }



    @Override

    public void showUsabilityHint() {

    }

}

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

+4 −0
Original line number Diff line number Diff line
@@ -233,5 +233,9 @@ public class KeyguardPasswordView extends KeyguardAbsKeyInputView 
        // input method subtype (The current IME should be LatinIME.)

                || imm.getEnabledInputMethodSubtypeList(null, false).size() > 1;

    }



    @Override

    public void showUsabilityHint() {

    }

}