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

Commit da74965c authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Update wallet/controls QS tile positions" into sc-dev am: 938e8adc 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14946253

Change-Id: I04fb04af202dcdecc1ea1ecf62123fbb24b67b7a
parents f51418fc 938e8adc

packages/SystemUI/src/com/android/systemui/statusbar/policy/DeviceControlsControllerImpl.kt

+2 −3
Original line number Diff line number Diff line
@@ -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"

packages/SystemUI/src/com/android/systemui/statusbar/policy/WalletControllerImpl.kt

+1 −1
Original line number Diff line number Diff line
@@ -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

    }



    /**