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

Commit 4f63bb69 authored by Noah Wang's avatar Noah Wang Committed by Android (Google) Code Review
Browse files

Merge "Fix preview screen crashing and glitches for Display / Font size Bug:... 

Merge "Fix preview screen crashing and glitches for Display / Font size Bug: 28223545 Bug: 28223533 Bug: 28210654 Bug: 28210242 Bug: 28208955 Bug: 27699996" into nyc-dev
parents c3ab03ec 35a95617

AndroidManifest.xml

+1 −2
Original line number Diff line number Diff line
@@ -1478,8 +1478,7 @@ 
        <activity android:name=".accessibility.AccessibilitySettingsForSetupWizardActivity"

                android:label="@string/vision_settings_title"

                android:theme="@style/SetupWizardAccessibilityTheme"

                android:taskAffinity="com.android.wizard"

                android:configChanges="orientation|keyboardHidden|screenSize" >

                android:taskAffinity="com.android.wizard" >

            <intent-filter android:priority="1">

                <action android:name="android.settings.ACCESSIBILITY_SETTINGS_FOR_SUW" />

                <category android:name="android.intent.category.DEFAULT" />

res/layout-h360dp/font_size_activity.xml→res/layout-land/font_size_activity.xml

+33 −25
Original line number Diff line number Diff line
@@ -14,26 +14,19 @@ 
     limitations under the License.

-->



<ScrollView 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:orientation="horizontal">



    <LinearLayout

        android:orientation="vertical"

        android:layout_width="match_parent"

        android:layout_height="wrap_content" >

        android:layout_width="0dp"

        android:layout_weight="1"

        android:layout_height="match_parent">



        <include layout="@layout/preview_seek_bar_view_pager" />



        <LinearLayout

            android:orientation="vertical"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:paddingTop="16dp"

            android:paddingStart="?android:attr/listPreferredItemPaddingStart"

            android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">



        <com.android.settings.widget.DotsPageIndicator

            android:id="@+id/page_indicator"

            style="@style/PreviewPagerPageIndicator"
@@ -41,6 +34,21 @@ 
            android:layout_height="wrap_content"

            android:layout_gravity="center_horizontal"

            android:padding="6dp" />

    </LinearLayout>



    <ScrollView

            android:layout_width="0dp"

            android:layout_weight="1"

            android:layout_height="match_parent"

            android:fillViewport="true">



        <LinearLayout

            android:orientation="vertical"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:paddingTop="16dp"

            android:paddingStart="?android:attr/listPreferredItemPaddingStart"

            android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">



            <TextView

                android:id="@+id/current_label"
@@ -51,16 +59,22 @@ 
                android:textAppearance="@android:style/TextAppearance.Material.Widget.TextView"

                android:elevation="2dp" />



            <LinearLayout

            <com.android.settings.widget.LabeledSeekBar

                android:id="@+id/seek_bar"

                android:layout_width="match_parent"

                android:layout_height="48dp"

                style="@android:style/Widget.Material.SeekBar.Discrete" />



            <RelativeLayout

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:gravity="center_vertical"

                android:paddingTop="8dp">

                android:gravity="center_vertical">



                <ImageView

                    android:id="@+id/smaller"

                    android:layout_width="48dp"

                    android:layout_height="48dp"

                    android:layout_alignParentStart="true"

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

                    android:src="@drawable/ic_font_size_16dp"

                    android:tint="?android:attr/textColorPrimary"
@@ -69,17 +83,11 @@ 
                    android:focusable="true"

                    android:contentDescription="@string/font_size_make_smaller_desc" />



                <com.android.settings.widget.LabeledSeekBar

                    android:id="@+id/seek_bar"

                    android:layout_width="0dp"

                    android:layout_height="48dp"

                    android:layout_weight="1"

                    style="@android:style/Widget.Material.SeekBar.Discrete"/>



                <ImageView

                    android:id="@+id/larger"

                    android:layout_width="48dp"

                    android:layout_height="48dp"

                    android:layout_alignParentEnd="true"

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

                    android:src="@drawable/ic_font_size_24dp"

                    android:tint="?android:attr/textColorPrimary"
@@ -87,7 +95,7 @@ 
                    android:scaleType="center"

                    android:focusable="true"

                    android:contentDescription="@string/font_size_make_larger_desc" />

            </LinearLayout>

            </RelativeLayout>



            <TextView

                android:layout_width="wrap_content"
