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

Commit 0a794de1 authored by Daniel Norman's avatar Daniel Norman Committed by Android (Google) Code Review
Browse files

Merge "feat(expressive): More expressive updates for Display size & text" into main

parents 6074e348 bb4bd5cd

res/layout/accessibility_text_reading_preview.xml

+33 −37
Original line number Diff line number Diff line
@@ -29,23 +29,20 @@ 
        android:background="@drawable/accessibility_text_reading_preview"

        android:clipChildren="true"

        android:orientation="vertical"

        android:padding="18dp">

        android:padding="@dimen/settingslib_expressive_space_extrasmall6">



        <TextView

            android:id="@+id/preview_label"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:text="@string/screen_zoom_preview_title"

            android:importantForAccessibility="noHideDescendants"

            style="@style/AccessibilityTextReadingPreviewTitle" />



        <LinearLayout

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:orientation="vertical">

        <com.android.settings.accessibility.TextReadingPreviewPager

            android:id="@+id/preview_pager"

            android:layout_width="wrap_content"

                android:layout_height="217dp"

            android:layout_height="240dp"

            android:contentDescription="@string/screen_zoom_preview_title"

            android:nestedScrollingEnabled="true"/>

        <LinearLayout

            android:layout_width="match_parent"
@@ -79,5 +76,4 @@ 
                style="?android:attr/borderlessButtonStyle" />

        </LinearLayout>

    </LinearLayout>

    </LinearLayout>

</FrameLayout>

res/layout/accessibility_text_reading_preview_app_grid.xml

+13 −7
Original line number Diff line number Diff line
@@ -14,19 +14,25 @@ 
    See the License for the specific language governing permissions and

    limitations under the License.

-->

<FrameLayout

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

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

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

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:contentDescription="@string/preview_pager_home_content_description" >

    android:orientation="vertical"

    android:contentDescription="@string/preview_pager_home_title"

    android:clipChildren="true" >

    <TextView

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:text="@string/preview_pager_home_title"

        android:importantForAccessibility="noHideDescendants"

        style="@style/AccessibilityTextReadingPreviewPageTitle" />

    <com.android.settings.display.AppGridView

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

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

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:layout_height="wrap_content"

        android:numColumns="3"

        android:gravity="center"

        android:nestedScrollingEnabled="true"

        android:importantForAccessibility="noHideDescendants"

        app:appCount="6"/>

</FrameLayout>
 
</LinearLayout>
 
 No newline at end of file

res/layout/accessibility_text_reading_preview_mail_content.xml

+43 −33
Original line number Diff line number Diff line
@@ -14,18 +14,27 @@ 
    See the License for the specific language governing permissions and

    limitations under the License.

-->

<androidx.core.widget.NestedScrollView

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

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

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:fillViewport="true"

    android:contentDescription="@string/preview_pager_email_content_description">



    android:orientation="vertical"

    android:contentDescription="@string/preview_pager_email_title"

    android:clipChildren="true">

    <TextView

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:text="@string/preview_pager_email_title"

        android:importantForAccessibility="noHideDescendants"

        style="@style/AccessibilityTextReadingPreviewPageTitle" />

    <androidx.core.widget.NestedScrollView

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:importantForAccessibility="noHideDescendants"

        android:fillViewport="true">

        <LinearLayout

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

        android:orientation="vertical"

        android:importantForAccessibility="noHideDescendants">

            android:orientation="vertical">



            <TextView

                android:id="@+id/subject"
@@ -55,3 +64,4 @@ 
                android:textColor="?android:attr/textColorPrimary"/>

        </LinearLayout>

    </androidx.core.widget.NestedScrollView>

</LinearLayout>
 
 No newline at end of file

res/layout/screen_zoom_preview_1.xml

+39 −28
Original line number Diff line number Diff line
@@ -13,24 +13,34 @@ 
     See the License for the specific language governing permissions and

     limitations under the License.

-->

<androidx.core.widget.NestedScrollView

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

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

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

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:fillViewport="true"

    android:contentDescription="@string/preview_pager_message_content_description">

    android:orientation="vertical"

    android:contentDescription="@string/preview_pager_message_title"

    android:clipChildren="true">

    <TextView

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:text="@string/preview_pager_message_title"

        android:importantForAccessibility="noHideDescendants"

        style="@style/AccessibilityTextReadingPreviewPageTitle" />

    <androidx.core.widget.NestedScrollView

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:importantForAccessibility="noHideDescendants"

        android:fillViewport="true">



        <view class="com.android.settings.TouchBlockingFrameLayout"

            android:id="@+id/frame"

            android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:importantForAccessibility="noHideDescendants">

            android:layout_height="wrap_content">



            <LinearLayout

                android:layout_width="match_parent"

                android:layout_height="match_parent"

            android:paddingTop="@dimen/conversation_message_list_padding"

                android:paddingTop="@dimen/settingslib_expressive_space_extrasmall3"

                android:paddingStart="@dimen/conversation_message_list_padding"

                android:paddingEnd="@dimen/conversation_message_list_padding"

                android:orientation="vertical">
@@ -51,3 +61,4 @@ 
            </LinearLayout>

        </view>

    </androidx.core.widget.NestedScrollView>

</LinearLayout>
 
 No newline at end of file

res/values/colors.xml

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ 
    <color name="message_bubble_outgoing">#C7C8B7</color>

    <color name="message_icon_background_incoming">#E6F451</color>

    <color name="message_icon_background_outgoing">#FBBC04</color>

    <color name="message_icon_color">#DADADA</color>

    <color name="message_icon_color">@android:color/black</color>



    <color name="usage_graph_dots">#B0BEC5</color>