Merge "Create flag for new App Pairs feature" into udc-dev
diff --git a/quickstep/src/com/android/quickstep/interaction/HomeGestureTutorialController.java b/quickstep/src/com/android/quickstep/interaction/HomeGestureTutorialController.java
index 99d417e..73a08c3 100644
--- a/quickstep/src/com/android/quickstep/interaction/HomeGestureTutorialController.java
+++ b/quickstep/src/com/android/quickstep/interaction/HomeGestureTutorialController.java
@@ -92,6 +92,7 @@
case BACK_COMPLETED_FROM_RIGHT:
case BACK_CANCELLED_FROM_LEFT:
case BACK_CANCELLED_FROM_RIGHT:
+ case BACK_NOT_STARTED_TOO_FAR_FROM_EDGE:
showFeedback(R.string.home_gesture_feedback_swipe_too_far_from_edge);
break;
}
diff --git a/quickstep/src/com/android/quickstep/views/DigitalWellBeingToast.java b/quickstep/src/com/android/quickstep/views/DigitalWellBeingToast.java
index af80d5f..7cd6756 100644
--- a/quickstep/src/com/android/quickstep/views/DigitalWellBeingToast.java
+++ b/quickstep/src/com/android/quickstep/views/DigitalWellBeingToast.java
@@ -326,7 +326,11 @@
}
private void setBannerOutline() {
- mOldBannerOutlineProvider = mBanner.getOutlineProvider();
+ // TODO(b\273367585) to investigate why mBanner.getOutlineProvider() can be null
+ mOldBannerOutlineProvider = mBanner.getOutlineProvider() != null
+ ? mBanner.getOutlineProvider()
+ : ViewOutlineProvider.BACKGROUND;
+
mBanner.setOutlineProvider(new ViewOutlineProvider() {
@Override
public void getOutline(View view, Outline outline) {
diff --git a/src/com/android/launcher3/InvariantDeviceProfile.java b/src/com/android/launcher3/InvariantDeviceProfile.java
index 47396a5..0c19e4b 100644
--- a/src/com/android/launcher3/InvariantDeviceProfile.java
+++ b/src/com/android/launcher3/InvariantDeviceProfile.java
@@ -1144,7 +1144,7 @@
transientTaskbarIconSize[INDEX_DEFAULT]);
transientTaskbarIconSize[INDEX_TWO_PANEL_PORTRAIT] = a.getFloat(
R.styleable.ProfileDisplayOption_transientTaskbarIconSizeTwoPanelPortrait,
- hotseatQsbSpace[INDEX_DEFAULT]);
+ transientTaskbarIconSize[INDEX_DEFAULT]);
a.recycle();
}
diff --git a/src/com/android/launcher3/dragndrop/PinShortcutRequestActivityInfo.java b/src/com/android/launcher3/dragndrop/PinShortcutRequestActivityInfo.java
index 6b21522..dd74125 100644
--- a/src/com/android/launcher3/dragndrop/PinShortcutRequestActivityInfo.java
+++ b/src/com/android/launcher3/dragndrop/PinShortcutRequestActivityInfo.java
@@ -39,6 +39,8 @@
import com.android.launcher3.pm.PinRequestHelper;
import com.android.launcher3.pm.ShortcutConfigActivityInfo;
+import java.util.function.Supplier;
+
/**
* Extension of ShortcutConfigActivityInfo to be used in the confirmation prompt for pin item
* request.
@@ -50,15 +52,19 @@
// actual existing class.
private static final String STUB_COMPONENT_CLASS = "pinned-shortcut";
- private final PinItemRequest mRequest;
+ private final Supplier<PinItemRequest> mRequestSupplier;
private final ShortcutInfo mInfo;
private final Context mContext;
public PinShortcutRequestActivityInfo(PinItemRequest request, Context context) {
- super(new ComponentName(request.getShortcutInfo().getPackage(), STUB_COMPONENT_CLASS),
- request.getShortcutInfo().getUserHandle());
- mRequest = request;
- mInfo = request.getShortcutInfo();
+ this(request.getShortcutInfo(), () -> request, context);
+ }
+
+ public PinShortcutRequestActivityInfo(
+ ShortcutInfo si, Supplier<PinItemRequest> requestSupplier, Context context) {
+ super(new ComponentName(si.getPackage(), STUB_COMPONENT_CLASS), si.getUserHandle());
+ mRequestSupplier = requestSupplier;
+ mInfo = si;
mContext = context;
}
@@ -91,7 +97,7 @@
true /* isToState */);
// Delay the actual accept() call until the drop animation is complete.
return PinRequestHelper.createWorkspaceItemFromPinItemRequest(
- mContext, mRequest, duration);
+ mContext, mRequestSupplier.get(), duration);
}
@Override
diff --git a/src/com/android/launcher3/widget/picker/WidgetsTwoPaneSheet.java b/src/com/android/launcher3/widget/picker/WidgetsTwoPaneSheet.java
index de7497a..2199473 100644
--- a/src/com/android/launcher3/widget/picker/WidgetsTwoPaneSheet.java
+++ b/src/com/android/launcher3/widget/picker/WidgetsTwoPaneSheet.java
@@ -23,8 +23,8 @@
import android.view.MotionEvent;
import android.view.View;
import android.view.ViewOutlineProvider;
-import android.widget.FrameLayout;
import android.widget.LinearLayout;
+import android.widget.ScrollView;
import androidx.annotation.NonNull;
@@ -52,7 +52,7 @@
private WidgetsListHeader mSuggestedWidgetsHeader;
private LinearLayout mRightPane;
- private FrameLayout mRightPaneScrollView;
+ private ScrollView mRightPaneScrollView;
private WidgetsListTableViewHolderBinder mWidgetsListTableViewHolderBinder;
private final ViewOutlineProvider mViewOutlineProviderRightPane = new ViewOutlineProvider() {
@@ -156,6 +156,7 @@
resetExpandedHeaders();
mRightPane.removeAllViews();
mRightPane.addView(mRecommendedWidgetsTable);
+ mRightPaneScrollView.setScrollY(0);
});
mSuggestedWidgetsContainer.addView(mSuggestedWidgetsHeader);
}
@@ -249,6 +250,7 @@
};
mRightPane.removeAllViews();
mRightPane.addView(widgetsRowViewHolder.itemView);
+ mRightPaneScrollView.setScrollY(0);
}
};
}