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

Commit 3ed9d508 authored by Winson Chung's avatar Winson Chung Committed by Automerger Merge Worker
Browse files

Merge "Fix some small related to back button alpha" into sc-v2-dev am: 75867ae0 am: 747dae3b 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16487030

Change-Id: I1392f9f16613ef9fb0add480260d9d5af3fbed16
parents 33f1d348 747dae3b

quickstep/src/com/android/launcher3/taskbar/NavbarButtonsViewController.java

+10 −7
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ public class NavbarButtonsViewController { 
    private static final int FLAG_DISABLE_RECENTS = 1 << 8;

    private static final int FLAG_DISABLE_BACK = 1 << 9;

    private static final int FLAG_NOTIFICATION_SHADE_EXPANDED = 1 << 10;

    private static final int FLAG_SCREEN_PINNING_ACTIVE = 1 << 10;

    private static final int FLAG_SCREEN_PINNING_ACTIVE = 1 << 11;



    private static final int MASK_IME_SWITCHER_VISIBLE = FLAG_SWITCHER_SUPPORTED | FLAG_IME_VISIBLE;
@@ -266,16 +266,19 @@ public class NavbarButtonsViewController { 
        mBackButton = addButton(R.drawable.ic_sysbar_back, BUTTON_BACK,

                mNavButtonContainer, mControllers.navButtonController, R.id.back);

        mPropertyHolders.add(new StatePropertyHolder(mBackButton,

                flags -> (flags & FLAG_DISABLE_BACK) == 0));

                flags -> {

                    // Show only if not disabled, and if not on the keyguard or otherwise only when

                    // the bouncer or a lockscreen app is showing above the keyguard

                    boolean showingOnKeyguard = (flags & FLAG_KEYGUARD_VISIBLE) == 0 ||

                            (flags & FLAG_ONLY_BACK_FOR_BOUNCER_VISIBLE) != 0 ||

                            (flags & FLAG_KEYGUARD_OCCLUDED) != 0;

                    return (flags & FLAG_DISABLE_BACK) == 0

                            && ((flags & FLAG_KEYGUARD_VISIBLE) == 0 || showingOnKeyguard);

                }));

        boolean isRtl = Utilities.isRtl(mContext.getResources());

        mPropertyHolders.add(new StatePropertyHolder(

                mBackButton, flags -> (flags & FLAG_IME_VISIBLE) != 0, View.ROTATION,

                isRtl ? 90 : -90, 0));

        // Hide when keyguard is showing, show when bouncer or lock screen app is showing

        mPropertyHolders.add(new StatePropertyHolder(mBackButton,

                flags -> (flags & FLAG_KEYGUARD_VISIBLE) == 0 ||

                        (flags & FLAG_ONLY_BACK_FOR_BOUNCER_VISIBLE) != 0 ||

                        (flags & FLAG_KEYGUARD_OCCLUDED) != 0));

        // Translate back button to be at end/start of other buttons for keyguard

        int navButtonSize = mContext.getResources().getDimensionPixelSize(

                R.dimen.taskbar_nav_buttons_size);

quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java

+3 −0
Original line number Diff line number Diff line
@@ -429,6 +429,9 @@ public class TaskbarActivityContext extends ContextThemeWrapper implements Activ 
    }



    public void onNavButtonsDarkIntensityChanged(float darkIntensity) {

        if (!isUserSetupComplete()) {

            return;

        }

        mControllers.navbarButtonsViewController.getTaskbarNavButtonDarkIntensity()

                .updateValue(darkIntensity);

    }