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

Commit 8ad4bf36 authored by Kaori Katou's avatar Kaori Katou Committed by android-build-merger
Browse files

Merge "Dismiss keyguard when user button is tapped" 

am: e3d556f7

* commit 'e3d556f7':
  Dismiss keyguard when user button is tapped

Change-Id: I4fac2ae58c7ab0212894f2affcc364cc8f59d4ef
parents 5ec97664 e3d556f7

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

+5 −0
Original line number Original line Diff line number Diff line
@@ -31,6 +31,7 @@ import android.widget.TextView; 




import com.android.systemui.BatteryMeterView;

import com.android.systemui.BatteryMeterView;

import com.android.systemui.R;

import com.android.systemui.R;

import com.android.systemui.qs.QSPanel;

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

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

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

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

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

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

        });

    }

    }





    public void setQSPanel(QSPanel qsp) {

        mMultiUserSwitch.setQsPanel(qsp);

    }



    @Override

    @Override

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

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

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

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

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

+4 −5
Original line number Original line Diff line number Diff line
@@ -120,12 +120,11 @@ public class MultiUserSwitch extends FrameLayout implements View.OnClickListener 
                        mTmpInt2);

                        mTmpInt2);

            }

            }

        } else {

        } else {

            if (mQsPanel != null) {

                Intent intent = ContactsContract.QuickContact.composeQuickContactsIntent(

                Intent intent = ContactsContract.QuickContact.composeQuickContactsIntent(

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

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

                        ContactsContract.QuickContact.MODE_LARGE, null);

                        ContactsContract.QuickContact.MODE_LARGE, null);

            getContext().startActivityAsUser(intent, new UserHandle(UserHandle.USER_CURRENT));

                mQsPanel.getHost().startActivityDismissingKeyguard(intent);

            if (mQsPanel != null) {

                mQsPanel.getHost().collapsePanels();

            }

            }

        }

        }

    }

    }

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

+1 −0
Original line number Original line Diff line number Diff line
@@ -895,6 +895,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, 
            mBrightnessMirrorController = new BrightnessMirrorController(mStatusBarWindow);

            mBrightnessMirrorController = new BrightnessMirrorController(mStatusBarWindow);

            mQSPanel.setBrightnessMirror(mBrightnessMirrorController);

            mQSPanel.setBrightnessMirror(mBrightnessMirrorController);

            mHeader.setQSPanel(mQSPanel);

            mHeader.setQSPanel(mQSPanel);

            mKeyguardStatusBar.setQSPanel(mQSPanel);

            qsh.setCallback(new QSTileHost.Callback() {

            qsh.setCallback(new QSTileHost.Callback() {

                @Override

                @Override

                public void onTilesChanged() {

                public void onTilesChanged() {