From 7d8f0283c0bdeb3568853d41d930288b59a92441 Mon Sep 17 00:00:00 2001 From: Matt Pietal Date: Fri, 11 Jun 2021 09:55:01 -0400 Subject: [PATCH] Update wallet/controls QS tile positions For priority placement (users upgrading), slightly move the tiles down to positions 3/4 from 2/3 (0-based index). For new users of controls, make sure it appears on the first page of tiles. Fixes: 190717521 Test: atest WalletControllerImplTest DeviceControlsImplTest Change-Id: I6a273c38b267e5cdba79b2262f0870a6bc3e5eba --- .../statusbar/policy/DeviceControlsControllerImpl.kt | 5 ++--- .../systemui/statusbar/policy/WalletControllerImpl.kt | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/DeviceControlsControllerImpl.kt b/packages/SystemUI/src/com/android/systemui/statusbar/policy/DeviceControlsControllerImpl.kt index 7563b3082ed8f..3b272da837d98 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/DeviceControlsControllerImpl.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/DeviceControlsControllerImpl.kt @@ -27,7 +27,6 @@ import com.android.systemui.controls.ControlsServiceInfo import com.android.systemui.controls.dagger.ControlsComponent import com.android.systemui.controls.management.ControlsListingController import com.android.systemui.dagger.SysUISingleton -import com.android.systemui.qs.QSTileHost.POSITION_AT_END import com.android.systemui.settings.UserContextProvider import com.android.systemui.statusbar.policy.DeviceControlsController.Callback import com.android.systemui.util.settings.SecureSettings @@ -64,8 +63,8 @@ public class DeviceControlsControllerImpl @Inject constructor( companion object { private const val TAG = "DeviceControlsControllerImpl" - internal const val QS_PRIORITY_POSITION = 2 - internal const val QS_DEFAULT_POSITION = POSITION_AT_END + internal const val QS_PRIORITY_POSITION = 3 + internal const val QS_DEFAULT_POSITION = 7 internal const val PREFS_CONTROLS_SEEDING_COMPLETED = "SeedingCompleted" internal const val PREFS_CONTROLS_FILE = "controls_prefs" diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/WalletControllerImpl.kt b/packages/SystemUI/src/com/android/systemui/statusbar/policy/WalletControllerImpl.kt index af1284459d63f..143ba06747d33 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/WalletControllerImpl.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/WalletControllerImpl.kt @@ -33,7 +33,7 @@ public class WalletControllerImpl @Inject constructor( companion object { private const val TAG = "WalletControllerImpl" - internal const val QS_PRIORITY_POSITION = 2 + internal const val QS_PRIORITY_POSITION = 3 } /**