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

Commit 9e99427e authored by Santiago Etchebehere's avatar Santiago Etchebehere
Browse files

Merging from ub-launcher3-master @ build 6437481 

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

Change-Id: Idea6ff9a1f932917c5abf4aa94d79f422c97949e
parents 8a3847e7 e664cbeb

res/drawable/ic_check_circle_filled_24px.xml

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
    android:viewportWidth="24"

    android:viewportHeight="24">

  <path

      android:fillColor="@color/selected_check_background_color"

      android:fillColor="@color/accent_color"

      android:pathData="M12,2C6.5,2 2,6.5 2,12s4.5,10 10,10s10,-4.5 10,-10S17.5,2 12,2zM10,17l-4,-4l1.4,-1.4l2.6,2.6l6.6,-6.6L18,9L10,17z"/>

  <path

      android:pathData="m8.0085,14.9866 l-1.9939,-1.994 0.6892,-0.6889 0.6892,-0.6889 1.2925,1.2926c0.7109,0.711 1.3035,1.2926 1.3169,1.2926 0.0134,0 1.5034,-1.4789 3.3111,-3.2865l3.2866,-3.2865 0.689,0.689 0.689,0.689 -3.9878,3.9878 -3.9878,3.9878z"

res/layout-land/fragment_grid_picker.xml

+4 −20
Original line number Diff line number Diff line
@@ -39,34 +39,18 @@ 
            android:background="@color/secondary_color"

            app:card_style="screen_aspect_ratio"/>



        <LinearLayout

        <FrameLayout

            android:id="@+id/options_section"

            android:layout_width="0dp"

            android:layout_height="match_parent"

            android:layout_weight="1"

            android:paddingVertical="10dp"

            android:orientation="vertical">

            android:paddingVertical="10dp">



            <androidx.recyclerview.widget.RecyclerView

                android:id="@+id/options_container"

                android:layout_width="match_parent"

                android:layout_height="0dp"

                android:layout_weight="1"/>



            <RelativeLayout

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:paddingHorizontal="10dp">

                <Button

                    android:id="@+id/apply_button"

                    style="@style/ActionPrimaryButton"

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

                    android:layout_alignParentEnd="true"

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

            </RelativeLayout>



        </LinearLayout>

                android:layout_height="match_parent"/>

        </FrameLayout>

    </LinearLayout>

        <androidx.core.widget.ContentLoadingProgressBar

            android:id="@+id/loading_indicator"

res/layout/fragment_grid_picker.xml

+20 −17
Original line number Diff line number Diff line
@@ -39,36 +39,39 @@ 
                android:background="@color/preview_pager_background"

                app:card_style="screen_aspect_ratio"

                app:layout_constrainedHeight="true"

                app:layout_constraintBottom_toTopOf="@id/options_container"

                app:layout_constraintTop_toTopOf="parent"

                app:layout_constraintBottom_toTopOf="@id/options_title"

                app:layout_constraintStart_toStartOf="parent"

                app:layout_constraintEnd_toEndOf="parent"

                app:layout_constraintHeight_max="@dimen/preview_pager_max_height"

                app:layout_constraintHeight_min="@dimen/preview_pager_min_height"

                app:layout_constraintVertical_bias="0.0"

                app:layout_constraintStart_toStartOf="parent"

                app:layout_constraintTop_toTopOf="parent"

                app:layout_constraintVertical_chainStyle="spread_inside"/>



            <TextView

                android:id="@+id/options_title"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:gravity="center"

                android:paddingVertical="18dp"

                android:lineHeight="24dp"

                android:singleLine="true"

                android:text="@string/grid_options_title"

                android:textAppearance="@style/TitleTextAppearance"

                app:layout_constraintTop_toBottomOf="@id/grid_preview_pager"

                app:layout_constraintBottom_toTopOf="@id/options_container"

                app:layout_constraintStart_toStartOf="parent"

                app:layout_constraintEnd_toEndOf="parent"/>



            <androidx.recyclerview.widget.RecyclerView

                android:id="@+id/options_container"

                android:layout_width="match_parent"

                android:layout_height="@dimen/options_container_height"

                android:layout_gravity="center_horizontal"

                android:layout_marginTop="10dp"

                app:layout_constraintBottom_toTopOf="@id/placeholder"

                app:layout_constraintEnd_toEndOf="parent"

                app:layout_constraintTop_toBottomOf="@+id/options_title"

                app:layout_constraintStart_toStartOf="parent"

                app:layout_constraintTop_toBottomOf="@+id/grid_preview_pager"

                app:layout_constraintVertical_bias="1.0"/>



            <Space

                android:id="@+id/placeholder"

                android:layout_width="match_parent"

                android:layout_height="@dimen/min_taptarget_height"

                app:layout_constraintBottom_toBottomOf="parent"

                app:layout_constraintStart_toStartOf="parent"

                app:layout_constraintTop_toBottomOf="@id/options_container"

                app:layout_constraintEnd_toEndOf="parent"

                app:layout_constraintVertical_bias="1.0"/>



        </androidx.constraintlayout.widget.ConstraintLayout>



        <androidx.core.widget.ContentLoadingProgressBar

