From 5a81c3806b31c7763734e287d4cf2ed11294281d Mon Sep 17 00:00:00 2001 From: Sunny Goyal Date: Mon, 20 Mar 2017 15:08:06 -0700 Subject: [PATCH] Fixing multiwindow drag operation during with rotation. > Finishing activity when rotation preference change. This ensures that any prefenrece change is immediately applied instead of waiting for resume as the new activity is always started with proper setting. > Clearing task when starting drag in landscape mode. This ensures that a new activity instance is started in this case, which overrides previous locked rotation by launcher activity. > Handling drag request in onCreate and enabling rotation based on it. > Clearing any request from the launcher intent once the drag operation is complete Bug: 36226746 Change-Id: I69f56c13827c25f3e1bc84935cb2acc59b6bd349 --- src/com/android/launcher3/Launcher.java | 29 +++++++------------ .../launcher3/dragndrop/AddItemActivity.java | 12 ++++++++ .../dragndrop/PinItemDragListener.java | 23 +++++++++++++++ 3 files changed, 45 insertions(+), 19 deletions(-) diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index 2dba83df65..3be6225fcf 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -49,7 +49,6 @@ import android.os.AsyncTask; import android.os.Build; import android.os.Bundle; import android.os.Handler; -import android.os.Parcelable; import android.os.Process; import android.os.StrictMode; import android.os.SystemClock; @@ -444,6 +443,11 @@ public class Launcher extends BaseActivity mSharedPrefs.registerOnSharedPreferenceChangeListener(mRotationPrefChangeHandler); } + if (PinItemDragListener.handleDragRequest(this, getIntent())) { + // Temporarily enable the rotation + mRotationEnabled = true; + } + // On large interfaces, or on devices that a user has specifically enabled screen rotation, // we want the screen to auto-rotate based on the current orientation setOrientation(); @@ -1769,15 +1773,8 @@ public class Launcher extends BaseActivity if (mLauncherCallbacks != null) { mLauncherCallbacks.onHomeIntent(); } - - Parcelable dragExtra = intent - .getParcelableExtra(PinItemDragListener.EXTRA_PIN_ITEM_DRAG_LISTENER); - if (dragExtra instanceof PinItemDragListener) { - PinItemDragListener dragListener = (PinItemDragListener) dragExtra; - dragListener.setLauncher(this); - mDragLayer.setOnDragListener(dragListener); - } } + PinItemDragListener.handleDragRequest(this, intent); if (mLauncherCallbacks != null) { mLauncherCallbacks.onNewIntent(intent); @@ -4096,22 +4093,16 @@ public class Launcher extends BaseActivity return ((Launcher) ((ContextWrapper) context).getBaseContext()); } - private class RotationPrefChangeHandler implements OnSharedPreferenceChangeListener, Runnable { + private class RotationPrefChangeHandler implements OnSharedPreferenceChangeListener { @Override public void onSharedPreferenceChanged( SharedPreferences sharedPreferences, String key) { if (Utilities.ALLOW_ROTATION_PREFERENCE_KEY.equals(key)) { - mRotationEnabled = Utilities.isAllowRotationPrefEnabled(getApplicationContext()); - if (!waitUntilResume(this, true)) { - run(); - } + // Finish this instance of the activity. When the activity is recreated, + // it will initialize the rotation preference again. + finish(); } } - - @Override - public void run() { - setOrientation(); - } } } diff --git a/src/com/android/launcher3/dragndrop/AddItemActivity.java b/src/com/android/launcher3/dragndrop/AddItemActivity.java index c2a4820c8d..629f78ab31 100644 --- a/src/com/android/launcher3/dragndrop/AddItemActivity.java +++ b/src/com/android/launcher3/dragndrop/AddItemActivity.java @@ -23,6 +23,7 @@ import android.appwidget.AppWidgetManager; import android.content.ClipData; import android.content.ClipDescription; import android.content.Intent; +import android.content.res.Configuration; import android.graphics.Canvas; import android.graphics.Point; import android.graphics.PointF; @@ -40,6 +41,7 @@ import com.android.launcher3.Launcher; import com.android.launcher3.LauncherAppState; import com.android.launcher3.LauncherAppWidgetProviderInfo; import com.android.launcher3.R; +import com.android.launcher3.Utilities; import com.android.launcher3.compat.AppWidgetManagerCompat; import com.android.launcher3.compat.PinItemRequestCompat; import com.android.launcher3.model.WidgetItem; @@ -132,6 +134,16 @@ public class AddItemActivity extends BaseActivity implements OnLongClickListener .setPackage(getPackageName()) .setFlags(Intent.FLAG_ACTIVITY_NEW_TASK) .putExtra(PinItemDragListener.EXTRA_PIN_ITEM_DRAG_LISTENER, listener); + + if (!getResources().getBoolean(R.bool.allow_rotation) && + !Utilities.isAllowRotationPrefEnabled(this) && + (getResources().getConfiguration().orientation == + Configuration.ORIENTATION_LANDSCAPE && !isInMultiWindowMode())) { + // If we are starting the drag in landscape even though home is locked in portrait, + // restart the home activity to temporarily allow rotation. + homeIntent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK); + } + startActivity(homeIntent, ActivityOptions.makeCustomAnimation(this, 0, android.R.anim.fade_out).toBundle()); diff --git a/src/com/android/launcher3/dragndrop/PinItemDragListener.java b/src/com/android/launcher3/dragndrop/PinItemDragListener.java index fd252a26ae..e71477861a 100644 --- a/src/com/android/launcher3/dragndrop/PinItemDragListener.java +++ b/src/com/android/launcher3/dragndrop/PinItemDragListener.java @@ -18,6 +18,7 @@ package com.android.launcher3.dragndrop; import android.appwidget.AppWidgetManager; import android.content.ClipDescription; +import android.content.Intent; import android.graphics.Point; import android.graphics.Rect; import android.os.Bundle; @@ -244,6 +245,13 @@ public class PinItemDragListener } private void postCleanup() { + if (mLauncher != null) { + // Remove any drag params from the launcher intent since the drag operation is complete. + Intent newIntent = new Intent(mLauncher.getIntent()); + newIntent.removeExtra(EXTRA_PIN_ITEM_DRAG_LISTENER); + mLauncher.setIntent(newIntent); + } + new Handler(Looper.getMainLooper()).post(new Runnable() { @Override public void run() { @@ -267,6 +275,21 @@ public class PinItemDragListener return null; } + public static boolean handleDragRequest(Launcher launcher, Intent intent) { + if (intent == null || !Intent.ACTION_MAIN.equals(intent.getAction())) { + return false; + } + Parcelable dragExtra = intent.getParcelableExtra(EXTRA_PIN_ITEM_DRAG_LISTENER); + if (dragExtra instanceof PinItemDragListener) { + PinItemDragListener dragListener = (PinItemDragListener) dragExtra; + dragListener.setLauncher(launcher); + + launcher.getDragLayer().setOnDragListener(dragListener); + return true; + } + return false; + } + public static final Parcelable.Creator CREATOR = new Parcelable.Creator() { public PinItemDragListener createFromParcel(Parcel source) {