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

Unverified Commit dd7f9d76 authored by Adnan Begovic's avatar Adnan Begovic Committed by Michael Bestas
Browse files

fw: Move NAVBAR_LEFT_IN_LANDSCAPE to CMSettings. 

Change-Id: I30824dc84bd32e335dde53cee7e40c085894827c
parent 9b323961

core/java/android/provider/Settings.java

+0 −6
Original line number Diff line number Diff line
@@ -3769,12 +3769,6 @@ public final class Settings { 
          */

         public static final String VOLUME_KEY_CURSOR_CONTROL = "volume_key_cursor_control";



        /**

         * Whether navigation bar is placed on the left side in landscape mode

         * @hide

         */

        public static final String NAVBAR_LEFT_IN_LANDSCAPE = "navigation_bar_left";



        /**

         * Settings to backup. This is here so that it's in the same place as the settings

         * keys and easy to update.

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

+4 −4
Original line number Diff line number Diff line
@@ -479,8 +479,8 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, 
                    UserHandle.USER_ALL);

            resolver.registerContentObserver(Settings.System.getUriFor(

                    Settings.System.SCREEN_BRIGHTNESS_MODE), false, this, UserHandle.USER_ALL);

            resolver.registerContentObserver(Settings.System.getUriFor(

                    Settings.System.NAVBAR_LEFT_IN_LANDSCAPE), false, this, UserHandle.USER_ALL);

            resolver.registerContentObserver(CMSettings.System.getUriFor(

                    CMSettings.System.NAVBAR_LEFT_IN_LANDSCAPE), false, this, UserHandle.USER_ALL);

            update();

        }
@@ -504,8 +504,8 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, 
                    UserHandle.USER_CURRENT) == 1;



            if (mNavigationBarView != null) {

                boolean navLeftInLandscape = Settings.System.getIntForUser(resolver,

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

                boolean navLeftInLandscape = CMSettings.System.getIntForUser(resolver,

                        CMSettings.System.NAVBAR_LEFT_IN_LANDSCAPE, 0, UserHandle.USER_CURRENT) == 1;

                mNavigationBarView.setLeftInLandscape(navLeftInLandscape);

            }

        }

services/core/java/com/android/server/policy/PhoneWindowManager.java

+4 −4
Original line number Diff line number Diff line
@@ -1031,8 +1031,8 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
            resolver.registerContentObserver(Settings.System.getUriFor(

                    Settings.System.DEV_FORCE_SHOW_NAVBAR), false, this,

                    UserHandle.USER_ALL);

            resolver.registerContentObserver(Settings.System.getUriFor(

                    Settings.System.NAVBAR_LEFT_IN_LANDSCAPE), false, this,

            resolver.registerContentObserver(CMSettings.System.getUriFor(

                    CMSettings.System.NAVBAR_LEFT_IN_LANDSCAPE), false, this,

                    UserHandle.USER_ALL);

            updateSettings();

        }
@@ -2326,8 +2326,8 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
                mDevForceNavbar = devForceNavbar;

            }



            mNavigationBarLeftInLandscape = Settings.System.getIntForUser(resolver,

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

            mNavigationBarLeftInLandscape = CMSettings.System.getIntForUser(resolver,

                    CMSettings.System.NAVBAR_LEFT_IN_LANDSCAPE, 0, UserHandle.USER_CURRENT) == 1;



            updateKeyAssignments();