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

Commit 47775e6f authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 10068852 from d1054fd8 to udc-release 

Change-Id: Ie460c22b03274fabb7f23539b8c9d92d2e9eebe9
parents 7d0462dd d1054fd8

quickstep/res/color/menu_item_hover_state_color.xml

0 → 100644
+6 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<selector xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:androidprv="http://schemas.android.com/apk/prv/res/android">

    <item android:state_hovered="false" android:color="?androidprv:attr/colorSurface" />

    <item android:state_hovered="true" android:color="?androidprv:attr/colorSurfaceVariant" />

</selector>
 
 No newline at end of file

quickstep/res/drawable/task_menu_item_bg.xml

+2 −3
Original line number Diff line number Diff line
@@ -15,8 +15,7 @@ 
     limitations under the License.

-->



<shape xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:androidprv="http://schemas.android.com/apk/prv/res/android">

    <solid android:color="?androidprv:attr/colorSurface" />

<shape xmlns:android="http://schemas.android.com/apk/res/android">

    <solid android:color="@color/menu_item_hover_state_color" />

    <corners android:radius="@dimen/task_menu_item_corner_radius" />

</shape>

res/drawable/taskbar_divider_bg.xml→quickstep/res/drawable/taskbar_divider_bg.xml

+1 −2
Original line number Diff line number Diff line
@@ -14,8 +14,7 @@ 
     limitations under the License.

-->

<shape xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"

    android:shape="rectangle" >

    <solid android:color="?androidprv:attr/colorSurfaceVariant"/>

    <solid android:color="@color/taskbar_divider_background"/>

    <corners android:radius="1dp" />

</shape>

quickstep/res/layout/taskbar_edu_features.xml

+40 −26
Original line number Diff line number Diff line
@@ -13,29 +13,36 @@ 
     See the License for the specific language governing permissions and

     limitations under the License.

-->

<merge xmlns:android="http://schemas.android.com/apk/res/android"

<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"

    xmlns:app="http://schemas.android.com/apk/res-auto">

    xmlns:app="http://schemas.android.com/apk/res-auto"

    android:layout_width="match_parent"

    android:layout_height="wrap_content">



    <TextView

        android:id="@+id/title"

        style="@style/TextAppearance.TaskbarEduTooltip.Title"

        android:layout_width="0dp"

        android:layout_height="wrap_content"

        android:paddingBottom="@dimen/taskbar_edu_tooltip_vertical_margin"

        android:text="@string/taskbar_edu_features"



        app:layout_constraintEnd_toEndOf="parent"

        app:layout_constraintStart_toStartOf="parent"

        app:layout_constraintTop_toTopOf="parent" />

        app:layout_constraintTop_toTopOf="parent"

        app:layout_constraintBottom_toTopOf="@id/splitscreen_animation"/>



    <com.airbnb.lottie.LottieAnimationView

        android:id="@+id/splitscreen_animation"

        android:layout_width="@dimen/taskbar_edu_features_lottie_width"

        android:layout_height="@dimen/taskbar_edu_features_lottie_height"

        android:layout_marginTop="@dimen/taskbar_edu_tooltip_vertical_margin"

        app:layout_constraintStart_toStartOf="parent"

        app:layout_constraintTop_toBottomOf="@id/title"



        app:lottie_autoPlay="true"

        app:lottie_loop="true" />

        app:lottie_loop="true"



        app:layout_constraintEnd_toEndOf="@id/splitscreen_text"

        app:layout_constraintStart_toStartOf="@id/splitscreen_text"

        app:layout_constraintTop_toBottomOf="@id/title" />



    <TextView

        android:id="@+id/splitscreen_text"
@@ -43,8 +50,9 @@ 
        android:layout_width="0dp"

        android:layout_height="wrap_content"

        android:text="@string/taskbar_edu_splitscreen"

        app:layout_constraintEnd_toEndOf="@id/splitscreen_animation"

        app:layout_constraintStart_toStartOf="@id/splitscreen_animation"



        app:layout_constraintEnd_toStartOf="@id/settings_text"

        app:layout_constraintStart_toStartOf="parent"

        app:layout_constraintTop_toBottomOf="@id/splitscreen_animation" />



    <androidx.constraintlayout.widget.Group
