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

Commit b9d1fd10 authored by Steve Kondik's avatar Steve Kondik Committed by Steve Kondik
Browse files

systemui: Fix the keyguard issues 

Enable statusbar.

Enable statusbar

Change-Id: I8130846af95b3bfc42819a5f4fad758bb95155e8

Fix expandSettingsPanel status bar call

Use the same mechanism as the two finger gesture to get it to open
correctly.

Bug: 19196800
Change-Id: I952e14d3ccd796889ed54cb98c017542a25f28c9

systemui: Fix the blur effect

Change-Id: I9ce02e517c1e72d542e938f128a99be48ee20fc2
parent c345a419

packages/Keyguard/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -30,4 +30,4 @@ LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res 


include $(BUILD_STATIC_JAVA_LIBRARY)



#include $(call all-makefiles-under,$(LOCAL_PATH))
 
 No newline at end of file
 
include $(call all-makefiles-under,$(LOCAL_PATH))

packages/Keyguard/test/src/com/android/keyguard/test/KeyguardTestActivity.java

+8 −6
Original line number Diff line number Diff line
@@ -284,26 +284,28 @@ public class KeyguardTestActivity extends Activity implements OnClickListener { 
    @Override

    protected void onPause() {

        super.onPause();

        try {

        /*try {

            if (mService != null) {

                mService.setHidden(true);

                //FIXME: LMR1_INTERNAL

                //mService.setHidden(true);

            }

        } catch (RemoteException e) {

            Log.e(TAG, "Remote service died");

            e.printStackTrace();

        }

        } */

    }



    protected void onResume() {

        super.onResume();

        try {

       /* try {

            if (mService != null) {

                mService.setHidden(false);

                //FIXME: LMR1_INTERNAL

                //mService.setHidden(false);

            }

        } catch (RemoteException e) {

            Log.e(TAG, "Remote service died");

            e.printStackTrace();

        }

        } */

    }



    public int mSecurityModeMock;

packages/SystemUI/res/values/strings.xml

+0 −1
Original line number Diff line number Diff line
@@ -813,7 +813,6 @@ 
    <!-- Battery level for expanded quick settings [CHAR LIMIT=2] -->

    <string name="battery_level_template"><xliff:g id="level" example="45">%d</xliff:g>%%</string>





    <!-- Text shown in place of notification contents when the notification is hidden on a secure lockscreen -->

    <string name="notification_hidden_text">Contents hidden</string>

packages/SystemUI/src/com/android/systemui/keyguard/KeyguardService.java

+8 −0
Original line number Diff line number Diff line
@@ -70,18 +70,22 @@ public class KeyguardService extends Service { 
             mKeyguardViewMediator.addStateMonitorCallback(callback);

         }



        @Override

        public boolean isShowing() {

            return mKeyguardViewMediator.isShowing();

        }



        @Override

        public boolean isSecure() {

            return mKeyguardViewMediator.isSecure();

        }



        @Override

        public boolean isShowingAndNotOccluded() {

            return mKeyguardViewMediator.isShowingAndNotOccluded();

        }



        @Override

        public boolean isInputRestricted() {

            return mKeyguardViewMediator.isInputRestricted();

        }
@@ -98,6 +102,7 @@ public class KeyguardService extends Service { 
            mKeyguardViewMediator.keyguardDone(authenticated, wakeup);

        }



        @Override

        public int setOccluded(boolean isOccluded) {

            checkPermission();

            synchronized (this) {
@@ -161,6 +166,7 @@ public class KeyguardService extends Service { 
            mKeyguardViewMediator.setKeyguardEnabled(enabled);

        }



        @Override

        public boolean isDismissable() {

            return mKeyguardViewMediator.isDismissable();

        }
@@ -183,10 +189,12 @@ public class KeyguardService extends Service { 
            mKeyguardViewMediator.setCurrentUser(userId);

        }



        @Override

        public void showAssistant() {

            checkPermission();

        }



        @Override

        public void dispatch(MotionEvent event) {

            checkPermission();

        }

packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java

+1 −1
Original line number Diff line number Diff line
@@ -235,6 +235,7 @@ public class KeyguardViewMediator extends SystemUI { 


    /** Cached value of #isInputRestricted */

    private boolean mInputRestricted;



    // true if the keyguard is hidden by another window

    private boolean mOccluded = false;
@@ -519,7 +520,6 @@ public class KeyguardViewMediator extends SystemUI { 
        public boolean isInputRestricted() {

            return KeyguardViewMediator.this.isInputRestricted();

        }



    };



    public void userActivity() {