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

Commit 015bee7a authored by Sunny Goyal's avatar Sunny Goyal Committed by Android (Google) Code Review
Browse files

Merge "Removing dependency on LauncherActivityInfoCompatV16" into ub-launcher3-master

parents 6b910a23 1582f167

src/com/android/launcher3/InstallShortcutReceiver.java

+4 −11
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ import android.content.Intent; 
import android.content.SharedPreferences;

import android.content.pm.ActivityInfo;

import android.content.pm.PackageManager;

import android.content.pm.ResolveInfo;

import android.graphics.Bitmap;

import android.graphics.BitmapFactory;

import android.text.TextUtils;
@@ -434,22 +433,16 @@ public class InstallShortcutReceiver extends BroadcastReceiver { 
            // Already an activity target

            return original;

        }

        if (!Utilities.isLauncherAppTarget(original.launchIntent)

                || !original.user.equals(UserHandleCompat.myUserHandle())) {

            // We can only convert shortcuts which point to a main activity in the current user.

        if (!Utilities.isLauncherAppTarget(original.launchIntent)) {

            return original;

        }



        PackageManager pm = original.mContext.getPackageManager();

        ResolveInfo info = pm.resolveActivity(original.launchIntent, 0);



        LauncherActivityInfoCompat info = LauncherAppsCompat.getInstance(original.mContext)

                .resolveActivity(original.launchIntent, original.user);

        if (info == null) {

            return original;

        }



        // Ignore any conflicts in the label name, as that can change based on locale.

        LauncherActivityInfoCompat launcherInfo = LauncherActivityInfoCompat

                .fromResolveInfo(info, original.mContext);

        return new PendingInstallShortcutInfo(launcherInfo, original.mContext);

        return new PendingInstallShortcutInfo(info, original.mContext);

    }

}

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

+0 −9
Original line number Diff line number Diff line
@@ -17,9 +17,7 @@ 
package com.android.launcher3.compat;



import android.content.ComponentName;

import android.content.Context;

import android.content.pm.ApplicationInfo;

import android.content.pm.ResolveInfo;

import android.graphics.drawable.Drawable;



public abstract class LauncherActivityInfoCompat {
@@ -33,11 +31,4 @@ public abstract class LauncherActivityInfoCompat { 
    public abstract Drawable getIcon(int density);

    public abstract ApplicationInfo getApplicationInfo();

    public abstract long getFirstInstallTime();



    /**

     * Creates a LauncherActivityInfoCompat for the primary user.

     */

    public static LauncherActivityInfoCompat fromResolveInfo(ResolveInfo info, Context context) {

        return new LauncherActivityInfoCompatV16(context, info);

    }

}