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

Commit b02dafc1 authored by Sunny Goyal's avatar Sunny Goyal
Browse files

Removing explicit target SDK for launcher

> It will automatically target the latest SDK it was compiled with

Bug: 284349887
Test: Presubmit and manual
Flag: N/A
Change-Id: I32629b0dd710c3c04d8f70f988b7279e7cae6731
parent a4d1e9aa
Loading
Loading
Loading
Loading
+0 −1
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@
<manifest
    xmlns:android="http://schemas.android.com/apk/res/android"
    package="com.android.launcher3">
    <uses-sdk android:targetSdkVersion="33" android:minSdkVersion="26"/>
    <!--
    Manifest entries specific to Launcher3. This is merged with AndroidManifest-common.xml.
    Refer comments around specific entries on how to extend individual components.
+5 −1
Original line number Diff line number Diff line
@@ -20,7 +20,10 @@ import static android.app.PendingIntent.FLAG_MUTABLE;
import static android.app.PendingIntent.FLAG_ONE_SHOT;
import static android.app.PendingIntent.FLAG_UPDATE_CURRENT;

import static com.android.launcher3.Utilities.allowBGLaunch;

import android.app.Activity;
import android.app.ActivityOptions;
import android.app.PendingIntent;
import android.app.PendingIntent.CanceledException;
import android.content.Context;
@@ -91,9 +94,10 @@ public class StartActivityParams implements Parcelable {
    }

    public void deliverResult(Context context, int resultCode, Intent data) {
        ActivityOptions options = allowBGLaunch(ActivityOptions.makeBasic());
        try {
            if (mPICallback != null) {
                mPICallback.send(context, resultCode, data);
                mPICallback.send(context, resultCode, data, null, null, null, options.toBundle());
            }
        } catch (CanceledException e) {
            Log.e(TAG, "Unable to send back result", e);
+2 −0
Original line number Diff line number Diff line
@@ -579,6 +579,8 @@ public class TaskbarActivityContext extends BaseTaskbarContext {
                Executors.MAIN_EXECUTOR.getHandler(), null,
                elapsedRealTime -> callbacks.executeAllAndDestroy());
        options.setSplashScreenStyle(splashScreenStyle);
        options.setPendingIntentBackgroundActivityStartMode(
                ActivityOptions.MODE_BACKGROUND_ACTIVITY_START_ALLOWED);
        return new ActivityOptionsWrapper(options, callbacks);
    }

+4 −0
Original line number Diff line number Diff line
@@ -1105,6 +1105,8 @@ public class QuickstepLauncher extends Launcher {
        activityOptions.options.setLaunchDisplayId(
                (v != null && v.getDisplay() != null) ? v.getDisplay().getDisplayId()
                        : Display.DEFAULT_DISPLAY);
        activityOptions.options.setPendingIntentBackgroundActivityStartMode(
                ActivityOptions.MODE_BACKGROUND_ACTIVITY_START_ALLOWED);
        addLaunchCookie(item, activityOptions.options);
        return activityOptions;
    }
@@ -1117,6 +1119,8 @@ public class QuickstepLauncher extends Launcher {
                Executors.MAIN_EXECUTOR.getHandler(), null,
                elapsedRealTime -> callbacks.executeAllAndDestroy());
        options.setSplashScreenStyle(splashScreenStyle);
        options.setPendingIntentBackgroundActivityStartMode(
                ActivityOptions.MODE_BACKGROUND_ACTIVITY_START_ALLOWED);
        return new ActivityOptionsWrapper(options, callbacks);
    }

+2 −0
Original line number Diff line number Diff line
@@ -275,6 +275,8 @@ public final class RecentsActivity extends StatefulActivity<RecentsState> {
        activityOptions.options.setLaunchDisplayId(
                (v != null && v.getDisplay() != null) ? v.getDisplay().getDisplayId()
                        : Display.DEFAULT_DISPLAY);
        activityOptions.options.setPendingIntentBackgroundActivityStartMode(
                ActivityOptions.MODE_BACKGROUND_ACTIVITY_START_ALLOWED);
        mHandler.postDelayed(mAnimationStartTimeoutRunnable, RECENTS_ANIMATION_TIMEOUT);
        return activityOptions;
    }
Loading