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

Commit a32ca23a authored by Sunny Goyal's avatar Sunny Goyal
Browse files

Merging from ub-launcher3-master @ build 6976145 

Test: manual, presubmit on the source branch
x20/teams/android-launcher/merge/ub-launcher3-master_master_6976145.html

Change-Id: I4368a82b71b761fdb11f49c976e4eb1657b3ca64
parents 4ddc446e 8038c108

res/layout/fragment_custom_theme_component.xml

+1 −4
Original line number Diff line number Diff line
@@ -45,10 +45,7 @@ 
                android:id="@+id/component_preview_content"

                layout="@layout/theme_component_preview"

                android:layout_width="match_parent"

                android:layout_height="match_parent"

                android:layout_gravity="center_vertical"

                android:layout_marginHorizontal="@dimen/preview_page_horizontal_margin"

                android:layout_marginTop="@dimen/preview_page_top_margin"/>

                android:layout_height="match_parent"/>

        </FrameLayout>



        <View

res/layout/preview_card_color_content.xml

+3 −9
Original line number Diff line number Diff line
@@ -22,9 +22,8 @@ 
    android:gravity="center_horizontal"

    android:orientation="vertical">

    <LinearLayout

        android:layout_width="match_parent"

        android:layout_width="@dimen/preview_theme_color_component_size"

        android:layout_height="wrap_content"

        android:layout_weight="0"

        android:gravity="center|bottom"

        android:orientation="horizontal">

        <FrameLayout
@@ -89,7 +88,7 @@ 
        android:layout_height="0dp"

        android:layout_weight="1" />

    <LinearLayout

        android:layout_width="match_parent"

        android:layout_width="@dimen/preview_theme_color_component_size"

        android:layout_height="wrap_content"

        android:layout_weight="0"

        android:orientation="horizontal"
@@ -109,9 +108,8 @@ 
        android:layout_height="0dp"

        android:layout_weight="1" />

    <LinearLayout

        android:layout_width="match_parent"

        android:layout_width="@dimen/preview_theme_color_component_size"

        android:layout_height="wrap_content"

        android:layout_weight="0"

        android:gravity="center"

        android:orientation="horizontal">

        <FrameLayout
@@ -159,8 +157,4 @@ 
                android:enabled="false"/>

        </FrameLayout>

    </LinearLayout>

    <Space

        android:layout_width="match_parent"

        android:layout_height="0dp"

        android:layout_weight="1" />

</LinearLayout>

res/layout/preview_card_font_content.xml

+4 −7
Original line number Diff line number Diff line
@@ -20,15 +20,13 @@ 
    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:layout_gravity="center"

    android:weightSum="7"

    android:orientation="vertical"

    tools:showIn="@layout/theme_preview_card">

    <TextView

        style="@style/FontCardTitleStyle"

        android:id="@+id/font_card_title"

        android:layout_width="wrap_content"

        android:layout_height="16sp"

        android:layout_weight="1.5"

        android:layout_height="wrap_content"

        android:layout_gravity="center"

        android:gravity="center_horizontal"

        android:maxLines="1"
@@ -36,10 +34,10 @@ 
    <Space

        android:layout_width="match_parent"

        android:layout_height="0dp"

        android:layout_weight="0"/>

        android:layout_weight="1"/>

    <View

        android:id="@+id/font_card_divider"

        android:layout_width="15dp"

        android:layout_width="16dp"

        android:layout_height="2dp"

        android:layout_gravity="center"

        android:background="?android:colorAccent"/>
@@ -50,8 +48,7 @@ 
    <TextView

        style="@style/FontCardBodyTextStyle"

        android:id="@+id/font_card_body"

        android:layout_height="56sp"

        android:layout_weight="2"

        android:layout_height="wrap_content"

        android:layout_gravity="bottom|center_horizontal"

        android:gravity="center_horizontal"

        android:text="@string/font_card_body"/>

res/layout/preview_card_icon_content.xml

+7 −12
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
    android:gravity="center_horizontal"

    android:orientation="vertical">

    <LinearLayout

        android:layout_width="match_parent"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:gravity="center_horizontal"

        android:orientation="horizontal">