@@ -57,13 +65,14 @@ 
        android:id="@+id/settings_animation"

        android:layout_width="@dimen/taskbar_edu_features_lottie_width"

        android:layout_height="@dimen/taskbar_edu_features_lottie_height"

        android:layout_marginStart="@dimen/taskbar_edu_features_horizontal_spacing"

        android:layout_marginTop="@dimen/taskbar_edu_tooltip_vertical_margin"

        app:layout_constraintStart_toEndOf="@id/splitscreen_animation"

        app:layout_constraintTop_toBottomOf="@id/title"



        app:lottie_autoPlay="true"

        app:lottie_loop="true"

        app:lottie_rawRes="@raw/taskbar_edu_settings" />

        app:lottie_rawRes="@raw/taskbar_edu_settings"



        app:layout_constraintEnd_toEndOf="@id/settings_text"

        app:layout_constraintStart_toStartOf="@id/settings_text"

        app:layout_constraintTop_toBottomOf="@id/title" />



    <TextView

        android:id="@+id/settings_text"
@@ -71,21 +80,23 @@ 
        android:layout_width="0dp"

        android:layout_height="wrap_content"

        android:text="@string/taskbar_edu_settings_persistent"

        app:layout_constraintEnd_toEndOf="@id/settings_animation"

        app:layout_constraintStart_toStartOf="@id/settings_animation"

        android:layout_marginStart="@dimen/taskbar_edu_features_horizontal_spacing"



        app:layout_constraintEnd_toStartOf="@id/suggestions_text"

        app:layout_constraintStart_toEndOf="@id/splitscreen_text"

        app:layout_constraintTop_toBottomOf="@id/settings_animation" />



    <com.airbnb.lottie.LottieAnimationView

        android:id="@+id/suggestions_animation"

        android:layout_width="@dimen/taskbar_edu_features_lottie_width"

        android:layout_height="@dimen/taskbar_edu_features_lottie_height"

        android:layout_marginStart="@dimen/taskbar_edu_features_horizontal_spacing"

        android:layout_marginTop="@dimen/taskbar_edu_tooltip_vertical_margin"

        app:layout_constraintEnd_toEndOf="parent"

        app:layout_constraintStart_toEndOf="@id/settings_animation"

        app:layout_constraintTop_toBottomOf="@id/title"



        app:lottie_autoPlay="true"

        app:lottie_loop="true" />

        app:lottie_loop="true"



        app:layout_constraintEnd_toEndOf="@id/suggestions_text"

        app:layout_constraintStart_toStartOf="@id/suggestions_text"

        app:layout_constraintTop_toBottomOf="@id/title" />



    <TextView

        android:id="@+id/suggestions_text"
@@ -93,8 +104,10 @@ 
        android:layout_width="0dp"

        android:layout_height="wrap_content"

        android:text="@string/taskbar_edu_suggestions"

        app:layout_constraintEnd_toEndOf="@id/suggestions_animation"

        app:layout_constraintStart_toStartOf="@id/suggestions_animation"

        android:layout_marginStart="@dimen/taskbar_edu_features_horizontal_spacing"



        app:layout_constraintEnd_toEndOf="parent"

        app:layout_constraintStart_toEndOf="@id/settings_text"

        app:layout_constraintTop_toBottomOf="@id/suggestions_animation" />



    <androidx.constraintlayout.widget.Barrier
@@ -108,11 +121,12 @@ 
        android:id="@+id/done_button"

        style="@style/TaskbarEdu.Button.Done"

        android:layout_width="wrap_content"

        android:layout_height="36dp"

        android:layout_height="wrap_content"

        android:layout_marginTop="32dp"

        android:text="@string/taskbar_edu_done"

        android:textColor="?androidprv:attr/textColorOnAccent"



        app:layout_constraintBottom_toBottomOf="parent"

        app:layout_constraintEnd_toEndOf="parent"

        app:layout_constraintTop_toBottomOf="@id/edu_barrier_bottom" />

</merge>
 
 No newline at end of file
 
</androidx.constraintlayout.widget.ConstraintLayout>
 
 No newline at end of file

quickstep/res/layout/taskbar_edu_swipe.xml

+5 −3
Original line number Diff line number Diff line
@@ -13,8 +13,10 @@ 
     See the License for the specific language governing permissions and

     limitations under the License.

-->

<merge xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:app="http://schemas.android.com/apk/res-auto">

<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:app="http://schemas.android.com/apk/res-auto"

    android:layout_width="wrap_content"

    android:layout_height="wrap_content">



    <TextView

        android:id="@+id/title"
@@ -39,4 +41,4 @@ 
        app:lottie_loop="true"

        app:lottie_rawRes="@raw/taskbar_edu_stashing" />



</merge>
 
 No newline at end of file
 
</androidx.constraintlayout.widget.ConstraintLayout>
 
 No newline at end of file