aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-02-19 18:58:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

No more UserHandleCompat

Browse Source 
Bug: 32745285
Change-Id: I762fb4e268c1afe48a1860ab12a4ccb3f626aa95
This commit is contained in:
Sunny Goyal
2016-12-15 15:53:17 -08:00
parent 338dee9dd7
commit 7c74e4ae64
62 changed files with 376 additions and 505 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/com/android/launcher3/UninstallDropTarget.java
View File

@@ -8,14 +8,13 @@ import android.content.pm.ApplicationInfo;
import android.net.Uri;
import android.os.Build;
import android.os.Bundle;
import android.os.UserHandle;
import android.os.UserManager;
import android.util.AttributeSet;
import android.util.Pair;
import android.widget.Toast;
import com.android.launcher3.compat.LauncherActivityInfoCompat;
import com.android.launcher3.compat.LauncherAppsCompat;
import com.android.launcher3.compat.UserHandleCompat;
public class UninstallDropTarget extends ButtonDropTarget {
@@ -60,7 +59,7 @@ public class UninstallDropTarget extends ButtonDropTarget {
*/
private static ComponentName getUninstallTarget(Context context, Object item) {
Intent intent = null;
UserHandleCompat user = null;
UserHandle user = null;
if (item instanceof AppInfo) {
AppInfo info = (AppInfo) item;
intent = info.intent;
@@ -120,7 +119,7 @@ public class UninstallDropTarget extends ButtonDropTarget {
Uri.fromParts("package", cn.getPackageName(), cn.getClassName()))
.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK
| Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS);
info.user.addToIntent(intent, Intent.EXTRA_USER);
intent.putExtra(Intent.EXTRA_USER, info.user);
launcher.startActivity(intent);
isUninstallable = true;
}
@@ -139,7 +138,7 @@ public class UninstallDropTarget extends ButtonDropTarget {
*/
protected static void sendUninstallResult(
final Launcher launcher, boolean activityStarted,
final ComponentName cn, final UserHandleCompat user,
final ComponentName cn, final UserHandle user,
final DropTargetResultCallback callback) {
if (activityStarted) {
final Runnable checkIfUninstallWasSuccess = new Runnable() {