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

Commit 78ea2e12 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Sets the home handle default to always visible"

parents dd95b13b 95331c4a

core/java/com/android/internal/config/sysui/SystemUiDeviceConfigFlags.java

+2 −1
Original line number Diff line number Diff line
@@ -367,7 +367,8 @@ public final class SystemUiDeviceConfigFlags { 
    /**

     * (boolean) Whether to force the Nav Bar handle to remain visible over the lockscreen.

     */

    public static final String NAV_BAR_HANDLE_SHOW_OVER_LOCKSCREEN = "nav_bar_handle_show_over_lockscreen";

    public static final String NAV_BAR_HANDLE_SHOW_OVER_LOCKSCREEN =

            "nav_bar_handle_show_over_lockscreen";



    private SystemUiDeviceConfigFlags() {

    }

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

+2 −2
Original line number Diff line number Diff line
@@ -709,14 +709,14 @@ public class KeyguardViewMediator extends SystemUI { 
        mShowHomeOverLockscreen = DeviceConfig.getBoolean(

                DeviceConfig.NAMESPACE_SYSTEMUI,

                NAV_BAR_HANDLE_SHOW_OVER_LOCKSCREEN,

                /* defaultValue = */ false);

                /* defaultValue = */ true);

        DeviceConfig.addOnPropertiesChangedListener(DeviceConfig.NAMESPACE_SYSTEMUI, mHandler::post,

                new DeviceConfig.OnPropertiesChangedListener() {

                    @Override

                    public void onPropertiesChanged(DeviceConfig.Properties properties) {

                        if (properties.getKeyset().contains(NAV_BAR_HANDLE_SHOW_OVER_LOCKSCREEN)) {

                            mShowHomeOverLockscreen = properties.getBoolean(

                                    NAV_BAR_HANDLE_SHOW_OVER_LOCKSCREEN, false /* defaultValue */);

                                    NAV_BAR_HANDLE_SHOW_OVER_LOCKSCREEN, true /* defaultValue */);

                        }

                    }

                });

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

+2 −2
Original line number Diff line number Diff line
@@ -302,14 +302,14 @@ public class NavigationBarFragment extends LifecycleFragment implements Callback 
        mForceNavBarHandleOpaque = DeviceConfig.getBoolean(

                DeviceConfig.NAMESPACE_SYSTEMUI,

                NAV_BAR_HANDLE_FORCE_OPAQUE,

                /* defaultValue = */ false);

                /* defaultValue = */ true);

        DeviceConfig.addOnPropertiesChangedListener(DeviceConfig.NAMESPACE_SYSTEMUI, mHandler::post,

                new DeviceConfig.OnPropertiesChangedListener() {

                    @Override

                    public void onPropertiesChanged(DeviceConfig.Properties properties) {

                        if (properties.getKeyset().contains(NAV_BAR_HANDLE_FORCE_OPAQUE)) {

                            mForceNavBarHandleOpaque = properties.getBoolean(

                                    NAV_BAR_HANDLE_FORCE_OPAQUE, /* defaultValue = */ false);

                                    NAV_BAR_HANDLE_FORCE_OPAQUE, /* defaultValue = */ true);

                        }

                    }

                });