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

Commit 337c81f6 authored by Sunny Goyal's avatar Sunny Goyal
Browse files

Removing static instances of UserManagerCompat and AppWidgetManager 

> Changing the lifecycle to follow other static objects in Launcher
> Removing compat interface and inlining everything to helpers

Bug: 141376165
Change-Id: I82bd5db1969101de9a7eac77f32728d70195bb35
parent ebc50f30

go/quickstep/src/com/android/quickstep/TouchInteractionService.java

+0 −9
Original line number Diff line number Diff line
@@ -19,24 +19,15 @@ import static com.android.systemui.shared.system.QuickStepContract.KEY_EXTRA_SYS 


import android.annotation.TargetApi;

import android.app.Service;

import android.content.BroadcastReceiver;

import android.content.Context;

import android.content.Intent;

import android.content.IntentFilter;

import android.graphics.Region;

import android.os.Build;

import android.os.Bundle;

import android.os.IBinder;

import android.os.Process;

import android.os.RemoteException;

import android.util.Log;

import android.view.MotionEvent;



import com.android.launcher3.Utilities;

import com.android.launcher3.compat.UserManagerCompat;

import com.android.launcher3.util.DefaultDisplay;

import com.android.quickstep.RecentsAnimationDeviceState;

import com.android.quickstep.SystemUiProxy;

import com.android.systemui.shared.recents.IOverviewProxy;

import com.android.systemui.shared.recents.ISystemUiProxy;

quickstep/recents_ui_overrides/src/com/android/launcher3/appprediction/AllAppsTipView.java

+4 −4
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ import android.graphics.CornerPathEffect; 
import android.graphics.Paint;

import android.graphics.drawable.ShapeDrawable;

import android.os.Handler;

import android.os.UserManager;

import android.util.AttributeSet;

import android.util.TypedValue;

import android.view.Gravity;
@@ -33,6 +34,8 @@ import android.view.ViewGroup; 
import android.widget.LinearLayout;

import android.widget.TextView;



import androidx.core.content.ContextCompat;



import com.android.launcher3.AbstractFloatingView;

import com.android.launcher3.Launcher;

import com.android.launcher3.LauncherState;
@@ -41,13 +44,10 @@ import com.android.launcher3.R; 
import com.android.launcher3.Utilities;

import com.android.launcher3.allapps.FloatingHeaderView;

import com.android.launcher3.anim.Interpolators;

import com.android.launcher3.compat.UserManagerCompat;

import com.android.launcher3.dragndrop.DragLayer;

import com.android.launcher3.graphics.TriangleShape;

import com.android.systemui.shared.system.LauncherEventUtil;



import androidx.core.content.ContextCompat;



