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

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

Snap for 11169761 from b70b7fde to 24Q1-release

Change-Id: I9ef5a0e71d36f6150a9c166d1360d8a7d865b728
parents 5c4169b8 b70b7fde
Loading
Loading
Loading
Loading
+11 −2
Original line number Diff line number Diff line
@@ -5,9 +5,7 @@
#

adamcohen@google.com
captaincole@google.com
hyunyoungs@google.com
sunnygoyal@google.com
twickham@google.com
vadimt@google.com
winsonc@google.com
@@ -17,5 +15,16 @@ patmanning@google.com
tsuharesu@google.com
awickham@google.com

# Launcher workspace eng team
captaincole@google.com
sunnygoyal@google.com
charlander@google.com
fbaron@google.com
fengjial@google.com
fransebas@google.com
pinyaoting@google.com
andonian@google.com
sihua@google.com

per-file FeatureFlags.java, globs = set noparent
per-file FeatureFlags.java = sunnygoyal@google.com, winsonc@google.com, adamcohen@google.com, hyunyoungs@google.com, captaincole@google.com
+3 −1
Original line number Diff line number Diff line
@@ -16,4 +16,6 @@
-->
<com.android.quickstep.views.IconView xmlns:android="http://schemas.android.com/apk/res/android"
    android:layout_width="match_parent"
    android:layout_height="match_parent" />
 No newline at end of file
    android:layout_height="match_parent"
    android:focusable="false"
    android:importantForAccessibility="no"/>
 No newline at end of file
+13 −13
Original line number Diff line number Diff line
@@ -51,40 +51,40 @@
        android:layout_height="wrap_content"
        android:text="@string/taskbar_edu_splitscreen"

        app:layout_constraintEnd_toStartOf="@id/settings_text"
        app:layout_constraintEnd_toStartOf="@id/pinning_text"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toBottomOf="@id/splitscreen_animation" />

    <androidx.constraintlayout.widget.Group
        android:id="@+id/settings_edu"
        android:id="@+id/pinning_edu"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        app:constraint_referenced_ids="settings_animation,settings_text" />
        app:constraint_referenced_ids="pinning_animation,pinning_text" />

    <com.airbnb.lottie.LottieAnimationView
        android:id="@+id/settings_animation"
        android:id="@+id/pinning_animation"
        android:layout_width="@dimen/taskbar_edu_features_lottie_width"
        android:layout_height="@dimen/taskbar_edu_features_lottie_height"

        app:lottie_autoPlay="true"
        app:lottie_loop="true"
        app:lottie_rawRes="@raw/taskbar_edu_settings"
        app:lottie_rawRes="@raw/taskbar_edu_pinning"

        app:layout_constraintEnd_toEndOf="@id/settings_text"
        app:layout_constraintStart_toStartOf="@id/settings_text"
        app:layout_constraintEnd_toEndOf="@id/pinning_text"
        app:layout_constraintStart_toStartOf="@id/pinning_text"
        app:layout_constraintTop_toBottomOf="@id/title" />

    <TextView
        android:id="@+id/settings_text"
        android:id="@+id/pinning_text"
        style="@style/TextAppearance.TaskbarEduTooltip.Subtext"
        android:layout_width="0dp"
        android:layout_height="wrap_content"
        android:text="@string/taskbar_edu_settings_persistent"
        android:text="@string/taskbar_edu_pinning"
        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" />
        app:layout_constraintEnd_toStartOf="@id/suggestions_text"
        app:layout_constraintTop_toBottomOf="@id/pinning_animation" />

    <com.airbnb.lottie.LottieAnimationView
        android:id="@+id/suggestions_animation"
@@ -107,7 +107,7 @@
        android:layout_marginStart="@dimen/taskbar_edu_features_horizontal_spacing"

        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toEndOf="@id/settings_text"
        app:layout_constraintStart_toEndOf="@id/pinning_text"
        app:layout_constraintTop_toBottomOf="@id/suggestions_animation" />

    <androidx.constraintlayout.widget.Barrier
@@ -115,7 +115,7 @@
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        app:barrierDirection="bottom"
        app:constraint_referenced_ids="splitscreen_text,settings_text,suggestions_text" />
        app:constraint_referenced_ids="splitscreen_text,pinning_text,suggestions_text" />

    <Button
        android:id="@+id/done_button"
+1 −0

File added.

Preview size limit exceeded, changes collapsed.

+1 −1

File changed.

Preview size limit exceeded, changes collapsed.

Loading