Merge "Sandbox changes for use in UXR prototype." into sc-dev
diff --git a/quickstep/res/values/strings.xml b/quickstep/res/values/strings.xml
index 2a06830..eeb9e99 100644
--- a/quickstep/res/values/strings.xml
+++ b/quickstep/res/values/strings.xml
@@ -188,8 +188,8 @@
<!-- ******* Skip tutorial dialog ******* -->
<!-- Title for the dialog that allows the user to skip the gesture navigation tutorial. [CHAR_LIMIT=40] -->
<string name="skip_tutorial_dialog_title">Skip navigation tutorial?</string>
- <!-- Subtitle for the dialog that allows the user to skip the gesture navigation tutorial. [CHAR_LIMIT=40] -->
- <string name="skip_tutorial_dialog_subtitle">You can find this later in the Tips app</string>
+ <!-- Subtitle for the dialog that allows the user to skip the gesture navigation tutorial. This directs the user to where they can find the gesture tutorial again. [CHAR_LIMIT=100] -->
+ <string name="skip_tutorial_dialog_subtitle">You can find this later in the <xliff:g id="name">%1$s</xliff:g> app</string>
<!-- Button text shown on a button on the tutorial skip dialog to return to the tutorial. [CHAR LIMIT=14] -->
<string name="gesture_tutorial_action_button_label_cancel">Cancel</string>
<!-- Button text shown on a button on the tutorial skip dialog to exit the tutorial. [CHAR LIMIT=14] -->
diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index c5deede..0eb2392 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -2024,6 +2024,16 @@
anim.add(ObjectAnimator.ofFloat(taskView, secondaryViewTranslate,
verticalFactor * secondaryTaskDimension).setDuration(duration), LINEAR, sp);
+
+ if (LIVE_TILE.get() && taskView.isRunningTask()) {
+ anim.addOnFrameCallback(() -> {
+ mLiveTileTaskViewSimulator.taskSecondaryTranslation.value =
+ mOrientationHandler.getSecondaryValue(
+ taskView.getTranslationX(),
+ taskView.getTranslationY());
+ redrawLiveTile();
+ });
+ }
}
public PendingAnimation createTaskDismissAnimation(TaskView taskView, boolean animateTaskView,
@@ -2112,16 +2122,6 @@
anim.addOnFrameCallback(this::updateCurveProperties);
}
- if (LIVE_TILE.get() && getRunningTaskView() == taskView) {
- anim.addOnFrameCallback(() -> {
- mLiveTileTaskViewSimulator.taskSecondaryTranslation.value =
- mOrientationHandler.getSecondaryValue(
- taskView.getTranslationX(),
- taskView.getTranslationY());
- redrawLiveTile();
- });
- }
-
// Add a tiny bit of translation Z, so that it draws on top of other views
if (animateTaskView) {
taskView.setTranslationZ(0.1f);
@@ -2944,7 +2944,7 @@
}
mPendingAnimation.addEndListener(isSuccess -> {
if (isSuccess) {
- if (LIVE_TILE.get()) {
+ if (LIVE_TILE.get() && tv.isRunningTask()) {
finishRecentsAnimation(false /* toRecents */, null);
onTaskLaunchAnimationEnd(true /* success */);
} else {
diff --git a/res/drawable-v28/bg_celllayout.xml b/res/drawable-v28/bg_celllayout.xml
new file mode 100644
index 0000000..c68bdec
--- /dev/null
+++ b/res/drawable-v28/bg_celllayout.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2021, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+ <item android:state_active="true" >
+ <shape android:shape="rectangle" >
+ <stroke
+ android:width="@dimen/spring_loaded_panel_border"
+ android:color="?android:attr/colorAccent" />
+ <solid android:color="@color/cell_layout_bg_color_active"/>
+ <corners android:radius="?android:attr/dialogCornerRadius" />
+
+ </shape>
+ </item>
+ <item>
+ <shape android:shape="rectangle" >
+ <solid android:color="@color/cell_layout_bg_color_inactive"/>
+ <corners android:radius="?android:attr/dialogCornerRadius" />
+ </shape>
+ </item>
+</selector>
diff --git a/res/drawable/bg_celllayout.xml b/res/drawable/bg_celllayout.xml
index 0401c84..4e7e82f 100644
--- a/res/drawable/bg_celllayout.xml
+++ b/res/drawable/bg_celllayout.xml
@@ -25,14 +25,14 @@
android:width="@dimen/spring_loaded_panel_border"
android:color="?android:attr/colorAccent" />
<solid android:color="@color/cell_layout_bg_color_active"/>
- <corners android:radius="?android:attr/dialogCornerRadius"></corners>
+ <corners android:radius="@dimen/bg_round_rect_radius" />
</shape>
</item>
<item>
<shape android:shape="rectangle" >
<solid android:color="@color/cell_layout_bg_color_inactive"/>
- <corners android:radius="?android:attr/dialogCornerRadius"></corners>
+ <corners android:radius="@dimen/bg_round_rect_radius" />
</shape>
</item>
</selector>