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

Commit 30115c99 authored by Winson Chung's avatar Winson Chung Committed by Android (Google) Code Review
Browse files

Merge changes from topic "nav-bar-mode-fw-overlay" 

* changes:
  Overlaying the nav bar frame dimens
  Check the overlay state for updating sysui
  Removing old resources
  Remove the swipe up setting from system
parents a6feeb3a 77f16b4c

core/java/android/provider/Settings.java

+0 −14
Original line number Diff line number Diff line
@@ -8044,17 +8044,6 @@ public final class Settings { 
        private static final Validator CAMERA_DOUBLE_TWIST_TO_FLIP_ENABLED_VALIDATOR =

                BOOLEAN_VALIDATOR;













        /**













         * Whether the swipe up gesture to switch apps should be enabled.













         *













         * @hide













         */













        public static final String SWIPE_UP_TO_SWITCH_APPS_ENABLED =













                "swipe_up_to_switch_apps_enabled";

























        private static final Validator SWIPE_UP_TO_SWITCH_APPS_ENABLED_VALIDATOR =













                BOOLEAN_VALIDATOR;



























        /**















         * Whether or not the smart camera lift trigger that launches the camera when the user moves















         * the phone into a position for taking photos should be enabled.










@@ -8739,7 +8728,6 @@ public final class Settings {













            DISPLAY_WHITE_BALANCE_ENABLED,















            SYNC_PARENT_SOUNDS,















            CAMERA_DOUBLE_TWIST_TO_FLIP_ENABLED,













            SWIPE_UP_TO_SWITCH_APPS_ENABLED,















            CAMERA_DOUBLE_TAP_POWER_GESTURE_DISABLED,















            SYSTEM_NAVIGATION_KEYS_ENABLED,















            QS_TILES,










@@ -8902,8 +8890,6 @@ public final class Settings {













            VALIDATORS.put(SYNC_PARENT_SOUNDS, SYNC_PARENT_SOUNDS_VALIDATOR);















            VALIDATORS.put(CAMERA_DOUBLE_TWIST_TO_FLIP_ENABLED,















                    CAMERA_DOUBLE_TWIST_TO_FLIP_ENABLED_VALIDATOR);













            VALIDATORS.put(SWIPE_UP_TO_SWITCH_APPS_ENABLED,













                    SWIPE_UP_TO_SWITCH_APPS_ENABLED_VALIDATOR);















            VALIDATORS.put(CAMERA_DOUBLE_TAP_POWER_GESTURE_DISABLED,















                    CAMERA_DOUBLE_TAP_POWER_GESTURE_DISABLED_VALIDATOR);















            VALIDATORS.put(SYSTEM_NAVIGATION_KEYS_ENABLED,

































core/res/res/values/config.xml



+0
−3




























Original line number
Diff line number
Diff line








@@ -3760,9 +3760,6 @@













    <!-- Package name for ManagedProvisioning which is responsible for provisioning work profiles. -->















    <string name="config_managed_provisioning_package" translatable="false">com.android.managedprovisioning</string>





























    <!-- Whether or not swipe up gesture is enabled by default -->













    <bool name="config_swipe_up_gesture_default">false</bool>





























    <!-- Whether or not swipe up gesture's opt-in setting is available on this device -->















    <bool name="config_swipe_up_gesture_setting_available">false</bool>

















































core/res/res/values/symbols.xml



+0
−1




























Original line number
Diff line number
Diff line








@@ -3515,7 +3515,6 @@













  <java-symbol type="string" name="shortcut_restore_signature_mismatch" />















  <java-symbol type="string" name="shortcut_restore_unknown_issue" />





























  <java-symbol type="bool" name="config_swipe_up_gesture_default" />















  <java-symbol type="bool" name="config_swipe_up_gesture_setting_available" />































  <!-- From media projection -->

































packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java



+0
−6




























Original line number
Diff line number
Diff line








@@ -2410,12 +2410,6 @@ class SettingsProtoDumpUtil {













                Settings.Secure.WAKE_GESTURE_ENABLED,















                SecureSettingsProto.WAKE_GESTURE_ENABLED);





























        final long launcherToken = p.start(SecureSettingsProto.LAUNCHER);













        dumpSetting(s, p,













                Settings.Secure.SWIPE_UP_TO_SWITCH_APPS_ENABLED,













                SecureSettingsProto.Launcher.SWIPE_UP_TO_SWITCH_APPS_ENABLED);













        p.end(launcherToken);





























        final long zenToken = p.start(SecureSettingsProto.ZEN);















        dumpSetting(s, p,















                Settings.Secure.ZEN_DURATION,

































packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java



+1
−1




























Original line number
Diff line number
Diff line








@@ -4329,7 +4329,7 @@ public class SettingsProvider extends ContentProvider {













                    // Migrate the swipe up setting only if it is set















                    final SettingsState secureSettings = getSecureSettingsLocked(userId);















                    final Setting swipeUpSetting = secureSettings.getSettingLocked(













                            Secure.SWIPE_UP_TO_SWITCH_APPS_ENABLED);













                            "swipe_up_to_switch_apps_enabled");















                    if (swipeUpSetting != null && !swipeUpSetting.isNull()) {















                        navBarMode = swipeUpSetting.getValue().equals("1")















                                ? NAV_BAR_MODE_2BUTTON