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

Commit 263a00c7 authored by Cyrus Boadway's avatar Cyrus Boadway
Browse files

Suppress Splash Screen on widget reconfiguration activity start 

When a widget configuration activity is started, it's started from
the launcher. Under some circumstances the launcher's splash screen
would be shown, rather than the splash screen corresponding to the
tapped app.

To avoid confusion, we suppress the splash screen for configuration
starts.

Bug: 190153065
Test: manual
Change-Id: Ib18851f1bb50b64bc5d47b8aa5931490c969b54b
parent f9df8f36

src/com/android/launcher3/widget/LauncherAppWidgetHost.java

+7 −1
Original line number Diff line number Diff line
@@ -60,6 +60,10 @@ public class LauncherAppWidgetHost extends AppWidgetHost { 
    private static final int FLAG_ACTIVITY_RESUMED = 1 << 3;

    private static final int FLAGS_SHOULD_LISTEN =

            FLAG_STATE_IS_NORMAL | FLAG_ACTIVITY_STARTED | FLAG_ACTIVITY_RESUMED;

    // TODO(b/191735836): Replace with ActivityOptions.KEY_SPLASH_SCREEN_STYLE when un-hidden

    private static final String KEY_SPLASH_SCREEN_STYLE = "android.activity.splashScreenStyle";

    // TODO(b/191735836): Replace with SplashScreen.SPLASH_SCREEN_STYLE_EMPTY when un-hidden

    private static final int SPLASH_SCREEN_STYLE_EMPTY = 0;



    public static final int APPWIDGET_HOST_ID = 1024;
@@ -329,7 +333,9 @@ public class LauncherAppWidgetHost extends AppWidgetHost { 
        if (view == null) return null;

        Object tag = view.getTag();

        if (!(tag instanceof ItemInfo)) return null;

        return activity.getActivityLaunchOptions(view, (ItemInfo) tag).toBundle();

        Bundle bundle = activity.getActivityLaunchOptions(view, (ItemInfo) tag).toBundle();

        bundle.putInt(KEY_SPLASH_SCREEN_STYLE, SPLASH_SCREEN_STYLE_EMPTY);

        return bundle;

    }



    private void sendActionCancelled(final BaseActivity activity, final int requestCode) {