Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
diff --git a/res/layout/theme_info_view.xml b/res/layout/theme_info_view.xml
index f228668..bae126c 100644
--- a/res/layout/theme_info_view.xml
+++ b/res/layout/theme_info_view.xml
@@ -20,9 +20,7 @@
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:orientation="vertical"
- android:paddingHorizontal="@dimen/wallpaper_info_pane_horizontal_padding"
- android:paddingTop="@dimen/wallpaper_info_pane_top_padding"
- android:paddingBottom="@dimen/wallpaper_info_pane_bottom_padding"
+ android:padding="@dimen/wallpaper_info_pane_padding"
android:theme="@style/WallpaperPicker.BottomPaneStyle">
<TextView
diff --git a/res/values/styles.xml b/res/values/styles.xml
index e18cff7..1ed2970 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -50,7 +50,7 @@
<item name="itemTextAppearanceActive">@style/BottomNavTextAppearanceActive</item>
<item name="itemTextAppearanceInactive">@style/BottomNavTextAppearance</item>
<item name="itemBackground">?android:attr/selectableItemBackgroundBorderless</item>
- <item name="android:background">@color/bottom_bar_background_color</item>
+ <item name="android:background">?android:colorBackground</item>
</style>
<style name="BottomNavTextAppearance" parent="TitleTextAppearance">