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

Commit e86f1752 authored by Jim Miller's avatar Jim Miller Committed by Android (Google) Code Review
Browse files

Merge "Use custom theme for keyguard presentation" into mnc-dev

parents f12c91f5 c90d6458

packages/Keyguard/res/values/styles.xml

+4 −0
Original line number Original line Diff line number Diff line
@@ -52,4 +52,8 @@ 
        <item name="android:colorControlNormal">#80ffffff</item>

        <item name="android:colorControlNormal">#80ffffff</item>

        <item name="android:colorControlActivated">#80ffffff</item>

        <item name="android:colorControlActivated">#80ffffff</item>

    </style>

    </style>



    <style name="keyguard_presentation_theme" parent="@android:style/Theme.Material.NoActionBar.Fullscreen">

    </style>



</resources>
 
</resources>

packages/Keyguard/src/com/android/keyguard/KeyguardDisplayManager.java

+5 −3
Original line number Original line Diff line number Diff line
@@ -105,7 +105,8 @@ public class KeyguardDisplayManager { 




            if (mPresentation == null && presentationDisplay != null) {

            if (mPresentation == null && presentationDisplay != null) {

                if (DEBUG) Slog.i(TAG, "Keyguard enabled on display: " + presentationDisplay);

                if (DEBUG) Slog.i(TAG, "Keyguard enabled on display: " + presentationDisplay);

                mPresentation = new KeyguardPresentation(mContext, presentationDisplay);

                mPresentation = new KeyguardPresentation(mContext, presentationDisplay,

                        R.style.keyguard_presentation_theme);

                mPresentation.setOnDismissListener(mOnDismissListener);

                mPresentation.setOnDismissListener(mOnDismissListener);

                try {

                try {

                    mPresentation.show();

                    mPresentation.show();
@@ -141,11 +142,12 @@ public class KeyguardDisplayManager { 
            }

            }

        };

        };





        public KeyguardPresentation(Context context, Display display) {

        public KeyguardPresentation(Context context, Display display, int theme) {

            super(context, display);

            super(context, display, theme);

            getWindow().setType(WindowManager.LayoutParams.TYPE_KEYGUARD_DIALOG);

            getWindow().setType(WindowManager.LayoutParams.TYPE_KEYGUARD_DIALOG);

        }

        }





        @Override

        public void onDetachedFromWindow() {

        public void onDetachedFromWindow() {

            mClock.removeCallbacks(mMoveTextRunnable);

            mClock.removeCallbacks(mMoveTextRunnable);

        }

        }