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

Commit 01adf9b8 authored by Santiago Etchebehere's avatar Santiago Etchebehere
Browse files

Merging from ub-launcher3-master @ build 6665145 

Bug:154410862
Test: manual, presubmit on the source branch
x20/teams/android-launcher/merge/ub-launcher3-master_rvc-d1-dev_6665145.html

Change-Id: I6012c5008ef8d6ffaa3409c8b601ddcd6262f422
parents 32af43ae 7dab08c0

res/layout/custom_theme_option.xml

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
     limitations under the License.

-->

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

    android:layout_width="wrap_content"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:paddingHorizontal="@dimen/option_padding_horizontal"

    android:paddingBottom="@dimen/option_bottom_margin"

res/layout/grid_option.xml

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

-->

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

    android:layout_width="wrap_content"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:paddingRight="2dp"

    android:paddingHorizontal="@dimen/option_padding_horizontal"

    android:paddingBottom="@dimen/option_bottom_margin"

    android:clipChildren="false"

    android:clipToPadding="false"

res/layout/theme_component_preview.xml

+2 −0
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ 
            android:layout_gravity="center_horizontal"

            android:drawablePadding="@dimen/theme_preview_header_drawable_padding"

            android:textAppearance="@style/CardTitleTextAppearance"

            android:importantForAccessibility="no"

            app:layout_constraintBottom_toTopOf="@id/theme_preview_card_body_container"

            app:layout_constraintEnd_toEndOf="parent"

            app:layout_constraintHorizontal_bias="0.5"
@@ -64,6 +65,7 @@ 
            android:layout_marginHorizontal="8dp"

            android:layout_marginTop="@dimen/preview_theme_content_margin"

            android:clipChildren="false"

            android:importantForAccessibility="noHideDescendants"

            app:layout_constraintBottom_toTopOf="@+id/guideline"

            app:layout_constraintEnd_toEndOf="parent"

            app:layout_constraintHeight_max="@dimen/preview_theme_content_max_height"

res/layout/theme_option.xml

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
     limitations under the License.

-->

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

    android:layout_width="wrap_content"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:paddingHorizontal="@dimen/option_padding_horizontal"

    android:paddingBottom="@dimen/option_bottom_margin"

res/values/strings.xml

+12 −0
Original line number Diff line number Diff line
@@ -52,6 +52,18 @@ 
    <!-- Content description of grid preview card. [CHAR_LIMIT=30]-->

    <string name="grid_preview_card_content_description">Grid preview</string>



    <!-- Content description of font preview. [CHAR_LIMIT=30]-->

    <string name="font_preview_content_description">Font preview</string>



    <!-- Content description of icon preview. [CHAR_LIMIT=30]-->

    <string name="icon_preview_content_description">Icon preview</string>



    <!-- Content description of color preview. [CHAR_LIMIT=30]-->

    <string name="color_preview_content_description">Color preview</string>



    <!-- Content description of shape preview. [CHAR_LIMIT=30]-->

    <string name="shape_preview_content_description">Shape preview</string>



    <!-- Content description indicating that the selected option is currently applied to the device. [CHAR_LIMIT=NONE] -->

    <string name="option_applied_description"><xliff:g name="style_name">%1$s</xliff:g>, currently applied</string>