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

Commit 49cfbecf authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 6465939 from 3ca04937 to mainline-release

Change-Id: I4649a9fbc9a15e1ab38bf1912c1569d562156807
parents 51ca192d 3ca04937
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@
    android:viewportWidth="24"
    android:viewportHeight="24">
  <path
      android:fillColor="@color/accent_color"
      android:fillColor="@color/selected_check_background_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"
+20 −4
Original line number Diff line number Diff line
@@ -39,18 +39,34 @@
            android:background="@color/secondary_color"
            app:card_style="screen_aspect_ratio"/>

        <FrameLayout
        <LinearLayout
            android:id="@+id/options_section"
            android:layout_width="0dp"
            android:layout_height="match_parent"
            android:layout_weight="1"
            android:paddingVertical="10dp">
            android:paddingVertical="10dp"
            android:orientation="vertical">

            <androidx.recyclerview.widget.RecyclerView
                android:id="@+id/options_container"
                android:layout_width="match_parent"
                android:layout_height="match_parent"/>
        </FrameLayout>
                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>
    </LinearLayout>
        <androidx.core.widget.ContentLoadingProgressBar
            android:id="@+id/loading_indicator"
+23 −7
Original line number Diff line number Diff line
@@ -55,14 +55,30 @@
                    android:layout_height="0dp"
                    android:layout_weight="1"/>

                <RelativeLayout
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content"
                    android:background="@null"
                    android:paddingHorizontal="10dp">
                    <CheckBox
                        android:id="@+id/use_my_wallpaper"
                        android:layout_width="wrap_content"
                        android:layout_height="wrap_content"
                        android:layout_alignParentStart="true"
                        android:layout_centerVertical="true"
                        android:layout_toStartOf="@+id/apply_button"
                        android:ellipsize="end"
                        android:paddingLeft="4dp"
                        android:minHeight="@dimen/min_taptarget_height"
                        android:text="@string/keep_my_wallpaper"/>
                    <Button
                        android:id="@+id/apply_button"
                        style="@style/ActionPrimaryButton"
                        android:layout_width="wrap_content"
                        android:layout_height="wrap_content"
                    android:layout_gravity="end"
                    android:paddingHorizontal="10dp"
                        android:layout_alignParentEnd="true"
                        android:text="@string/apply_theme_btn"/>
                </RelativeLayout>
            </LinearLayout>
        </LinearLayout>

+30 −20
Original line number Diff line number Diff line
@@ -39,39 +39,49 @@
                android:background="@color/preview_pager_background"
                app:card_style="screen_aspect_ratio"
                app:layout_constrainedHeight="true"
                app:layout_constraintTop_toTopOf="parent"
                app:layout_constraintBottom_toTopOf="@id/options_title"
                app:layout_constraintStart_toStartOf="parent"
                app:layout_constraintBottom_toTopOf="@id/options_container"
                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_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"/>
                app:layout_constraintTop_toTopOf="parent"
                app:layout_constraintVertical_chainStyle="spread_inside"/>

            <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"
                app:layout_constraintTop_toBottomOf="@+id/options_title"
                app:layout_constraintStart_toStartOf="parent"
                android:layout_marginTop="10dp"
                app:layout_constraintBottom_toTopOf="@id/placeholder"
                app:layout_constraintEnd_toEndOf="parent"
                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_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_marginEnd="10dp"
                android:layout_marginVertical="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>

        <androidx.core.widget.ContentLoadingProgressBar
+33 −16
Original line number Diff line number Diff line
@@ -44,29 +44,46 @@
        app:behavior_peekHeight="@dimen/content_container_minimum_height"
        app:layout_behavior="@string/bottom_sheet_behavior">

        <LinearLayout
        <androidx.constraintlayout.widget.ConstraintLayout
            android:id="@+id/content_section"
            android:layout_width="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"/>
            android:layout_height="match_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"/>
        </LinearLayout>
                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>
    </FrameLayout>

    <FrameLayout
Loading