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

Commit bc7b7bd1 authored by Beverly Tai's avatar Beverly Tai Committed by Android (Google) Code Review
Browse files

Merge "Toast design polish" into sc-dev

parents ce4baef6 b89e62ee

core/res/res/drawable/toast_frame.xml

+2 −3
Original line number Diff line number Diff line
@@ -17,8 +17,7 @@ 
-->

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

       android:shape="rectangle">

    <!-- background is material_grey_200 with .9 alpha -->

    <solid android:color="#E6EEEEEE" />

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

    <solid android:color="?android:attr/colorBackground" />

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

</shape>

core/res/res/layout/transient_notification.xml

+18 −15
Original line number Diff line number Diff line
@@ -18,24 +18,27 @@ 
*/

-->



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

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:orientation="vertical"

    android:background="?android:attr/toastFrameBackground">

<LinearLayout

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

    android:layout_width="wrap_content"

    android:layout_height="wrap_content"

    android:orientation="horizontal"

    android:gravity="center_vertical"

    android:maxWidth="@dimen/toast_width"

    android:background="?android:attr/toastFrameBackground"

    android:layout_marginEnd="16dp"

    android:layout_marginStart="16dp"

    android:paddingStart="16dp"

    android:paddingEnd="16dp">



    <TextView

        android:id="@android:id/message"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_weight="1"

        android:layout_marginHorizontal="24dp"

        android:layout_marginVertical="15dp"

        android:layout_gravity="center_horizontal"

        android:textAppearance="@style/TextAppearance.Toast"

        android:textColor="@color/primary_text_default_material_light"

        />



        android:ellipsize="end"

        android:maxLines="2"

        android:paddingTop="12dp"

        android:paddingBottom="12dp"

        android:lineHeight="20sp"

        android:textAppearance="@style/TextAppearance.Toast"/>

</LinearLayout>

core/res/res/values-land/dimens.xml

+1 −0
Original line number Diff line number Diff line
@@ -78,4 +78,5 @@ 


    <dimen name="chooser_preview_width">480dp</dimen>



    <dimen name="toast_y_offset">24dp</dimen>

</resources>

core/res/res/values/dimens.xml

+7 −1
Original line number Diff line number Diff line
@@ -30,7 +30,13 @@ 
         will be displayed in the app launcher and elsewhere. -->

    <dimen name="app_icon_size">48dip</dimen>



    <dimen name="toast_y_offset">24dp</dimen>

    <!--  Offset from the bottom of the device a toast shows -->

    <dimen name="toast_y_offset">48dp</dimen>

    <!-- Max width of a toast -->

    <dimen name="toast_width">300dp</dimen>

    <!-- Text size of the message within a toast -->

    <dimen name="toast_text_size">14sp</dimen>



    <!-- Height of the status bar -->

    <dimen name="status_bar_height">@dimen/status_bar_height_portrait</dimen>

    <!-- Height of the status bar in portrait. The height should be

core/res/res/values/styles.xml

+2 −1
Original line number Diff line number Diff line
@@ -964,8 +964,9 @@ please see styles_device_defaults.xml. 
    </style>



    <style name="TextAppearance.Toast">

        <item name="fontFamily">sans-serif</item>

        <item name="fontFamily">@*android:string/config_headlineFontFamily</item>

        <item name="textSize">14sp</item>

        <item name="textColor">?android:attr/textColorPrimary</item>

    </style>



    <style name="TextAppearance.Tooltip">