diff options
| author | Bob Yang <zonghuayang@google.com> | 2023-03-24 03:35:21 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2023-03-24 03:35:21 +0000 |
| commit | c103b4ab38232a44f6f049fafd1e3edf8e44fa3c (patch) | |
| tree | c22c52e1518ee51ca7882367c79d07f554974109 | |
| parent | 15ef93ecba3fe4ef1dcfc727dffcfe44c5757a54 (diff) | |
| parent | dd072a04c484d0da1c47c01b26e90f9fb5431807 (diff) | |
| download | WallpaperPicker2-c103b4ab38232a44f6f049fafd1e3edf8e44fa3c.tar.gz | |
Merge "Add progress button in preview" into tm-qpr-dev
| -rw-r--r-- | res/layout/fragment_wallpaper_preview.xml | 11 | ||||
| -rwxr-xr-x | res/values/dimens.xml | 1 |
2 files changed, 12 insertions, 0 deletions
diff --git a/res/layout/fragment_wallpaper_preview.xml b/res/layout/fragment_wallpaper_preview.xml index cf0f52ca..70d35385 100644 --- a/res/layout/fragment_wallpaper_preview.xml +++ b/res/layout/fragment_wallpaper_preview.xml @@ -126,6 +126,17 @@ android:paddingHorizontal="@dimen/full_preview_page_tabs_horizontal_padding" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" /> + + <ProgressBar + android:id="@+id/action_progress" + android:layout_width="@dimen/effect_generating_progress_bar_size" + android:layout_height="@dimen/effect_generating_progress_bar_size" + android:indeterminateTint="?android:attr/textColorSecondary" + android:visibility="gone" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintStart_toStartOf="parent" /> </androidx.constraintlayout.widget.ConstraintLayout> <com.android.wallpaper.widget.FloatingSheet diff --git a/res/values/dimens.xml b/res/values/dimens.xml index 5222e71d..98332373 100755 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -67,6 +67,7 @@ <!-- Dimensions for wallpaper tiles in individual picker when in desktop mode. --> <dimen name="tile_desktop_progress_bar_size">40dp</dimen> + <dimen name="effect_generating_progress_bar_size">48dp</dimen> <!-- Dimensions for "daily refresh" rotation tile in individual picker when in desktop mode. --> <dimen name="rotation_tile_desktop_label_padding">16dp</dimen> |