summaryrefslogtreecommitdiff
path: root/res
diff options
context:
space:
mode:
authorAnthony Chen <ajchen@google.com>2017-11-14 16:27:36 -0800
committerAnthony Chen <ajchen@google.com>2017-11-16 10:47:39 -0800
commit2ce13cdb2b3bcffb3cae5aadd222dbdc25044cc1 (patch)
tree2a914d96e8135fbe2dc5e0873efe38cfad8d6e6b /res
parentcb44941bdd7bb8510485a1ee874242322a1e940d (diff)
downloadMedia-2ce13cdb2b3bcffb3cae5aadd222dbdc25044cc1.tar.gz
Migrate over to support library dimensions.
Test: build media and deploy to mojave Bug: 69271624 Change-Id: Ib047a302135d7515c6035b29dbf5aa56cccd64f9
Diffstat (limited to 'res')
-rw-r--r--res/layout/initial_no_content.xml7
-rw-r--r--res/layout/media_controls.xml4
-rw-r--r--res/layout/now_playing_screen.xml2
-rw-r--r--res/values/styles.xml5
4 files changed, 10 insertions, 8 deletions
diff --git a/res/layout/initial_no_content.xml b/res/layout/initial_no_content.xml
index 0e1d205..bc7a199 100644
--- a/res/layout/initial_no_content.xml
+++ b/res/layout/initial_no_content.xml
@@ -14,12 +14,11 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<com.android.car.view.MaxWidthLayout
+<FrameLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
- app:carMaxWidth="@dimen/apps_max_content_width"
android:animateLayoutChanges="true" >
<RelativeLayout
@@ -31,7 +30,7 @@
<ProgressBar
android:id="@+id/loading_spinner"
android:layout_width="match_parent"
- android:layout_height="@dimen/car_list_item_height"
+ android:layout_height="@dimen/car_double_line_list_item_height"
android:layout_centerInParent="true"
android:layout_alignWithParentIfMissing="true"
android:indeterminateDrawable="@drawable/music_buffering"
@@ -57,4 +56,4 @@
android:text="@string/nothing_to_play"
android:visibility="gone" />
</RelativeLayout>
-</com.android.car.view.MaxWidthLayout>
+</FrameLayout>
diff --git a/res/layout/media_controls.xml b/res/layout/media_controls.xml
index 75ccdd5..93bc828 100644
--- a/res/layout/media_controls.xml
+++ b/res/layout/media_controls.xml
@@ -18,11 +18,11 @@ limitations under the License.
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/music_panel"
android:layout_width="match_parent"
- android:layout_height="@dimen/action_panel_height"
+ android:layout_height="@dimen/car_action_bar_height"
android:elevation="@dimen/music_panel_elevation"
android:layout_gravity="bottom"
android:visibility="gone"
- app:cardCornerRadius="@dimen/car_card_view_corner_radius" >
+ app:cardCornerRadius="@dimen/car_radius_1" >
<LinearLayout
android:id="@+id/controls"
android:layout_width="match_parent"
diff --git a/res/layout/now_playing_screen.xml b/res/layout/now_playing_screen.xml
index 9fbe55e..6c79fd7 100644
--- a/res/layout/now_playing_screen.xml
+++ b/res/layout/now_playing_screen.xml
@@ -39,7 +39,7 @@
android:background="@color/album_art_color_overlay" />
<LinearLayout
- android:layout_marginTop="@dimen/lens_header_height"
+ android:layout_marginTop="@dimen/car_app_bar_height"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical" >
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 5d3b838..5e58749 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -15,7 +15,6 @@
limitations under the License.
-->
<resources xmlns:android="http://schemas.android.com/apk/res/android">
-
<style name="AppTheme" parent="android:Theme.Material.Light.NoActionBar">
<item name="android:colorControlHighlight">@color/car_card_ripple_background_light</item>
<item name="android:windowBackground">@null</item>
@@ -26,4 +25,8 @@
<item name="android:textSize">@dimen/car_body2_size</item>
<item name="android:textColor">@color/no_content_text_color</item>
</style>
+
+ <style name="CarHeadline1.Light" >
+ <item name="android:textColor">@color/car_headline1_light</item>
+ </style>
</resources>