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

Commit 410ff353 authored by Fabian Kozynski's avatar Fabian Kozynski Committed by Automerger Merge Worker
Browse files

Merge "Reduce the size of buttons in Global Actions Lite" into udc-dev am:... 

Merge "Reduce the size of buttons in Global Actions Lite" into udc-dev am: 629884d3 am: 0ac3ef3d

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23695623



Change-Id: Ibc1664b6c6ad84868a9d72915170926bc4fbf286
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 52d394b0 0ac3ef3d

packages/SystemUI/res/values-land/dimens.xml

+6 −0
Original line number Diff line number Diff line
@@ -76,4 +76,10 @@ 
    <!-- Bouncer user switcher margins -->

    <dimen name="bouncer_user_switcher_view_mode_user_switcher_bottom_margin">0dp</dimen>

    <dimen name="bouncer_user_switcher_view_mode_view_flipper_bottom_margin">0dp</dimen>



    <!-- Power Menu Lite -->

    <!-- These values are for small screen landscape. For larger landscape screens, they are

         overlaid -->

    <dimen name="global_actions_button_size">72dp</dimen>

    <dimen name="global_actions_button_padding">26dp</dimen>

</resources>

packages/SystemUI/res/values-sw410dp-land/dimens.xml

+4 −0
Original line number Diff line number Diff line
@@ -18,4 +18,8 @@ 
    <!-- Lock pattern view size, align sysui biometric_auth_pattern_view_size -->

    <dimen name="biometric_auth_pattern_view_size">248dp</dimen>

    <dimen name="biometric_auth_pattern_view_max_size">348dp</dimen>



    <!-- Power Menu Lite -->

    <dimen name="global_actions_button_size">96dp</dimen>

    <dimen name="global_actions_button_padding">38dp</dimen>

</resources>
 
 No newline at end of file

packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialogLite.java

+5 −1
Original line number Diff line number Diff line
@@ -249,6 +249,7 @@ public class GlobalActionsDialogLite implements DialogInterface.OnDismissListene 
    private int mDialogPressDelay = DIALOG_PRESS_DELAY; // ms

    protected Handler mMainHandler;

    private int mSmallestScreenWidthDp;

    private int mOrientation;

    private final Optional<CentralSurfaces> mCentralSurfacesOptional;

    private final KeyguardUpdateMonitor mKeyguardUpdateMonitor;

    private final DialogLaunchAnimator mDialogLaunchAnimator;
@@ -391,6 +392,7 @@ public class GlobalActionsDialogLite implements DialogInterface.OnDismissListene 
        mRingerModeTracker = ringerModeTracker;

        mMainHandler = handler;

        mSmallestScreenWidthDp = resources.getConfiguration().smallestScreenWidthDp;

        mOrientation = resources.getConfiguration().orientation;

        mCentralSurfacesOptional = centralSurfacesOptional;

        mKeyguardUpdateMonitor = keyguardUpdateMonitor;

        mDialogLaunchAnimator = dialogLaunchAnimator;
@@ -744,8 +746,10 @@ public class GlobalActionsDialogLite implements DialogInterface.OnDismissListene 
    @Override

    public void onConfigChanged(Configuration newConfig) {

        if (mDialog != null && mDialog.isShowing()

                && (newConfig.smallestScreenWidthDp != mSmallestScreenWidthDp)) {

                && (newConfig.smallestScreenWidthDp != mSmallestScreenWidthDp

                || newConfig.orientation != mOrientation)) {

            mSmallestScreenWidthDp = newConfig.smallestScreenWidthDp;

            mOrientation = newConfig.orientation;

            mDialog.refreshDialog();

        }

    }