Updates Taskbar Edu steps.
They are now:
1. Switch apps
2. Splitscreen
3. Docking
They all use the same (blank) placeholder image.
Bug: 180605356
Test: Manual
Change-Id: I53b3f71519c50a1d93f800490d3127e4d669e068
diff --git a/quickstep/res/drawable/taskbar_edu_splitscreen.png b/quickstep/res/drawable/taskbar_edu_splitscreen.png
new file mode 100644
index 0000000..f9d2a63
--- /dev/null
+++ b/quickstep/res/drawable/taskbar_edu_splitscreen.png
Binary files differ
diff --git a/quickstep/res/drawable/taskbar_edu_splitscreen.webp b/quickstep/res/drawable/taskbar_edu_splitscreen.webp
deleted file mode 100644
index 2f4402f..0000000
--- a/quickstep/res/drawable/taskbar_edu_splitscreen.webp
+++ /dev/null
Binary files differ
diff --git a/quickstep/res/drawable/taskbar_edu_stashing.png b/quickstep/res/drawable/taskbar_edu_stashing.png
new file mode 100644
index 0000000..f9d2a63
--- /dev/null
+++ b/quickstep/res/drawable/taskbar_edu_stashing.png
Binary files differ
diff --git a/quickstep/res/drawable/taskbar_edu_switch_apps.png b/quickstep/res/drawable/taskbar_edu_switch_apps.png
new file mode 100644
index 0000000..f9d2a63
--- /dev/null
+++ b/quickstep/res/drawable/taskbar_edu_switch_apps.png
Binary files differ
diff --git a/quickstep/res/layout/taskbar_edu.xml b/quickstep/res/layout/taskbar_edu.xml
index ef57a53..3796ff9 100644
--- a/quickstep/res/layout/taskbar_edu.xml
+++ b/quickstep/res/layout/taskbar_edu.xml
@@ -43,6 +43,26 @@
launcher:pageIndicator="@+id/content_page_indicator">
<LinearLayout
+ android:id="@+id/page_switch_apps"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical"
+ android:gravity="center_horizontal">
+
+ <TextView
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ style="@style/TextAppearance.TaskbarEdu.Title"
+ android:text="@string/taskbar_edu_switch_apps"/>
+
+ <ImageView
+ android:layout_width="322dp"
+ android:layout_height="282dp"
+ android:layout_marginTop="16dp"
+ android:src="@drawable/taskbar_edu_switch_apps"/>
+ </LinearLayout>
+
+ <LinearLayout
android:id="@+id/page_splitscreen"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -52,14 +72,8 @@
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginHorizontal="16dp"
- android:gravity="center_horizontal"
- style="@style/TextHeadline"
- android:text="@string/taskbar_edu_splitscreen"
- android:fontFamily="google-sans"
- android:textColor="?android:attr/textColorPrimary"
- android:textSize="24sp"
- android:maxLines="2"/>
+ style="@style/TextAppearance.TaskbarEdu.Title"
+ android:text="@string/taskbar_edu_splitscreen"/>
<ImageView
android:layout_width="322dp"
@@ -69,7 +83,7 @@
</LinearLayout>
<LinearLayout
- android:id="@+id/page_customize"
+ android:id="@+id/page_stashing"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
@@ -78,46 +92,14 @@
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginHorizontal="16dp"
- android:gravity="center_horizontal"
- style="@style/TextHeadline"
- android:text="@string/taskbar_edu_customize"
- android:fontFamily="google-sans"
- android:textColor="?android:attr/textColorPrimary"
- android:textSize="24sp"
- android:maxLines="2"/>
+ style="@style/TextAppearance.TaskbarEdu.Title"
+ android:text="@string/taskbar_edu_stashing"/>
<ImageView
android:layout_width="322dp"
android:layout_height="282dp"
android:layout_marginTop="16dp"
- android:src="@drawable/taskbar_edu_splitscreen"/>
- </LinearLayout>
-
- <LinearLayout
- android:id="@+id/page_dock"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="vertical"
- android:gravity="center_horizontal">
-
- <TextView
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginHorizontal="16dp"
- android:gravity="center_horizontal"
- style="@style/TextHeadline"
- android:text="@string/taskbar_edu_dock"
- android:fontFamily="google-sans"
- android:textColor="?android:attr/textColorPrimary"
- android:textSize="24sp"
- android:maxLines="2"/>
-
- <ImageView
- android:layout_width="322dp"
- android:layout_height="282dp"
- android:layout_marginTop="16dp"
- android:src="@drawable/taskbar_edu_splitscreen"/>
+ android:src="@drawable/taskbar_edu_stashing"/>
</LinearLayout>
</com.android.launcher3.taskbar.TaskbarEduPagedView>
@@ -126,6 +108,7 @@
android:layout_width="wrap_content"
android:layout_height="36dp"
android:layout_marginBottom="92dp"
+ android:layout_marginTop="32dp"
app:layout_constraintTop_toBottomOf="@id/content"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -146,10 +129,9 @@
<Button
android:id="@+id/edu_end_button"
android:layout_width="wrap_content"
- android:layout_height="36dp"
- android:layout_marginBottom="92dp"
- app:layout_constraintTop_toBottomOf="@id/content"
- app:layout_constraintBottom_toBottomOf="parent"
+ android:layout_height="0dp"
+ app:layout_constraintTop_toTopOf="@id/edu_start_button"
+ app:layout_constraintBottom_toBottomOf="@id/edu_start_button"
app:layout_constraintEnd_toEndOf="parent"
android:text="@string/taskbar_edu_next"
style="@style/TaskbarEdu.Button.Next"
diff --git a/quickstep/res/values/strings.xml b/quickstep/res/values/strings.xml
index 2916121..004949a 100644
--- a/quickstep/res/values/strings.xml
+++ b/quickstep/res/values/strings.xml
@@ -209,15 +209,15 @@
<string name="taskbar_edu_opened">Taskbar education appeared</string>
<!-- Accessibility text spoken when the taskbar education panel disappears [CHAR_LIMIT=NONE] -->
<string name="taskbar_edu_closed">Taskbar education closed</string>
- <!-- Text in dialog that lets a user know how they can use the taskbar to use multiple apps on their device.
+ <!-- Text in dialog that lets a user know how they can use the taskbar to switch apps on their device.
[CHAR_LIMIT=60] -->
- <string name="taskbar_edu_splitscreen" translatable="false">Use 2 apps at once and switch apps with the taskbar</string>
- <!-- Text in dialog that lets a user know how they can customize the taskbar on their device.
+ <string name="taskbar_edu_switch_apps" translatable="false">Use the taskbar to switch apps</string>
+ <!-- Text in dialog that lets a user know how they can use the taskbar to use multiple apps at once on their device.
[CHAR_LIMIT=60] -->
- <string name="taskbar_edu_customize" translatable="false">Add your favorite apps and get automatic suggestions</string>
+ <string name="taskbar_edu_splitscreen" translatable="false">Drag to the side to use two apps at once</string>
<!-- Text in dialog that lets a user know how they can hide the taskbar on their device.
[CHAR_LIMIT=60] -->
- <string name="taskbar_edu_dock">Touch & hold to hide the taskbar anytime</string>
+ <string name="taskbar_edu_stashing">Touch & hold to hide the taskbar</string>
<!-- Text on button to go to the next screen of a tutorial [CHAR_LIMIT=16] -->
<string name="taskbar_edu_next">Next</string>
<!-- Text on button to go to the previous screen of a tutorial [CHAR_LIMIT=16] -->
diff --git a/quickstep/res/values/styles.xml b/quickstep/res/values/styles.xml
index ac70279..0a69c05 100644
--- a/quickstep/res/values/styles.xml
+++ b/quickstep/res/values/styles.xml
@@ -153,4 +153,14 @@
<item name="android:textSize">16sp</item>
<item name="android:padding">4dp</item>
</style>
+
+ <style name="TextAppearance.TaskbarEdu.Title"
+ parent="@android:style/TextAppearance.DeviceDefault.DialogWindowTitle" >
+ <item name="android:layout_marginHorizontal">16dp</item>
+ <item name="android:gravity">center_horizontal</item>
+ <item name="android:fontFamily">google-sans</item>
+ <item name="android:textColor">?android:attr/textColorPrimary</item>
+ <item name="android:textSize">24sp</item>
+ <item name="android:lines">2</item>
+ </style>
</resources>
\ No newline at end of file
