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

Commit 4fa27f31 authored by Jim Miller's avatar Jim Miller Committed by Android Git Automerger
Browse files

am 80a90efc: Merge "Fix ring volume issue by addressing focus regression in... 

am 80a90efc: Merge "Fix ring volume issue by addressing focus regression in keyguard." into jb-mr1.1-dev

* commit '80a90efc':
  Fix ring volume issue by addressing focus regression in keyguard.
parents 8b283df9 80a90efc

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

+7 −0
Original line number Diff line number Diff line
@@ -286,6 +286,11 @@ public class KeyguardHostView extends KeyguardViewBase { 


        showPrimarySecurityScreen(false);

        updateSecurityViews();



        // Make sure at least this view is focusable in case nothing below it is. Otherwise,

        // requestFocus() on this view will fail and allow events, such as volume keys, to be

        // handled by the fallback handler.  See bug 7546960 for details.

        setFocusableInTouchMode(true);

    }



    private boolean shouldEnableAddWidget() {
@@ -881,6 +886,7 @@ public class KeyguardHostView extends KeyguardViewBase { 
        if (mViewStateManager != null) {

            mViewStateManager.showUsabilityHints();

        }

        requestFocus();

    }



    @Override
@@ -900,6 +906,7 @@ public class KeyguardHostView extends KeyguardViewBase { 
        if (cameraPage != null) {

            cameraPage.onScreenTurnedOff();

        }

        clearFocus();

    }



    public void clearAppWidgetToShow() {

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

+1 −0
Original line number Diff line number Diff line
@@ -216,6 +216,7 @@ public class KeyguardViewManager { 


        if (force || mKeyguardView == null) {

            inflateKeyguardView(options);

            mKeyguardView.requestFocus();

        }

        updateUserActivityTimeoutInWindowLayoutParams();

        mViewManager.updateViewLayout(mKeyguardHost, mWindowLayoutParams);