From eed4bbfb4952cd1f39d17a2fc55b0310cbb6e874 Mon Sep 17 00:00:00 2001 From: Sunny Goyal Date: Fri, 1 Oct 2021 11:31:45 -0700 Subject: [PATCH] Using a different transition for All-set activity Bug: 201797003 Test: Manual Change-Id: I33b342ca224ab283e2ac475d4defe2eac6a87bb8 --- quickstep/res/layout/activity_allset.xml | 148 +++++++------ quickstep/res/values-night/colors.xml | 2 + quickstep/res/values-night/styles.xml | 2 +- quickstep/res/values/colors.xml | 3 + quickstep/res/values/dimens.xml | 1 + quickstep/res/values/styles.xml | 2 +- .../com/android/quickstep/InputConsumer.java | 4 +- .../quickstep/TouchInteractionService.java | 16 ++ .../ProgressDelegateInputConsumer.java | 194 ++++++++++++++++++ .../quickstep/interaction/AllSetActivity.java | 139 +++++++++++++ 10 files changed, 439 insertions(+), 72 deletions(-) create mode 100644 quickstep/src/com/android/quickstep/inputconsumers/ProgressDelegateInputConsumer.java diff --git a/quickstep/res/layout/activity_allset.xml b/quickstep/res/layout/activity_allset.xml index 4fbb8a028d..b4ee4828a6 100644 --- a/quickstep/res/layout/activity_allset.xml +++ b/quickstep/res/layout/activity_allset.xml @@ -14,81 +14,93 @@ See the License for the specific language governing permissions and limitations under the License. --> - + android:id="@+id/root_view" + android:background="@color/all_set_page_background" > - - - + android:layout_height="match_parent" + android:layout_marginStart="@dimen/allset_page_margin_horizontal" + android:layout_marginEnd="@dimen/allset_page_margin_horizontal" + android:layoutDirection="locale" + android:textDirection="locale" + android:id="@+id/content_view" + android:forceHasOverlappingRendering="false" + android:fitsSystemWindows="true" > - + - + - + - + - - + + + + + + + + \ No newline at end of file diff --git a/quickstep/res/values-night/colors.xml b/quickstep/res/values-night/colors.xml index c3b253654e..af6e0647a1 100644 --- a/quickstep/res/values-night/colors.xml +++ b/quickstep/res/values-night/colors.xml @@ -22,4 +22,6 @@ #202124 #3c4043 + #FF000000 + \ No newline at end of file diff --git a/quickstep/res/values-night/styles.xml b/quickstep/res/values-night/styles.xml index 1bd3f5d138..e6b345010d 100644 --- a/quickstep/res/values-night/styles.xml +++ b/quickstep/res/values-night/styles.xml @@ -21,7 +21,7 @@ @android:color/transparent false false - #FF000000 + @android:color/transparent \ No newline at end of file diff --git a/quickstep/res/values/colors.xml b/quickstep/res/values/colors.xml index 5edcc9d951..1bddb57b2b 100644 --- a/quickstep/res/values/colors.xml +++ b/quickstep/res/values/colors.xml @@ -72,4 +72,7 @@ #e8eaed #80868b #bdc1c6 + + #FFFFFFFF + \ No newline at end of file diff --git a/quickstep/res/values/dimens.xml b/quickstep/res/values/dimens.xml index e08eda8d3c..fa21b0a8fc 100644 --- a/quickstep/res/values/dimens.xml +++ b/quickstep/res/values/dimens.xml @@ -161,6 +161,7 @@ 32dp 24dp 348dp + 10dp 8dp diff --git a/quickstep/res/values/styles.xml b/quickstep/res/values/styles.xml index b5444b5b57..40e18ec11f 100644 --- a/quickstep/res/values/styles.xml +++ b/quickstep/res/values/styles.xml @@ -115,7 +115,7 @@ @android:color/transparent false true - #FFFFFFFF + @android:color/transparent