Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e8db3025 authored by Heemin Seog's avatar Heemin Seog
Browse files

Move _car.xml resources into regulard .xml files 

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

Bug: 154357193
Test: manual
Change-Id: Ibb8c7f54b59dd564a47955d3ff0c1e7e00ba697c
parent 4bd6e6bc

packages/CarSystemUI/res/values/colors.xml

+1 −0
Original line number Diff line number Diff line
@@ -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 -->

packages/CarSystemUI/res/values/colors_car.xml

deleted100644 → 0
+0 −25
Original line number Diff line number Diff line 
<?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>

packages/CarSystemUI/res/values/dimens.xml

+15 −10
Original line number Diff line number Diff line
@@ -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>

packages/CarSystemUI/res/values/dimens_car.xml

deleted100644 → 0
+0 −34
Original line number Diff line number Diff line 
<?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>