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

Commit bd4b6e57 authored by Sunny Goyal's avatar Sunny Goyal Committed by Automerger Merge Worker
Browse files

Merge "Updating target SDK for Launcher" into tm-dev am: df472f8d am: eaa56974 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17771194



Change-Id: I5c3303762a71301a38e7f9a7761cbff960f551d3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d00db76d eaa56974

AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
<manifest

    xmlns:android="http://schemas.android.com/apk/res/android"

    package="com.android.launcher3">

    <uses-sdk android:targetSdkVersion="30" android:minSdkVersion="26"/>

    <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.

quickstep/AndroidManifest-launcher.xml

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
<manifest

    xmlns:android="http://schemas.android.com/apk/res/android"

    package="com.android.launcher3">

    <uses-sdk android:targetSdkVersion="29" android:minSdkVersion="25"/>

    <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.

quickstep/src/com/android/launcher3/proxy/StartActivityParams.java

+5 −1
Original line number Diff line number Diff line
@@ -16,6 +16,10 @@ 


package com.android.launcher3.proxy;



import static android.app.PendingIntent.FLAG_MUTABLE;

import static android.app.PendingIntent.FLAG_ONE_SHOT;

import static android.app.PendingIntent.FLAG_UPDATE_CURRENT;



import android.app.Activity;

import android.app.PendingIntent;

import android.app.PendingIntent.CanceledException;
@@ -45,7 +49,7 @@ public class StartActivityParams implements Parcelable { 


    public StartActivityParams(Activity activity, int requestCode) {

        this(activity.createPendingResult(requestCode, new Intent(),

                PendingIntent.FLAG_ONE_SHOT | PendingIntent.FLAG_UPDATE_CURRENT), requestCode);

                FLAG_ONE_SHOT | FLAG_UPDATE_CURRENT | FLAG_MUTABLE), requestCode);

    }



    public StartActivityParams(PendingIntent pendingIntent, int requestCode) {

quickstep/tests/src/com/android/quickstep/DigitalWellBeingToastTest.java

+2 −1
Original line number Diff line number Diff line
@@ -46,7 +46,8 @@ public class DigitalWellBeingToastTest extends AbstractQuickStepTest { 
            runWithShellPermission(() ->

                    usageStatsManager.registerAppUsageLimitObserver(observerId, packages,

                            Duration.ofSeconds(600), Duration.ofSeconds(300),

                            PendingIntent.getActivity(mTargetContext, -1, new Intent(), 0)));

                            PendingIntent.getActivity(mTargetContext, -1, new Intent(),

                                    PendingIntent.FLAG_MUTABLE)));



            mLauncher.goHome();

            final DigitalWellBeingToast toast = getToast();

src/com/android/launcher3/Launcher.java

+3 −2
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 


package com.android.launcher3;



import static android.app.PendingIntent.FLAG_IMMUTABLE;

import static android.app.PendingIntent.FLAG_UPDATE_CURRENT;

import static android.content.pm.ActivityInfo.CONFIG_ORIENTATION;

import static android.content.pm.ActivityInfo.CONFIG_SCREEN_SIZE;

import static android.content.pm.ActivityInfo.CONFIG_UI_MODE;
@@ -434,8 +436,7 @@ public class Launcher extends StatefulActivity<LauncherState> 
                shareIntent.putExtra(Intent.EXTRA_TEXT, stackTrace);

                shareIntent = Intent.createChooser(shareIntent, null);

                PendingIntent sharePendingIntent = PendingIntent.getActivity(

                        this, 0, shareIntent, PendingIntent.FLAG_UPDATE_CURRENT

                );

                        this, 0, shareIntent, FLAG_UPDATE_CURRENT | FLAG_IMMUTABLE);



                Notification notification = new Notification.Builder(this, notificationChannelId)

                        .setSmallIcon(android.R.drawable.ic_menu_close_clear_cancel)