Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move _car.xml resources into regulard .xml files

Browse Source 
Resolve some duplicates and make user switcher background black.
Also clean up a few more QS resources

Bug: 154357193
Test: manual
Change-Id: Ibb8c7f54b59dd564a47955d3ff0c1e7e00ba697c
This commit is contained in:
Heemin Seog
2020-04-18 13:06:58 -07:00
parent 4bd6e6bc62
commit e8db3025f8
9 changed files with 43 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
packages/CarSystemUI/res/values/colors.xml
View File

@@ -20,6 +20,7 @@
<color name="car_user_switcher_background_color">#000000</color>
<color name="car_user_switcher_name_text_color">@*android:color/car_body1_light</color>
<color name="car_user_switcher_add_user_background_color">#131313</color>
<color name="car_user_switcher_add_user_add_sign_color">@*android:color/car_body1_light</color>
<color name="car_nav_icon_fill_color">#8Fffffff</color>
<color name="car_nav_icon_fill_color_selected">#ffffff</color>
<!-- colors for seekbar -->

25
packages/CarSystemUI/res/values/colors_car.xml
View File

@@ -1,25 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
/*
* Copyright 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>
<!-- colors for user switcher -->
<color name="car_user_switcher_background_color">@*android:color/car_card_dark</color>
<color name="car_user_switcher_name_text_color">@*android:color/car_body1_light</color>
<color name="car_user_switcher_add_user_background_color">@*android:color/car_dark_blue_grey_600</color>
<color name="car_user_switcher_add_user_add_sign_color">@*android:color/car_body1_light</color>
</resources>

25
packages/CarSystemUI/res/values/dimens.xml
View File

@@ -27,10 +27,6 @@
<dimen name="car_primary_icon_size">@*android:dimen/car_primary_icon_size</dimen>
<!-- dimensions for the car user switcher -->
<dimen name="car_user_switcher_name_text_size">@dimen/car_body1_size</dimen>
<dimen name="car_user_switcher_vertical_spacing_between_users">124dp</dimen>
<!--These values represent MIN and MAX for hvac-->
<item name="hvac_min_value" format="float" type="dimen">0</item>
<item name="hvac_max_value" format="float" type="dimen">126</item>
@@ -89,9 +85,6 @@
<!-- The width of panel holding the notification card. -->
<dimen name="notification_panel_width">522dp</dimen>
<!-- The width of the quick settings panel. -1 for match_parent. -->
<dimen name="qs_panel_width">-1px</dimen>
<!-- Height of a small notification in the status bar-->
<dimen name="notification_min_height">192dp</dimen>
@@ -148,7 +141,19 @@
child closer so there is less wasted space. -->
<dimen name="notification_children_container_margin_top">68dp</dimen>
<!-- The height of the quick settings footer that holds the user switcher, settings icon,
etc. in the car setting.-->
<dimen name="qs_footer_height">74dp</dimen>
<!-- dimensions for the car user switcher -->
<dimen name="car_user_switcher_name_text_size">@*android:dimen/car_body1_size</dimen>
<dimen name="car_user_switcher_image_avatar_size">@*android:dimen/car_large_avatar_size</dimen>
<dimen name="car_user_switcher_vertical_spacing_between_users">@*android:dimen/car_padding_5</dimen>
<dimen name="car_user_switcher_vertical_spacing_between_name_and_avatar">@*android:dimen/car_padding_4</dimen>
<dimen name="car_user_switcher_margin_top">@*android:dimen/car_padding_4</dimen>
<dimen name="car_navigation_button_width">64dp</dimen>
<dimen name="car_navigation_bar_width">760dp</dimen>
<dimen name="car_left_navigation_bar_width">96dp</dimen>
<dimen name="car_right_navigation_bar_width">96dp</dimen>
<dimen name="car_user_switcher_container_height">420dp</dimen>
<!-- This must be the negative of car_user_switcher_container_height for the animation. -->
<dimen name="car_user_switcher_container_anim_height">-420dp</dimen>
</resources>

34
packages/CarSystemUI/res/values/dimens_car.xml
View File

@@ -1,34 +0,0 @@
<?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>
<!-- dimensions for the car user switcher -->
<dimen name="car_user_switcher_name_text_size">@*android:dimen/car_body1_size</dimen>
<dimen name="car_user_switcher_image_avatar_size">@*android:dimen/car_large_avatar_size</dimen>
<dimen name="car_user_switcher_vertical_spacing_between_users">@*android:dimen/car_padding_5</dimen>
<dimen name="car_user_switcher_vertical_spacing_between_name_and_avatar">@*android:dimen/car_padding_4</dimen>
<dimen name="car_user_switcher_margin_top">@*android:dimen/car_padding_4</dimen>
<dimen name="car_navigation_button_width">64dp</dimen>
<dimen name="car_navigation_bar_width">760dp</dimen>
<dimen name="car_left_navigation_bar_width">96dp</dimen>
<dimen name="car_right_navigation_bar_width">96dp</dimen>
<dimen name="car_user_switcher_container_height">420dp</dimen>
<!-- This must be the negative of car_user_switcher_container_height for the animation. -->
<dimen name="car_user_switcher_container_anim_height">-420dp</dimen>
</resources>

0
packages/CarSystemUI/res/values/ids_car.xml → packages/CarSystemUI/res/values/ids.xml
View File

16
packages/CarSystemUI/res/values/integers.xml
View File

@@ -16,5 +16,19 @@
-->
<resources>
<integer name="user_fullscreen_switcher_num_col">2</integer>
<!-- Full screen user switcher column number -->
<integer name="user_fullscreen_switcher_num_col">3</integer>
<!--Percentage of the screen height, from the bottom, that a notification panel being
partially closed at will result in it remaining open if released-->
<integer name="notification_settle_open_percentage">20</integer>
<!--Percentage of the screen height, from the bottom, that a notification panel being peeked
at will result in remaining closed the panel if released-->
<integer name="notification_settle_close_percentage">80</integer>
<!-- Timeout values in milliseconds for displaying volume dialog-->
<integer name="car_volume_dialog_display_normal_timeout">3000</integer>
<integer name="car_volume_dialog_display_hovering_timeout">16000</integer>
<integer name="car_volume_dialog_display_expanded_normal_timeout">6000</integer>
<integer name="car_volume_dialog_display_expanded_hovering_timeout">32000</integer>
</resources>

34
packages/CarSystemUI/res/values/integers_car.xml
View File

@@ -1,34 +0,0 @@
<?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 xmlns:android="http://schemas.android.com/apk/res/android">
<!-- Full screen user switcher column number TODO: move to support library-->
<integer name="user_fullscreen_switcher_num_col">3</integer>
<!--Percentage of the screen height, from the bottom, that a notification panel being
partially closed at will result in it remaining open if released-->
<integer name="notification_settle_open_percentage">20</integer>
<!--Percentage of the screen height, from the bottom, that a notification panel being peeked
at will result in remaining closed the panel if released-->
<integer name="notification_settle_close_percentage">80</integer>
<!-- Timeout values in milliseconds for displaying volume dialog-->
<integer name="car_volume_dialog_display_normal_timeout">3000</integer>
<integer name="car_volume_dialog_display_hovering_timeout">16000</integer>
<integer name="car_volume_dialog_display_expanded_normal_timeout">6000</integer>
<integer name="car_volume_dialog_display_expanded_hovering_timeout">32000</integer>
</resources>

12
packages/CarSystemUI/res/values/strings.xml
View File

@@ -22,4 +22,16 @@
<string name="hvac_max_text">Max</string>
<!-- Text for voice recognition toast. [CHAR LIMIT=60] -->
<string name="voice_recognition_toast">Voice recognition now handled by connected Bluetooth device</string>
<!-- Name of Guest Profile. [CHAR LIMIT=30] -->
<string name="car_guest">Guest</string>
<!-- Title for button that starts a guest session. [CHAR LIMIT=30] -->
<string name="start_guest_session">Guest</string>
<!-- Title for button that adds a new user. [CHAR LIMIT=30] -->
<string name="car_add_user">Add User</string>
<!-- Default name of the new user created. [CHAR LIMIT=30] -->
<string name="car_new_user">New User</string>
<!-- Message to inform user that creation of new user requires that user to set up their space. [CHAR LIMIT=100] -->
<string name="user_add_user_message_setup">When you add a new user, that person needs to set up their space.</string>
<!-- Message to inform user that the newly created user will have permissions to update apps for all other users. [CHAR LIMIT=100] -->
<string name="user_add_user_message_update">Any user can update apps for all other users.</string>
</resources>

32
packages/CarSystemUI/res/values/strings_car.xml
View File

@@ -1,32 +0,0 @@
<?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>
<!-- Name of Guest Profile. [CHAR LIMIT=30] -->
<string name="car_guest">Guest</string>
<!-- Title for button that starts a guest session. [CHAR LIMIT=30] -->
<string name="start_guest_session">Guest</string>
<!-- Title for button that adds a new user. [CHAR LIMIT=30] -->
<string name="car_add_user">Add User</string>
<!-- Default name of the new user created. [CHAR LIMIT=30] -->
<string name="car_new_user">New User</string>
<!-- Message to inform user that creation of new user requires that user to set up their space. [CHAR LIMIT=100] -->
<string name="user_add_user_message_setup">When you add a new user, that person needs to set up their space.</string>
<!-- Message to inform user that the newly created user will have permissions to update apps for all other users. [CHAR LIMIT=100] -->
<string name="user_add_user_message_update">Any user can update apps for all other users.</string>
</resources>