Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit da403a97 authored by Android Build Prod User's avatar Android Build Prod User Committed by Android (Google) Code Review
Browse files

Merge "Updates Taskbar Edu steps." into sc-v2-dev

parents 036dee92 f9ea9ce1

quickstep/res/drawable/taskbar_edu_splitscreen.png

0 → 100644
+5.51 KiB
Loading image diff...

quickstep/res/drawable/taskbar_edu_splitscreen.webp

deleted100644 → 0
−24.5 KiB
Loading image diff...

quickstep/res/drawable/taskbar_edu_stashing.png

0 → 100644
+5.51 KiB
Loading image diff...

quickstep/res/drawable/taskbar_edu_switch_apps.png

0 → 100644
+5.51 KiB
Loading image diff...

quickstep/res/layout/taskbar_edu.xml

+15 −33
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ 
            launcher:pageIndicator="@+id/content_page_indicator">



            <LinearLayout

                android:id="@+id/page_splitscreen"

                android:id="@+id/page_switch_apps"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:orientation="vertical"
@@ -52,24 +52,18 @@ 
                <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_switch_apps"/>



                <ImageView

                    android:layout_width="322dp"

                    android:layout_height="282dp"

                    android:layout_marginTop="16dp"

                    android:src="@drawable/taskbar_edu_splitscreen"/>

                    android:src="@drawable/taskbar_edu_switch_apps"/>

            </LinearLayout>



            <LinearLayout

                android:id="@+id/page_customize"

                android:id="@+id/page_splitscreen"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:orientation="vertical"
@@ -78,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_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_splitscreen"/>



                <ImageView

                    android:layout_width="322dp"
@@ -95,7 +83,7 @@ 
            </LinearLayout>



            <LinearLayout

                android:id="@+id/page_dock"

                android:id="@+id/page_stashing"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:orientation="vertical"
@@ -104,20 +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_dock"

                    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"/>

                    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"