Clean up some CarSystemUI theme elements
Also fixed the left and right nav notifications id in case someone one demos them later Test: Manual Bug: 119311195 Change-Id: I9a6c31d25a8eb6f6e895180c4946c14629bd668e (cherry picked from commit 5a4a0f4bfa2ae6aabf9c86da1d59c4d72b2baecd)
This commit is contained in:
@@ -25,13 +25,15 @@
|
||||
android:orientation="vertical"
|
||||
android:gravity="center">
|
||||
|
||||
<ImageView android:id="@+id/user_avatar"
|
||||
<ImageView
|
||||
android:id="@+id/user_avatar"
|
||||
android:layout_width="@dimen/car_user_switcher_image_avatar_size"
|
||||
android:layout_height="@dimen/car_user_switcher_image_avatar_size"
|
||||
android:background="@drawable/car_button_ripple_background_light"
|
||||
android:background="?android:attr/selectableItemBackground"
|
||||
android:gravity="center"/>
|
||||
|
||||
<TextView android:id="@+id/user_name"
|
||||
<TextView
|
||||
android:id="@+id/user_name"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="@dimen/car_user_switcher_vertical_spacing_between_name_and_avatar"
|
||||
|
||||
@@ -19,12 +19,10 @@
|
||||
android:fitsSystemWindows="true"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:background="@color/car_user_switcher_background_color"
|
||||
android:visibility="gone">
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/container"
|
||||
android:background="@color/car_user_switcher_background_color"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:orientation="vertical">
|
||||
@@ -38,7 +36,7 @@
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_marginTop="@dimen/car_user_switcher_margin_top"
|
||||
android:theme="@style/Theme.Car.Light.List"
|
||||
android:theme="@style/PagedListTheme"
|
||||
app:verticallyCenterListContent="true"
|
||||
app:showPagedListViewDivider="false"
|
||||
app:gutter="both"
|
||||
|
||||
@@ -68,7 +68,7 @@
|
||||
android:orientation="vertical">
|
||||
|
||||
<com.android.keyguard.AlphaOptimizedImageButton
|
||||
android:id="@+id/notifications"
|
||||
android:id="@+id/note"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_width="match_parent"
|
||||
android:src="@drawable/car_ic_notification"
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
xmlns:systemui="http://schemas.android.com/apk/res-auto"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:background="@android:color/black"
|
||||
android:background="@drawable/system_bar_background"
|
||||
android:orientation="vertical">
|
||||
<LinearLayout
|
||||
android:id="@id/nav_buttons"
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
xmlns:systemui="http://schemas.android.com/apk/res-auto"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:background="@android:color/black"
|
||||
android:background="@drawable/system_bar_background"
|
||||
android:orientation="vertical">
|
||||
|
||||
<LinearLayout
|
||||
|
||||
@@ -35,7 +35,7 @@
|
||||
android:layout_centerVertical="true"
|
||||
android:layout_width="@dimen/car_qs_footer_icon_width"
|
||||
android:layout_height="@dimen/car_qs_footer_icon_height"
|
||||
android:background="@drawable/ripple_drawable"
|
||||
android:background="?android:attr/selectableItemBackground"
|
||||
android:focusable="true">
|
||||
|
||||
<ImageView
|
||||
|
||||
@@ -21,8 +21,7 @@
|
||||
android:layout_height="wrap_content"
|
||||
android:background="@color/car_qs_background_primary"
|
||||
android:orientation="vertical"
|
||||
android:elevation="4dp"
|
||||
android:theme="@android:style/Theme">
|
||||
android:elevation="4dp">
|
||||
|
||||
<include layout="@layout/car_status_bar_header"/>
|
||||
<include layout="@layout/car_qs_footer"/>
|
||||
@@ -39,7 +38,7 @@
|
||||
android:id="@+id/user_grid"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:theme="@style/Theme.Car.Light.List"
|
||||
android:theme="@style/PagedListTheme"
|
||||
app:showPagedListViewDivider="false"
|
||||
app:gutter="both"
|
||||
app:itemSpacing="@dimen/car_user_switcher_vertical_spacing_between_users"/>
|
||||
|
||||
@@ -68,7 +68,7 @@
|
||||
android:orientation="vertical">
|
||||
|
||||
<com.android.keyguard.AlphaOptimizedImageButton
|
||||
android:id="@+id/notifications"
|
||||
android:id="@+id/note"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_width="match_parent"
|
||||
android:src="@drawable/car_ic_notification"
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
android:id="@+id/car_top_bar"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:background="@android:color/black"
|
||||
android:background="@drawable/system_bar_background"
|
||||
android:orientation="vertical">
|
||||
|
||||
<RelativeLayout
|
||||
|
||||
24
packages/CarSystemUI/res/values/themes.xml
Normal file
24
packages/CarSystemUI/res/values/themes.xml
Normal file
@@ -0,0 +1,24 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!--
|
||||
/**
|
||||
* Copyright (c) 2018, The Android Open Source Project
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
-->
|
||||
|
||||
<resources>
|
||||
<!--This Theme contains attributes required for components from the car support lib -->
|
||||
<style name="PagedListTheme" parent="Theme.CarSupportWrapper.NoActionBar">
|
||||
</style>
|
||||
</resources>
|
||||
Reference in New Issue
Block a user