diff options
| author | chihhangchuang <chihhangchuang@google.com> | 2020-05-20 10:08:01 +0800 |
|---|---|---|
| committer | chihhangchuang <chihhangchuang@google.com> | 2020-05-20 14:10:47 +0800 |
| commit | 0ff710e989e91cd661726e9ba1ab968e52135c13 (patch) | |
| tree | f81ae3de026968561bf6de5abafb99bcd37b48f8 /res/layout-land | |
| parent | 247d7e02bdb68b20597338a75a4c2cb0a15372d9 (diff) | |
| download | ThemePicker-0ff710e989e91cd661726e9ba1ab968e52135c13.tar.gz | |
Enable new theme picker preveiw
Also add customize button for customize themes.
Screenshot:
- Portrait: https://screenshot.googleplex.com/HWmnWEACFdW.png
- Landscape: https://screenshot.googleplex.com/1NcOQNLoLvE.png
Next: cleanup for res/
Test: Manually
Bug: 146475648
Change-Id: I7624f7404949398dee3782317f0ce0ece8194007
Diffstat (limited to 'res/layout-land')
| -rw-r--r-- | res/layout-land/fragment_theme_picker.xml | 45 |
1 files changed, 17 insertions, 28 deletions
diff --git a/res/layout-land/fragment_theme_picker.xml b/res/layout-land/fragment_theme_picker.xml index dc302325..915fb470 100644 --- a/res/layout-land/fragment_theme_picker.xml +++ b/res/layout-land/fragment_theme_picker.xml @@ -31,39 +31,28 @@ android:layout_height="match_parent" android:orientation="horizontal"> - <com.android.wallpaper.widget.PreviewPager - android:id="@+id/theme_preview_pager" + <FrameLayout android:layout_width="0dp" android:layout_height="match_parent" - android:layout_weight="1" - android:background="@color/secondary_color"/> - <View - android:layout_width="1dp" - android:layout_height="match_parent" - android:background="@color/divider_color"/> - <LinearLayout - android:id="@+id/options_section" + android:layout_weight="1"> + <FrameLayout + android:id="@+id/preview_card_container" + android:layout_width="match_parent" + android:layout_height="@dimen/preview_content_height" + android:paddingTop="@dimen/preview_content_padding_top" + android:paddingBottom="@dimen/preview_content_padding_bottom" + android:clipToPadding="false" + android:background="@color/fullscreen_preview_background"> + <include layout="@layout/theme_preview_card_v2"/> + </FrameLayout> + </FrameLayout> + + <androidx.recyclerview.widget.RecyclerView + android:id="@+id/options_container" android:layout_width="0dp" android:layout_height="match_parent" android:layout_weight="1" - android:paddingVertical="10dp" - android:orientation="vertical"> - - <androidx.recyclerview.widget.RecyclerView - android:id="@+id/options_container" - android:layout_width="match_parent" - android:layout_height="0dp" - android:layout_weight="1"/> - - <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:text="@string/apply_theme_btn"/> - </LinearLayout> + android:paddingVertical="10dp" /> </LinearLayout> <androidx.core.widget.ContentLoadingProgressBar |