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

Commit 61fc3ea5 authored by Alex Stetson's avatar Alex Stetson
Browse files

[DO NOT MERGE] Replace UserHandle.CURRENT with UserTracker 

Bug: 249831072
Test: atest SystemUITests
Change-Id: Id98ed38495feaab4780452ded14fe24b68ae6944
parent a34b7aaf

packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitchController.java

+1 −1
Original line number Diff line number Diff line
@@ -199,7 +199,7 @@ public class KeyguardClockSwitchController extends ViewController<KeyguardClockS 
        }



        mSecureSettings.registerContentObserverForUser(

                Settings.Secure.getUriFor(Settings.Secure.LOCKSCREEN_USE_DOUBLE_LINE_CLOCK),

                Settings.Secure.LOCKSCREEN_USE_DOUBLE_LINE_CLOCK,

                false, /* notifyForDescendants */

                mDoubleLineClockObserver,

                UserHandle.USER_ALL

packages/SystemUI/src/com/android/systemui/accessibility/AccessibilityButtonModeObserver.java

+3 −2
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ import android.provider.Settings; 
import android.util.Log;



import com.android.systemui.dagger.SysUISingleton;

import com.android.systemui.settings.UserTracker;



import java.lang.annotation.Retention;

import java.lang.annotation.RetentionPolicy;
@@ -67,8 +68,8 @@ public class AccessibilityButtonModeObserver extends 
    }



    @Inject

    public AccessibilityButtonModeObserver(Context context) {

        super(context, Settings.Secure.ACCESSIBILITY_BUTTON_MODE);

    public AccessibilityButtonModeObserver(Context context, UserTracker userTracker) {

        super(context, userTracker, Settings.Secure.ACCESSIBILITY_BUTTON_MODE);

    }



    @Override

packages/SystemUI/src/com/android/systemui/accessibility/AccessibilityButtonTargetsObserver.java

+3 −2
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import androidx.annotation.MainThread; 
import androidx.annotation.Nullable;



import com.android.systemui.dagger.SysUISingleton;

import com.android.systemui.settings.UserTracker;



import javax.inject.Inject;
@@ -48,8 +49,8 @@ public class AccessibilityButtonTargetsObserver extends 
    }



    @Inject

    public AccessibilityButtonTargetsObserver(Context context) {

        super(context, Settings.Secure.ACCESSIBILITY_BUTTON_TARGETS);

    public AccessibilityButtonTargetsObserver(Context context, UserTracker userTracker) {

        super(context, userTracker, Settings.Secure.ACCESSIBILITY_BUTTON_TARGETS);

    }



    @Override

packages/SystemUI/src/com/android/systemui/accessibility/SecureSettingsContentObserver.java

+6 −2
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ import android.provider.Settings; 
import androidx.annotation.NonNull;



import com.android.internal.annotations.VisibleForTesting;

import com.android.systemui.settings.UserTracker;



import java.util.ArrayList;

import java.util.List;
@@ -44,6 +45,7 @@ import java.util.Objects; 
public abstract class SecureSettingsContentObserver<T> {



    private final ContentResolver mContentResolver;

    private final UserTracker mUserTracker;

    @VisibleForTesting

    final ContentObserver mContentObserver;
@@ -52,9 +54,11 @@ public abstract class SecureSettingsContentObserver<T> { 
    @VisibleForTesting

    final List<T> mListeners = new ArrayList<>();



    protected SecureSettingsContentObserver(Context context, String secureSettingsKey) {

    protected SecureSettingsContentObserver(Context context, UserTracker userTracker,

            String secureSettingsKey) {

        mKey = secureSettingsKey;

        mContentResolver = context.getContentResolver();

        mUserTracker = userTracker;

        mContentObserver = new ContentObserver(new Handler(Looper.getMainLooper())) {

            @Override

            public void onChange(boolean selfChange) {
@@ -103,7 +107,7 @@ public abstract class SecureSettingsContentObserver<T> { 
     * See {@link Settings.Secure}.

     */

    public final String getSettingsValue() {

        return Settings.Secure.getStringForUser(mContentResolver, mKey, UserHandle.USER_CURRENT);

        return Settings.Secure.getStringForUser(mContentResolver, mKey, mUserTracker.getUserId());

    }



    private void updateValueChanged() {

packages/SystemUI/src/com/android/systemui/accessibility/SystemActions.java

+5 −2
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ import android.os.Looper; 
import android.os.PowerManager;

import android.os.RemoteException;

import android.os.SystemClock;

import android.os.UserHandle;

import android.util.Log;

import android.view.Display;

import android.view.IWindowManager;
@@ -52,6 +51,7 @@ import com.android.internal.util.ScreenshotHelper; 
import com.android.systemui.CoreStartable;

import com.android.systemui.dagger.SysUISingleton;

import com.android.systemui.recents.Recents;

import com.android.systemui.settings.UserTracker;

import com.android.systemui.shade.ShadeController;

import com.android.systemui.statusbar.CommandQueue;

import com.android.systemui.statusbar.NotificationShadeWindowController;
@@ -179,6 +179,7 @@ public class SystemActions implements CoreStartable { 


    private final SystemActionsBroadcastReceiver mReceiver;

    private final Context mContext;

    private final UserTracker mUserTracker;

    private final Optional<Recents> mRecentsOptional;

    private Locale mLocale;

    private final AccessibilityManager mA11yManager;
@@ -190,11 +191,13 @@ public class SystemActions implements CoreStartable { 


    @Inject

    public SystemActions(Context context,

            UserTracker userTracker,

            NotificationShadeWindowController notificationShadeController,

            ShadeController shadeController,

            Lazy<Optional<CentralSurfaces>> centralSurfacesOptionalLazy,

            Optional<Recents> recentsOptional) {

        mContext = context;

        mUserTracker = userTracker;

        mShadeController = shadeController;

        mRecentsOptional = recentsOptional;

        mReceiver = new SystemActionsBroadcastReceiver();
@@ -525,7 +528,7 @@ public class SystemActions implements CoreStartable { 
        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);

        final String chooserClassName = AccessibilityButtonChooserActivity.class.getName();

        intent.setClassName(CHOOSER_PACKAGE_NAME, chooserClassName);

        mContext.startActivityAsUser(intent, UserHandle.CURRENT);

        mContext.startActivityAsUser(intent, mUserTracker.getUserHandle());

    }



    private void handleAccessibilityShortcut() {