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

Commit 2ac5ff2b authored by Lyn Han's avatar Lyn Han Committed by Android (Google) Code Review
Browse files

Merge "Education view for collapsed stack; fix rtl text"

parents ab96591f 9813fab6

packages/SystemUI/res/layout/bubble_stack_user_education.xml

+9 −6
Original line number Diff line number Diff line
@@ -15,8 +15,8 @@ 
  ~ limitations under the License.

  -->

<LinearLayout

    android:id="@+id/stack_education_layout"

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

    android:id="@+id/user_education_view"

    android:layout_height="wrap_content"

    android:layout_width="wrap_content"

    android:paddingTop="48dp"
@@ -25,26 +25,29 @@ 
    android:paddingEnd="16dp"

    android:layout_marginEnd="24dp"

    android:orientation="vertical"

    android:background="@drawable/bubble_stack_user_education_bg">



    android:background="@drawable/bubble_stack_user_education_bg"

    >

    <TextView

        android:id="@+id/user_education_title"

        android:id="@+id/stack_education_title"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:paddingBottom="16dp"

        android:fontFamily="@*android:string/config_bodyFontFamilyMedium"

        android:maxLines="2"

        android:ellipsize="end"

        android:gravity="start"

        android:textAlignment="viewStart"

        android:text="@string/bubbles_user_education_title"

        android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Headline"/>



    <TextView

        android:id="@+id/user_education_description"

        android:id="@+id/stack_education_description"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:ellipsize="end"

        android:gravity="start"

        android:textAlignment="viewStart"

        android:text="@string/bubbles_user_education_description"

        android:fontFamily="@*android:string/config_bodyFontFamily"

        android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Body2"/>



</LinearLayout>

packages/SystemUI/res/layout/bubbles_manage_button_education.xml

+62 −62
Original line number Diff line number Diff line
@@ -14,15 +14,12 @@ 
  ~ See the License for the specific language governing permissions and

  ~ limitations under the License.

  -->

<com.android.systemui.bubbles.ManageEducationView

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

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    >



<LinearLayout

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

    android:id="@+id/manage_education_view"

    android:layout_width="wrap_content"

    android:layout_height="wrap_content"

        android:id="@+id/manage_education_view"

    android:clickable="true"

    android:paddingTop="28dp"

    android:paddingBottom="16dp"
@@ -42,6 +39,8 @@ 
        android:fontFamily="@*android:string/config_bodyFontFamilyMedium"

        android:maxLines="2"

        android:ellipsize="end"

        android:gravity="start"

        android:textAlignment="viewStart"

        android:text="@string/bubbles_user_education_manage_title"

        android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Headline"/>
@@ -54,6 +53,8 @@ 
        android:text="@string/bubbles_user_education_manage"

        android:maxLines="2"

        android:ellipsize="end"

        android:gravity="start"

        android:textAlignment="viewStart"

        android:fontFamily="@*android:string/config_bodyFontFamily"

        android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Body2"/>
@@ -87,4 +88,3 @@ 
            />

    </LinearLayout>

</LinearLayout>
 
</com.android.systemui.bubbles.ManageEducationView>

packages/SystemUI/src/com/android/systemui/bubbles/BubbleStackView.java

+85 −198

File changed.

Preview size limit exceeded, changes collapsed.

packages/SystemUI/src/com/android/systemui/bubbles/ManageEducationView.kt

+63 −35

File changed.

Preview size limit exceeded, changes collapsed.

packages/SystemUI/src/com/android/systemui/bubbles/StackEducationView.kt

0 → 100644
+134 −0

File added.

Preview size limit exceeded, changes collapsed.