res/layout/fragment_grid_scalable_picker.xml

+16 −33
Original line number Diff line number Diff line
@@ -44,46 +44,29 @@ 
        app:behavior_peekHeight="@dimen/content_container_minimum_height"

        app:layout_behavior="@string/bottom_sheet_behavior">



        <androidx.constraintlayout.widget.ConstraintLayout

        <LinearLayout

            android:id="@+id/content_section"

            android:layout_width="match_parent"

            android:layout_height="match_parent">

            android:layout_height="match_parent"

            android:orientation="vertical">



            <TextView

                android:id="@+id/options_title"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:gravity="center"

                android:paddingVertical="18dp"

                android:lineHeight="24dp"

                android:singleLine="true"

                android:text="@string/grid_options_title"

                android:textAppearance="@style/TitleTextAppearance"/>



            <androidx.recyclerview.widget.RecyclerView

                android:id="@+id/options_container"

                android:layout_width="match_parent"

                android:layout_height="@dimen/options_container_height"

                android:layout_gravity="center_horizontal"

                android:layout_marginTop="10dp"

                app:layout_constraintBottom_toTopOf="@id/placeholder"

                app:layout_constraintEnd_toEndOf="parent"

                app:layout_constraintStart_toStartOf="parent"

                app:layout_constraintTop_toTopOf="parent"

                app:layout_constraintVertical_bias="1.0" />



            <Space

                android:id="@+id/placeholder"

                android:layout_width="match_parent"

                android:layout_height="@dimen/min_taptarget_height"

                app:layout_constraintBottom_toTopOf="@id/apply_button"

                app:layout_constraintStart_toStartOf="parent"

                app:layout_constraintTop_toBottomOf="@id/options_container"

                app:layout_constraintVertical_bias="1.0" />



            <Button

                android:id="@+id/apply_button"

                style="@style/ActionPrimaryButton"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_gravity="end"

                android:layout_marginVertical="10dp"

                android:layout_marginEnd="10dp"

                android:layout_weight="1"

                android:text="@string/apply_theme_btn"

                app:layout_constraintBottom_toBottomOf="parent"

                app:layout_constraintEnd_toEndOf="parent" />



        </androidx.constraintlayout.widget.ConstraintLayout>

                android:layout_gravity="center_horizontal"/>

        </LinearLayout>

    </FrameLayout>



    <FrameLayout

res/values/dimens.xml

+6 −6
Original line number Diff line number Diff line
@@ -21,15 +21,15 @@ 
    <dimen name="tip_dot_size">8dp</dimen>

    <dimen name="tip_dot_line_width">2dp</dimen>



    <dimen name="check_size">20dp</dimen>

    <dimen name="check_offset">-4dp</dimen>

    <dimen name="check_size">16dp</dimen>

    <dimen name="check_offset">4dp</dimen>



    <dimen name="component_preview_page_bottom_margin">16dp</dimen>



    <!-- Dimensions for the customization option tiles -->

    <dimen name="options_container_height">104dp</dimen>

    <dimen name="options_container_height">120dp</dimen>

    <dimen name="options_container_width">0dp</dimen>

    <dimen name="option_tile_width">72dp</dimen>

    <dimen name="option_tile_width">88dp</dimen>

    <dimen name="theme_option_icon_sample_height">18dp</dimen>

    <dimen name="theme_option_icon_sample_width">18dp</dimen>

    <dimen name="theme_option_shape_sample_height">16dp</dimen>
@@ -38,8 +38,8 @@ 
    <dimen name="theme_option_font_sample_width">52dp</dimen>

    <dimen name="theme_option_sample_padding">5dp</dimen>

    <!-- Note, using dp instead of sp as this is just the "+" symbol, not text -->

    <dimen name="option_tile_padding_vertical">12dp</dimen>

    <dimen name="option_tile_padding_horizontal">10dp</dimen>

    <dimen name="option_tile_padding_vertical">16dp</dimen>

    <dimen name="option_tile_padding_horizontal">16dp</dimen>



    <dimen name="option_bottom_margin">8dp</dimen>

    <!-- Note, using dp instead of sp as this text is more like a "snapshot" of the font -->