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

Commit 9a5386f6 authored by Roman Birg's avatar Roman Birg Committed by Gerrit Code Review
Browse files

Revert "frameworks: set default expanded desktop style" 

There's currently some funky behavior related to this. The power menu 
option gets automatically added to the power menu when entering 
"Display" settings, no matter what.

This reverts commit a0c3610e.

Change-Id: I958e0e6f92cb8b90485af96ad55c221214007336
parent 521e840f

core/java/com/android/internal/util/cm/QSUtils.java

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ public class QSUtils { 


        public static boolean expandedDesktopEnabled(ContentResolver resolver) {

            return Settings.System.getIntForUser(resolver, Settings.System.EXPANDED_DESKTOP_STYLE,

                    2, UserHandle.USER_CURRENT_OR_SELF) != 0;

                    0, UserHandle.USER_CURRENT_OR_SELF) != 0;

        }



        public static boolean deviceSupportsNfc(Context ctx) {

packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java

+1 −1
Original line number Diff line number Diff line
@@ -245,7 +245,7 @@ public abstract class BaseStatusBar extends SystemUI implements 
            if (Settings.System.getIntForUser(resolver,

                    Settings.System.EXPANDED_DESKTOP_STATE, 0, UserHandle.USER_CURRENT) != 0) {

                mExpandedDesktopStyle = Settings.System.getIntForUser(mContext.getContentResolver(),

                        Settings.System.EXPANDED_DESKTOP_STYLE, 2, UserHandle.USER_CURRENT);

                        Settings.System.EXPANDED_DESKTOP_STYLE, 0, UserHandle.USER_CURRENT);

            }

            final String dndString = Settings.System.getString(mContext.getContentResolver(),

                    Settings.System.HEADS_UP_CUSTOM_VALUES);

policy/src/com/android/internal/policy/impl/GlobalActions.java

+1 −1
Original line number Diff line number Diff line
@@ -425,7 +425,7 @@ class GlobalActions implements DialogInterface.OnDismissListener, DialogInterfac 
                Settings.System.getIntForUser(cr,

                        Settings.System.EXPANDED_DESKTOP_STYLE, 0, UserHandle.USER_CURRENT) != 0

                && Settings.System.getIntForUser(cr,

                        Settings.System.POWER_MENU_EXPANDED_DESKTOP_ENABLED, 2, UserHandle.USER_CURRENT) == 1;

                        Settings.System.POWER_MENU_EXPANDED_DESKTOP_ENABLED, 0, UserHandle.USER_CURRENT) == 1;



        if (showExpandedDesktop) {

            mItems.add(mExpandDesktopModeOn);