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

Commit 242bbe1b authored by Kenny Guy's avatar Kenny Guy
Browse files

Remove reflection now we are building against L 

Remove reflection and update changed renamed L APIs
now that branch has L sdk.

Change-Id: I223c6528487110eb328e2e229bbcbefb701e0c20
parent 9c599c2a

Android.mk

+2 −1
Original line number Diff line number Diff line
@@ -36,7 +36,8 @@ LOCAL_AAPT_FLAGS := --auto-add-overlay 
LOCAL_PROTOC_OPTIMIZE_TYPE := nano

LOCAL_PROTOC_FLAGS := --proto_path=$(LOCAL_PATH)/protos/



LOCAL_SDK_VERSION := 19

# STOPSHIP(kennyguy): change to 21 once the L SDK is baked.

LOCAL_SDK_VERSION := current



LOCAL_PACKAGE_NAME := Launcher3

#LOCAL_CERTIFICATE := shared

src/com/android/launcher3/AppInfo.java

+1 −1
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ public class AppInfo extends ItemInfo { 
    }



    private static int initFlags(LauncherActivityInfoCompat info) {

        int appFlags = info.getApplicationFlags();

        int appFlags = info.getApplicationInfo().flags;

        int flags = 0;

        if ((appFlags & android.content.pm.ApplicationInfo.FLAG_SYSTEM) == 0) {

            flags |= DOWNLOADED_FLAG;

src/com/android/launcher3/Launcher.java

+2 −2
Original line number Diff line number Diff line
@@ -2753,8 +2753,8 @@ public class Launcher extends Activity 
                // Could be launching some bookkeeping activity

                startActivity(intent, optsBundle);

            } else {

                launcherApps.startActivityForProfile(intent.getComponent(),

                        intent.getSourceBounds(), optsBundle, user);

                launcherApps.startActivityForProfile(intent.getComponent(), user,

                        intent.getSourceBounds(), optsBundle);

            }

            return true;

        } catch (SecurityException e) {

src/com/android/launcher3/LauncherAppState.java

+2 −2
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ public class LauncherAppState implements DeviceProfile.DeviceProfileCallbacks { 
        mBuildInfo = BuildInfo.loadByName(sContext.getString(R.string.build_info_class));

        mModel = new LauncherModel(this, mIconCache, mAppFilter);

        final LauncherAppsCompat launcherApps = LauncherAppsCompat.getInstance(sContext);

        launcherApps.addOnAppsChangedListener(mModel);

        launcherApps.addOnAppsChangedCallback(mModel);



        // Register intent receivers

        IntentFilter filter = new IntentFilter();
@@ -128,7 +128,7 @@ public class LauncherAppState implements DeviceProfile.DeviceProfileCallbacks { 
    public void onTerminate() {

        sContext.unregisterReceiver(mModel);

        final LauncherAppsCompat launcherApps = LauncherAppsCompat.getInstance(sContext);

        launcherApps.removeOnAppsChangedListener(mModel);

        launcherApps.removeOnAppsChangedCallback(mModel);



        ContentResolver resolver = sContext.getContentResolver();

        resolver.unregisterContentObserver(mFavoritesObserver);

src/com/android/launcher3/LauncherModel.java

+6 −6
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ import java.util.concurrent.atomic.AtomicBoolean; 
 * for the Launcher.

 */

public class LauncherModel extends BroadcastReceiver

        implements LauncherAppsCompat.OnAppsChangedListenerCompat {

        implements LauncherAppsCompat.OnAppsChangedCallbackCompat {

    static final boolean DEBUG_LOADERS = false;

    private static final boolean DEBUG_RECEIVER = true;  // STOPSHIP(cwren) temporary for debugging
@@ -1186,28 +1186,28 @@ public class LauncherModel extends BroadcastReceiver 
    }



    @Override

    public void onPackageChanged(UserHandleCompat user, String packageName) {

    public void onPackageChanged(String packageName, UserHandleCompat user) {

        int op = PackageUpdatedTask.OP_UPDATE;

        enqueuePackageUpdated(new PackageUpdatedTask(op, new String[] { packageName },

                user));

    }



    @Override

    public void onPackageRemoved(UserHandleCompat user, String packageName) {

    public void onPackageRemoved(String packageName, UserHandleCompat user) {

        int op = PackageUpdatedTask.OP_REMOVE;

        enqueuePackageUpdated(new PackageUpdatedTask(op, new String[] { packageName },

                user));

    }



    @Override

    public void onPackageAdded(UserHandleCompat user, String packageName) {

    public void onPackageAdded(String packageName, UserHandleCompat user) {

        int op = PackageUpdatedTask.OP_ADD;

        enqueuePackageUpdated(new PackageUpdatedTask(op, new String[] { packageName },

                user));

    }



    @Override

    public void onPackagesAvailable(UserHandleCompat user, String[] packageNames,

    public void onPackagesAvailable(String[] packageNames, UserHandleCompat user,

            boolean replacing) {

        if (!replacing) {

            enqueuePackageUpdated(new PackageUpdatedTask(PackageUpdatedTask.OP_ADD, packageNames,
@@ -1226,7 +1226,7 @@ public class LauncherModel extends BroadcastReceiver 
    }



    @Override

    public void onPackagesUnavailable(UserHandleCompat user, String[] packageNames,

    public void onPackagesUnavailable(String[] packageNames, UserHandleCompat user,

            boolean replacing) {

        if (!replacing) {

            enqueuePackageUpdated(new PackageUpdatedTask(