Adjust live/static full preview layout
- Fix tabs font issue
- Refine the layout and add some padding to preview'a bottom to make
its shadow not be cut
screenshot:
https://screenshot.googleplex.com/WH6amCFejzi.png
https://screenshot.googleplex.com/uCF4hJqfv5C.png
Bug: https://docs.google.com/spreadsheets/d/1d45mTL5IXczBbnNe0r_KFAS07OYBmlrhCBSsAIeKMD0/edit#gid=647711404&range=G29
Test: manually
Change-Id: I19e61603b22533fd237cfa33f191c5e1c6ef55ff
diff --git a/res/layout/fragment_image_preview_v2.xml b/res/layout/fragment_image_preview_v2.xml
index e8a4ad9..160e0bc 100644
--- a/res/layout/fragment_image_preview_v2.xml
+++ b/res/layout/fragment_image_preview_v2.xml
@@ -77,6 +77,8 @@
android:id="@+id/touch_forwarding_layout"
android:layout_width="0dp"
android:layout_height="wrap_content"
+ android:paddingBottom="@dimen/full_preview_page_editing_padding_bottom"
+ android:clipToPadding="false"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent"
diff --git a/res/layout/fragment_live_preview_v2.xml b/res/layout/fragment_live_preview_v2.xml
index 06cab00..80d1d83 100644
--- a/res/layout/fragment_live_preview_v2.xml
+++ b/res/layout/fragment_live_preview_v2.xml
@@ -31,8 +31,7 @@
<LinearLayout
android:layout_width="match_parent"
- android:layout_height="0dp"
- android:layout_weight="1"
+ android:layout_height="wrap_content"
android:orientation="vertical">
<FrameLayout
@@ -41,55 +40,53 @@
android:layout_height="0dp"
android:layout_weight="1"
android:background="@color/fullscreen_preview_background"
- android:paddingTop="@dimen/full_preview_page_default_padding_top"
- android:paddingBottom="@dimen/full_preview_page_editing_padding_bottom">
+ android:paddingTop="@dimen/full_preview_page_default_padding_top">
<com.android.wallpaper.picker.TouchForwardingLayout
android:id="@+id/touch_forwarding_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
+ android:paddingBottom="@dimen/full_preview_page_editing_padding_bottom"
android:clipToPadding="false">
<include
android:id="@+id/wallpaper_full_preview_card"
layout="@layout/wallpaper_preview_card"
android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:clipToPadding="false" />
+ android:layout_height="match_parent" />
</com.android.wallpaper.picker.TouchForwardingLayout>
</FrameLayout>
<LinearLayout
android:id="@+id/tabs_container"
android:layout_width="match_parent"
- android:layout_height="wrap_content"
+ android:layout_height="@dimen/full_preview_page_tab_height"
android:background="@color/fullscreen_preview_background"
android:orientation="horizontal">
<TextView
android:id="@+id/home"
android:layout_width="0dp"
- android:layout_height="@dimen/full_preview_page_tab_height"
+ android:layout_height="match_parent"
android:layout_weight="1"
android:background="?android:attr/selectableItemBackgroundBorderless"
android:gravity="center"
android:paddingTop="@dimen/full_preview_page_tab_padding_top"
android:paddingBottom="@dimen/full_preview_page_tab_padding_bottom"
android:text="@string/home_screen_message"
- android:textAppearance="@style/SubtitleTextAppearance" />
+ android:textColor="@color/bottom_action_button_color_tint"/>
<TextView
android:id="@+id/lock"
android:layout_width="0dp"
- android:layout_height="@dimen/full_preview_page_tab_height"
+ android:layout_height="match_parent"
android:layout_weight="1"
android:background="?android:attr/selectableItemBackgroundBorderless"
android:gravity="center"
android:paddingTop="@dimen/full_preview_page_tab_padding_top"
android:paddingBottom="@dimen/full_preview_page_tab_padding_bottom"
android:text="@string/lock_screen_message"
- android:textAppearance="@style/SubtitleTextAppearance" />
+ android:textColor="@color/bottom_action_button_color_tint"/>
</LinearLayout>
-
</LinearLayout>
<FrameLayout
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 2b89c2a..23c836c 100755
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -208,7 +208,7 @@
<!-- Dimensions for full preview page -->
<dimen name="full_preview_page_default_padding_top">24dp</dimen>
<dimen name="full_preview_page_default_padding_bottom">32dp</dimen>
- <dimen name="full_preview_page_editing_padding_bottom">0dp</dimen>
+ <dimen name="full_preview_page_editing_padding_bottom">4dp</dimen>
<dimen name="full_preview_page_tab_height">64dp</dimen>
<dimen name="full_preview_page_tab_padding_top">20dp</dimen>
<dimen name="full_preview_page_tab_padding_bottom">20dp</dimen>
diff --git a/src/com/android/wallpaper/picker/LivePreviewFragment.java b/src/com/android/wallpaper/picker/LivePreviewFragment.java
index 488ed2e..2cae55c 100644
--- a/src/com/android/wallpaper/picker/LivePreviewFragment.java
+++ b/src/com/android/wallpaper/picker/LivePreviewFragment.java
@@ -197,13 +197,7 @@
mLockScreenOverlayUpdater.adjustOverlayLayout(/* isFullScreen= */ true);
mTab = view.findViewById(R.id.tabs_container);
mHomeTextView = mTab.findViewById(R.id.home);
- mHomeTextView.setTextColor(
- getResources().getColorStateList(R.color.bottom_action_button_color_tint,
- getContext().getTheme()));
mLockTextView = mTab.findViewById(R.id.lock);
- mLockTextView.setTextColor(
- getResources().getColorStateList(R.color.bottom_action_button_color_tint,
- getContext().getTheme()));
mWorkspaceSurface = mHomePreviewCard.findViewById(R.id.workspace_surface);
mWorkspaceSurfaceCallback = new WorkspaceSurfaceHolderCallback(
mWorkspaceSurface, getContext());
