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

Commit ccf08d7c authored by Kaori Katou's avatar Kaori Katou Committed by Adrian Roos
Browse files

Dismiss keyguard when user button is tapped 

When multi-user is disabled and user button is tapped
on the keyguard, the contact app is displayed behind the keyguard.
The keyguard should be dismissed when the contact app is launched.

Change-Id: I7daa0bec84b5172e78668cc71e51955f166ede0a
(cherry picked from commit 0a334053)
parent 250c617d

packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java

+5 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ import android.widget.TextView; 
import com.android.systemui.BatteryMeterView;

import com.android.systemui.Interpolators;

import com.android.systemui.R;

import com.android.systemui.qs.QSPanel;

import com.android.systemui.statusbar.policy.BatteryController;

import com.android.systemui.statusbar.policy.KeyguardUserSwitcher;

import com.android.systemui.statusbar.policy.UserInfoController;
@@ -150,6 +151,10 @@ public class KeyguardStatusBarView extends RelativeLayout 
        });

    }



    public void setQSPanel(QSPanel qsp) {

        mMultiUserSwitch.setQsPanel(qsp);

    }



    @Override

    public void onBatteryLevelChanged(int level, boolean pluggedIn, boolean charging) {

        String percentage = NumberFormat.getPercentInstance().format((double) level / 100.0);

packages/SystemUI/src/com/android/systemui/statusbar/phone/MultiUserSwitch.java

+3 −3
Original line number Diff line number Diff line
@@ -127,10 +127,10 @@ public class MultiUserSwitch extends FrameLayout implements View.OnClickListener 
                        mTmpInt2);

            }

        } else {

            if (mQsPanel != null) {

                Intent intent = ContactsContract.QuickContact.composeQuickContactsIntent(

                        getContext(), v, ContactsContract.Profile.CONTENT_URI,

                        ContactsContract.QuickContact.MODE_LARGE, null);

            if (mQsPanel != null) {

                mQsPanel.getHost().startActivityDismissingKeyguard(intent);

            }

        }

packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java

+1 −0
Original line number Diff line number Diff line
@@ -893,6 +893,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, 
                    qsContainer.setHost(qsh);

                    mQSPanel = qsContainer.getQsPanel();

                    mQSPanel.setBrightnessMirror(mBrightnessMirrorController);

                    mKeyguardStatusBar.setQSPanel(mQSPanel);

                    mHeader = qsContainer.getHeader();

                    initSignalCluster(mHeader);

                    mHeader.setActivityStarter(PhoneStatusBar.this);