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

Commit 90926799 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Deprecate work folder" into ub-launcher3-master

parents 3e3e87e6 1b6826c5

src/com/android/launcher3/LauncherProvider.java

+1 −6
Original line number Diff line number Diff line
@@ -60,7 +60,6 @@ import com.android.launcher3.model.ModelWriter; 
import com.android.launcher3.provider.LauncherDbUtils;

import com.android.launcher3.provider.LauncherDbUtils.SQLiteTransaction;

import com.android.launcher3.provider.RestoreDbTask;

import com.android.launcher3.util.ManagedProfileHeuristic;

import com.android.launcher3.util.NoLocaleSqliteContext;

import com.android.launcher3.util.Preconditions;

import com.android.launcher3.util.Thunk;
@@ -629,10 +628,6 @@ public class LauncherProvider extends ContentProvider { 


            // Set the flag for empty DB

            Utilities.getPrefs(mContext).edit().putBoolean(EMPTY_DATABASE_CREATED, true).commit();



            // When a new DB is created, remove all previously stored managed profile information.

            ManagedProfileHeuristic.processAllUsers(Collections.<UserHandle>emptyList(),

                    mContext);

        }



        public long getDefaultUserSerial() {
@@ -796,7 +791,7 @@ public class LauncherProvider extends ContentProvider { 
                case 23:

                    // No-op

                case 24:

                    ManagedProfileHeuristic.markExistingUsersForNoFolderCreation(mContext);

                    // No-op

                case 25:

                    convertShortcutsToLauncherActivities(db);

                case 26:

src/com/android/launcher3/SessionCommitReceiver.java

+3 −5
Original line number Diff line number Diff line
@@ -67,12 +67,10 @@ public class SessionCommitReceiver extends BroadcastReceiver { 
        SessionInfo info = intent.getParcelableExtra(PackageInstaller.EXTRA_SESSION);

        UserHandle user = intent.getParcelableExtra(Intent.EXTRA_USER);



        if (Process.myUserHandle().equals(user)) {

        if (TextUtils.isEmpty(info.getAppPackageName()) ||

                info.getInstallReason() != PackageManager.INSTALL_REASON_USER) {

            return;

        }

        }



        queueAppIconAddition(context, info.getAppPackageName(), user);

    }

src/com/android/launcher3/compat/UserManagerCompat.java

+0 −1
Original line number Diff line number Diff line
@@ -58,7 +58,6 @@ public abstract class UserManagerCompat { 
    public abstract long getSerialNumberForUser(UserHandle user);

    public abstract UserHandle getUserForSerialNumber(long serialNumber);

    public abstract CharSequence getBadgedLabelForUser(CharSequence label, UserHandle user);

    public abstract long getUserCreationTime(UserHandle user);

    public abstract boolean isQuietModeEnabled(UserHandle user);

    public abstract boolean isUserUnlocked(UserHandle user);

src/com/android/launcher3/compat/UserManagerCompatVL.java

+0 −11
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ import android.os.UserHandle; 
import android.os.UserManager;

import android.util.ArrayMap;

import com.android.launcher3.util.LongArrayMap;

import com.android.launcher3.util.ManagedProfileHeuristic;

import java.util.ArrayList;

import java.util.Collections;

import java.util.List;
@@ -127,15 +126,5 @@ public class UserManagerCompatVL extends UserManagerCompat { 
        }

        return mPm.getUserBadgedLabel(label, user);

    }



    @Override

    public long getUserCreationTime(UserHandle user) {

        SharedPreferences prefs = ManagedProfileHeuristic.prefs(mContext);

        String key = USER_CREATION_TIME_KEY + getSerialNumberForUser(user);

        if (!prefs.contains(key)) {

            prefs.edit().putLong(key, System.currentTimeMillis()).apply();

        }

        return prefs.getLong(key, 0);

    }

}

src/com/android/launcher3/compat/UserManagerCompatVM.java

+0 −5
Original line number Diff line number Diff line
@@ -27,9 +27,4 @@ public class UserManagerCompatVM extends UserManagerCompatVL { 
    UserManagerCompatVM(Context context) {

        super(context);

    }



    @Override

    public long getUserCreationTime(UserHandle user) {

        return mUserManager.getUserCreationTime(user);

    }

}