| commit | d48a6fb4b7aa65833ca80d22b953d02bb2624b95 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Tue Mar 28 23:22:59 2023 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Mar 28 23:22:59 2023 +0000 |
| tree | 8c640046c8baccd2a098c3e58f6e3f7058af6194 | |
| parent | c63702b6b40049abab95322e65b266191163f038 [diff] | |
| parent | dfc94fc05f3a7117d0a87c4aaeadb871724e55dc [diff] |
Merge "Scroll to top when new header is selected in two pane widget picker" 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(); }