Merge "Moving over volume dialog parts to the DeviceDefault Theme."

This commit is contained in:
TreeHugger Robot
2018-11-27 03:11:46 +00:00
committed by Android (Google) Code Review
4 changed files with 12 additions and 10 deletions

View File

@@ -45,6 +45,7 @@ android_app {
"androidx.slice_slice-builders",
"androidx.arch.core_core-runtime",
"androidx.lifecycle_lifecycle-extensions",
"car-theme-lib-bp",
"SystemUI-tags",
"SystemUI-proto",
],

View File

@@ -20,11 +20,9 @@
android:id="@+id/volume_list"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@android:color/black"
android:minWidth="@dimen/volume_dialog_panel_width"
android:theme="@style/Theme.Car.DialogListView"
app:dividerEndMargin="@dimen/car_keyline_1"
app:dividerStartMargin="@dimen/car_keyline_1"
android:theme="@style/PagedListViewTheme"
app:gutter="none"
app:scrollBarEnabled="false"
app:listDividerColor="@color/list_divider_color"
app:showPagedListViewDivider="true"/>

View File

@@ -51,4 +51,6 @@
<color name="car_grey_900">#ff212121</color>
<color name="keyguard_button_text_color">@android:color/black</color>
<color name="list_divider_color">@*android:color/car_list_divider_light</color>
</resources>

View File

@@ -41,15 +41,16 @@
<item name="android:colorControlHighlight">@color/nav_bar_ripple_background_color</item>
</style>
<style name="Theme.Car.DialogListView" parent="@style/Theme.Car.NoActionBar">
<item name="android:colorControlActivated">@color/car_accent</item>
<item name="listItemBackgroundColor">@android:color/black</item>
</style>
<style name="NavigationBarButton">
<item name="android:layout_height">96dp</item>
<item name="android:layout_width">96dp</item>
<item name="android:background">@drawable/nav_button_background</item>
</style>
</resources>
<style name="PagedListViewTheme" parent="@style/Theme.CarSupportWrapper.NoActionBar">
<item name="android:background">@*android:color/car_background</item>
<item name="listItemBackgroundColor">@*android:color/car_background</item>
<item name="dividerEndMargin">@dimen/car_keyline_1</item>
<item name="dividerStartMargin">@dimen/car_keyline_1</item>
</style>
</resources>