diff options
author | Vinit Nayak <peanutbutter@google.com> | 2019-07-10 14:25:32 -0700 |
---|---|---|
committer | Vinit Nayak <peanutbutter@google.com> | 2019-07-19 11:11:35 -0700 |
commit | f9b585b507bca5afb0e443ec4cfd5f98829a73b1 (patch) | |
tree | 4ea4d2115163d24c41b6c68e50a207db7c18d055 /quickstep/recents_ui_overrides/src/com/android/quickstep/TaskSystemShortcut.java | |
parent | d3c2a6cecfab92d9852e3c55f9798c207bdd0a9c (diff) | |
download | android_packages_apps_Trebuchet-f9b585b507bca5afb0e443ec4cfd5f98829a73b1.tar.gz android_packages_apps_Trebuchet-f9b585b507bca5afb0e443ec4cfd5f98829a73b1.tar.bz2 android_packages_apps_Trebuchet-f9b585b507bca5afb0e443ec4cfd5f98829a73b1.zip |
Don't specify 1P Launcher3 type if 3P Launcher is active
Instead of referencing Launcher directly (which may not be
present when there's a 3P launcher), reference the lowest
common ancestor of Launcher and RecentActivity to avoid
ClassCastExceptions.
Test: Visually inspected that Pixel Launcher crash dialog
no longer pops up.
* Install 3P launcher
* In developer options enable "enable freeform windows"
* Restart phone for settings to take effect
* Try to use it on any app you have in recent tasks
Fixes: 135419782
Change-Id: Ie1f54880ab46956b23e253850ca7f79b161da9bd
Diffstat (limited to 'quickstep/recents_ui_overrides/src/com/android/quickstep/TaskSystemShortcut.java')
-rw-r--r-- | quickstep/recents_ui_overrides/src/com/android/quickstep/TaskSystemShortcut.java | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/TaskSystemShortcut.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/TaskSystemShortcut.java index 213c5d324..cfd14bb29 100644 --- a/quickstep/recents_ui_overrides/src/com/android/quickstep/TaskSystemShortcut.java +++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/TaskSystemShortcut.java @@ -36,8 +36,6 @@ import android.view.View; import com.android.launcher3.BaseDraggingActivity; import com.android.launcher3.DeviceProfile; import com.android.launcher3.ItemInfo; -import com.android.launcher3.Launcher; -import com.android.launcher3.LauncherState; import com.android.launcher3.R; import com.android.launcher3.WorkspaceItemInfo; import com.android.launcher3.popup.SystemShortcut; @@ -268,12 +266,16 @@ public class TaskSystemShortcut<T extends SystemShortcut> extends SystemShortcut @Override protected ActivityOptions makeLaunchOptions(Activity activity) { - return ActivityOptionsCompat.makeFreeformOptions(); + ActivityOptions activityOptions = ActivityOptionsCompat.makeFreeformOptions(); + // Arbitrary bounds only because freeform is in dev mode right now + Rect r = new Rect(50, 50, 200, 200); + activityOptions.setLaunchBounds(r); + return activityOptions; } @Override protected boolean onActivityStarted(BaseDraggingActivity activity) { - Launcher.getLauncher(activity).getStateManager().goToState(LauncherState.NORMAL); + activity.returnToHomescreen(); return true; } } |