Merge "Improve the home and lock tabs transition" into sc-dev
diff --git a/res/layout/grid_item_image.xml b/res/layout/grid_item_image.xml
index f111062..7a00b59 100755
--- a/res/layout/grid_item_image.xml
+++ b/res/layout/grid_item_image.xml
@@ -21,21 +21,6 @@
android:layout_height="wrap_content"
android:orientation="vertical">
- <TextView
- android:id="@+id/title"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginTop="@dimen/grid_item_individual_label_padding_top"
- android:layout_marginBottom="@dimen/grid_item_individual_label_padding_bottom"
- android:background="?android:colorSecondary"
- android:ellipsize="end"
- android:gravity="center"
- android:maxLines="1"
- android:minHeight="@dimen/grid_item_category_label_minimum_height"
- android:textAppearance="@style/OptionTitleTextAppearance"
- android:visibility="gone"
- tools:text="Wallpaper" />
-
<androidx.cardview.widget.CardView
android:id="@+id/wallpaper_container"
android:layout_width="match_parent"
@@ -89,4 +74,18 @@
</RelativeLayout>
</androidx.cardview.widget.CardView>
+
+ <TextView
+ android:id="@+id/title"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="@dimen/grid_item_individual_label_padding_top"
+ android:layout_marginBottom="@dimen/grid_item_individual_label_padding_bottom"
+ android:ellipsize="end"
+ android:gravity="center"
+ android:maxLines="1"
+ android:minHeight="@dimen/grid_item_category_label_minimum_height"
+ android:textAppearance="@style/OptionTitleTextAppearance"
+ android:visibility="gone"
+ tools:text="Wallpaper" />
</LinearLayout>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index fa8fee1..83d35c0 100755
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -34,7 +34,7 @@
<!-- Dimensions for individual wallpaper tiles. -->
<dimen name="grid_item_individual_padding_horizontal">4dp</dimen>
<dimen name="grid_item_individual_padding_bottom">8dp</dimen>
- <dimen name="grid_item_individual_label_padding_top">4dp</dimen>
+ <dimen name="grid_item_individual_label_padding_top">6dp</dimen>
<dimen name="grid_item_individual_label_padding_bottom">4dp</dimen>
<dimen name="wallpaper_grid_edge_space">20dp</dimen>
<dimen name="wallpaper_grid_padding_top">32dp</dimen>