@@ -33,7 +33,7 @@ 
            android:layout_weight="1"

            android:tint="@color/theme_preview_icon_color"/>

        <Space

            android:layout_width="0dp"

            android:layout_width="@dimen/preview_theme_icon_size"

            android:layout_height="match_parent"

            android:layout_weight="0" />

        <ImageView
@@ -43,7 +43,7 @@ 
            android:layout_weight="1"

            android:tint="@color/theme_preview_icon_color"/>

        <Space

            android:layout_width="0dp"

            android:layout_width="@dimen/preview_theme_icon_size"

            android:layout_height="match_parent"

            android:layout_weight="0" />

        <ImageView
@@ -55,10 +55,9 @@ 
    </LinearLayout>

    <Space

        android:layout_width="match_parent"

        android:layout_height="0dp"

        android:layout_weight="1" />

        android:layout_height="68dp" />

    <LinearLayout

        android:layout_width="match_parent"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:gravity="bottom|center_horizontal"

        android:orientation="horizontal">
@@ -69,7 +68,7 @@ 
            android:layout_weight="1"

            android:tint="@color/theme_preview_icon_color"/>

        <Space

            android:layout_width="0dp"

            android:layout_width="@dimen/preview_theme_icon_size"

            android:layout_height="match_parent"

            android:layout_weight="0" />

        <ImageView
@@ -79,7 +78,7 @@ 
            android:layout_weight="1"

            android:tint="@color/theme_preview_icon_color"/>

        <Space

            android:layout_width="0dp"

            android:layout_width="@dimen/preview_theme_icon_size"

            android:layout_height="match_parent"

            android:layout_weight="0" />

        <ImageView
@@ -89,8 +88,4 @@ 
            android:layout_weight="1"

            android:tint="@color/theme_preview_icon_color"/>

    </LinearLayout>

    <Space

        android:layout_width="match_parent"

        android:layout_height="0dp"

        android:layout_weight="1" />

</LinearLayout>
 
 No newline at end of file

res/layout/preview_card_shape_content.xml

+7 −12
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
    android:gravity="center_horizontal"

    android:orientation="vertical">

        <LinearLayout

            android:layout_width="match_parent"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:gravity="center_horizontal"

            android:orientation="horizontal">
@@ -39,7 +39,7 @@ 
                            android:elevation="4dp"/>

                </FrameLayout>

                <Space

                    android:layout_width="0dp"

                    android:layout_width="@dimen/preview_theme_shape_size"

                    android:layout_height="match_parent"

                    android:layout_weight="0" />

                <FrameLayout
@@ -55,7 +55,7 @@ 
                            android:elevation="4dp"/>

                </FrameLayout>

                <Space

                    android:layout_width="0dp"

                    android:layout_width="@dimen/preview_theme_shape_size"

                    android:layout_height="match_parent"

                    android:layout_weight="0" />

                <FrameLayout
@@ -73,10 +73,9 @@ 
        </LinearLayout>

        <Space

            android:layout_width="match_parent"

            android:layout_height="0dp"

            android:layout_weight="1" />

            android:layout_height="60dp" />

        <LinearLayout

            android:layout_width="match_parent"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:gravity="bottom|center_horizontal"

            android:orientation="horizontal">
@@ -93,7 +92,7 @@ 
                            android:elevation="4dp"/>

                </FrameLayout>

                <Space

                    android:layout_width="0dp"

                    android:layout_width="@dimen/preview_theme_shape_size"

                    android:layout_height="match_parent"

                    android:layout_weight="0" />

                <FrameLayout
@@ -109,7 +108,7 @@ 
                            android:elevation="4dp"/>

                </FrameLayout>

                <Space

                    android:layout_width="0dp"

                    android:layout_width="@dimen/preview_theme_shape_size"

                    android:layout_height="match_parent"

                    android:layout_weight="0" />

                <FrameLayout
@@ -125,8 +124,4 @@ 
                            android:elevation="4dp"/>

                </FrameLayout>

        </LinearLayout>

        <Space

            android:layout_width="match_parent"

            android:layout_height="0dp"

            android:layout_weight="1" />

</LinearLayout>
 
 No newline at end of file