@@ -96,5 +104,5 @@ 
                android:layout_marginBottom="16dp"

                android:textAppearance="@android:style/TextAppearance.Material.Subhead" />

        </LinearLayout>

    </LinearLayout>

    </ScrollView>

</LinearLayout>

res/layout-h360dp/screen_zoom_activity.xml→res/layout-land/screen_zoom_activity.xml

+32 −23
Original line number Diff line number Diff line
@@ -14,26 +14,19 @@ 
     limitations under the License.

-->



<ScrollView 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:orientation="horizontal">



    <LinearLayout

        android:orientation="vertical"

        android:layout_width="match_parent"

        android:layout_height="wrap_content" >

        android:layout_width="0dp"

        android:layout_weight="1"

        android:layout_height="match_parent" >



        <include layout="@layout/preview_seek_bar_view_pager" />



        <LinearLayout

            android:orientation="vertical"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:paddingTop="16dp"

            android:paddingStart="?android:attr/listPreferredItemPaddingStart"

            android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">



        <com.android.settings.widget.DotsPageIndicator

            android:id="@+id/page_indicator"

            style="@style/PreviewPagerPageIndicator"
@@ -41,6 +34,21 @@ 
            android:layout_height="wrap_content"

            android:layout_gravity="center_horizontal"

            android:padding="6dp" />

    </LinearLayout>



    <ScrollView

            android:layout_width="0dp"

            android:layout_weight="1"

            android:layout_height="match_parent"

            android:fillViewport="true">



        <LinearLayout

            android:orientation="vertical"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:paddingTop="16dp"

            android:paddingStart="?android:attr/listPreferredItemPaddingStart"

            android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">



            <TextView

                android:id="@+id/current_label"
@@ -51,7 +59,13 @@ 
                android:textAppearance="@android:style/TextAppearance.Material.Widget.TextView"

                android:elevation="2dp" />



            <LinearLayout

            <com.android.settings.widget.LabeledSeekBar

                android:id="@+id/seek_bar"

                android:layout_width="match_parent"

                android:layout_height="48dp"

                style="@android:style/Widget.Material.SeekBar.Discrete"/>



            <RelativeLayout

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:gravity="center_vertical">
@@ -60,6 +74,7 @@ 
                    android:id="@+id/smaller"

                    android:layout_width="48dp"

                    android:layout_height="48dp"

                    android:layout_alignParentStart="true"

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

                    android:src="@drawable/ic_remove_24dp"

                    android:tint="?android:attr/textColorPrimary"
@@ -68,17 +83,11 @@ 
                    android:focusable="true"

                    android:contentDescription="@string/screen_zoom_make_smaller_desc" />



                <com.android.settings.widget.LabeledSeekBar

                    android:id="@+id/seek_bar"

                    android:layout_width="0dp"

                    android:layout_height="48dp"

                    android:layout_weight="1"

                    style="@android:style/Widget.Material.SeekBar.Discrete"/>



                <ImageView

                    android:id="@+id/larger"

                    android:layout_width="48dp"

                    android:layout_height="48dp"

                    android:layout_alignParentEnd="true"

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

                    android:src="@drawable/ic_add_24dp"

                    android:tint="?android:attr/textColorPrimary"
@@ -86,7 +95,7 @@ 
                    android:scaleType="center"

                    android:focusable="true"

                    android:contentDescription="@string/screen_zoom_make_larger_desc" />

            </LinearLayout>

            </RelativeLayout>



            <TextView

                android:layout_width="wrap_content"
@@ -95,5 +104,5 @@ 
                android:layout_marginBottom="16dp"

                android:textAppearance="@android:style/TextAppearance.Material.Subhead" />

        </LinearLayout>

    </LinearLayout>

    </ScrollView>

</LinearLayout>

res/layout/conversation_message_content.xml

+0 −1
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ 
        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:orientation="vertical"

        android:minHeight="@dimen/conversation_message_contact_icon_size"

        android:layout_marginTop="0dp" >



        <TextView

res/layout/conversation_message_icon.xml

+2 −2
Original line number Diff line number Diff line
@@ -16,8 +16,8 @@ 


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

    android:id="@+id/conversation_icon"

    android:layout_width="@dimen/conversation_message_contact_icon_size"

    android:layout_height="@dimen/conversation_message_contact_icon_size"

    android:layout_width="wrap_content"

    android:layout_height="wrap_content"

    android:fontFamily="sans-serif"

    android:textStyle="bold"

    android:textSize="@dimen/conversation_message_contact_icon_text_size"