/**

 * All apps tip view aligned just above prediction apps, shown to users that enter all apps for the

 * first time.
@@ -151,7 +151,7 @@ public class AllAppsTipView extends AbstractFloatingView { 
                TYPE_ON_BOARD_POPUP | TYPE_DISCOVERY_BOUNCE) != null

                || !launcher.isInState(ALL_APPS)

                || hasSeenAllAppsTip(launcher)

                || UserManagerCompat.getInstance(launcher).isDemoUser()

                || launcher.getSystemService(UserManager.class).isDemoUser()

                || Utilities.IS_RUNNING_IN_TEST_HARNESS) {

            return false;

        }

quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java

+3 −8
Original line number Diff line number Diff line
@@ -17,10 +17,8 @@ package com.android.quickstep; 


import static android.content.Intent.ACTION_USER_UNLOCKED;



import static android.provider.Settings.System.HAPTIC_FEEDBACK_ENABLED;

import static com.android.launcher3.ResourceUtils.NAVBAR_BOTTOM_GESTURE_SIZE;

import static com.android.launcher3.ResourceUtils.NAVBAR_LANDSCAPE_LEFT_RIGHT_SIZE;

import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;

import static com.android.quickstep.SysUINavigationMode.Mode.NO_BUTTON;

import static com.android.quickstep.SysUINavigationMode.Mode.THREE_BUTTONS;

import static com.android.quickstep.SysUINavigationMode.Mode.TWO_BUTTONS;
@@ -42,12 +40,11 @@ import android.content.Context; 
import android.content.Intent;

import android.content.IntentFilter;

import android.content.res.Resources;

import android.database.ContentObserver;

import android.graphics.Point;

import android.graphics.RectF;

import android.graphics.Region;

import android.os.Process;

import android.provider.Settings;

import android.os.UserManager;

import android.text.TextUtils;

import android.util.Log;

import android.view.MotionEvent;
@@ -58,7 +55,6 @@ import androidx.annotation.BinderThread; 
import com.android.launcher3.R;

import com.android.launcher3.ResourceUtils;

import com.android.launcher3.Utilities;

import com.android.launcher3.compat.UserManagerCompat;

import com.android.launcher3.testing.TestProtocol;

import com.android.launcher3.util.DefaultDisplay;

import com.android.quickstep.SysUINavigationMode.NavigationModeChangeListener;
@@ -79,7 +75,6 @@ public class RecentsAnimationDeviceState implements 
        DefaultDisplay.DisplayInfoChangeListener {



    private final Context mContext;

    private final UserManagerCompat mUserManager;

    private final SysUINavigationMode mSysUiNavMode;

    private final DefaultDisplay mDefaultDisplay;

    private final int mDisplayId;
@@ -117,14 +112,14 @@ public class RecentsAnimationDeviceState implements 
    public RecentsAnimationDeviceState(Context context) {

        final ContentResolver resolver = context.getContentResolver();

        mContext = context;

        mUserManager = UserManagerCompat.getInstance(context);

        mSysUiNavMode = SysUINavigationMode.INSTANCE.get(context);

        mDefaultDisplay = DefaultDisplay.INSTANCE.get(context);

        mDisplayId = mDefaultDisplay.getInfo().id;

        runOnDestroy(() -> mDefaultDisplay.removeChangeListener(this));



        // Register for user unlocked if necessary

        mIsUserUnlocked = mUserManager.isUserUnlocked(Process.myUserHandle());

        mIsUserUnlocked = context.getSystemService(UserManager.class)

                .isUserUnlocked(Process.myUserHandle());

        if (!mIsUserUnlocked) {

            mContext.registerReceiver(mUserUnlockedReceiver,

                    new IntentFilter(ACTION_USER_UNLOCKED));

quickstep/src/com/android/quickstep/TaskUtils.java

+2 −2
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ import android.content.pm.PackageManager; 
import android.os.UserHandle;

import android.util.Log;



import com.android.launcher3.compat.UserManagerCompat;

import com.android.launcher3.pm.UserCache;

import com.android.launcher3.util.ComponentKey;

import com.android.launcher3.util.PackageManagerHelper;

import com.android.systemui.shared.recents.model.Task;
@@ -78,7 +78,7 @@ public final class TaskUtils { 
        if (currentUserId == UserHandle.myUserId()) {

            return true;

        }

        List<UserHandle> allUsers = UserManagerCompat.getInstance(context).getUserProfiles();

        List<UserHandle> allUsers = UserCache.INSTANCE.get(context).getUserProfiles();

        for (int i = allUsers.size() - 1; i >= 0; i--) {

            if (currentUserId == allUsers.get(i).getIdentifier()) {

                return true;

src/com/android/launcher3/AppInfo.java

+2 −2
Original line number Diff line number Diff line
@@ -24,8 +24,8 @@ import android.content.pm.LauncherActivityInfo; 
import android.os.Build;

import android.os.Process;

import android.os.UserHandle;

import android.os.UserManager;



import com.android.launcher3.compat.UserManagerCompat;

import com.android.launcher3.util.ComponentKey;

import com.android.launcher3.util.PackageManagerHelper;
@@ -65,7 +65,7 @@ public class AppInfo extends ItemInfoWithIcon { 
     * Must not hold the Context.

     */

    public AppInfo(Context context, LauncherActivityInfo info, UserHandle user) {

        this(info, user, UserManagerCompat.getInstance(context).isQuietModeEnabled(user));

        this(info, user, context.getSystemService(UserManager.class).isQuietModeEnabled(user));

    }



    public AppInfo(LauncherActivityInfo info, UserHandle user, boolean quietModeEnabled) {