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

Commit ca089590 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes Ibb8c7f54,I27462acf into rvc-dev 

* changes:
  Move _car.xml resources into regulard .xml files
  Remove all QS related code from CarSystemUI
parents 01f08dce e8db3025

packages/CarSystemUI/res/layout/car_qs_footer.xml

deleted100644 → 0
+0 −83
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.

-->

<!-- extends RelativeLayout -->

<com.android.systemui.qs.car.CarQSFooter

    xmlns:android="http://schemas.android.com/apk/res/android"

    android:id="@+id/qs_footer"

    android:layout_width="match_parent"

    android:layout_height="@dimen/car_qs_footer_height"

    android:baselineAligned="false"

    android:clickable="false"

    android:clipChildren="false"

    android:clipToPadding="false"

    android:paddingBottom="@dimen/car_qs_footer_padding_bottom"

    android:paddingTop="@dimen/car_qs_footer_padding_top"

    android:paddingEnd="@dimen/car_qs_footer_padding_end"

    android:paddingStart="@dimen/car_qs_footer_padding_start"

    android:gravity="center_vertical">



    <com.android.systemui.statusbar.phone.MultiUserSwitch

        android:id="@+id/multi_user_switch"

        android:layout_alignParentStart="true"

        android:layout_centerVertical="true"

        android:layout_width="@dimen/car_qs_footer_icon_width"

        android:layout_height="@dimen/car_qs_footer_icon_height"

        android:background="?android:attr/selectableItemBackground"

        android:focusable="true">



        <ImageView

            android:id="@+id/multi_user_avatar"

            android:layout_width="match_parent"

            android:layout_height="match_parent"

            android:layout_gravity="center"

            android:scaleType="fitCenter"/>

    </com.android.systemui.statusbar.phone.MultiUserSwitch>



    <ImageView

        android:id="@+id/user_switch_expand_icon"

        android:layout_height="match_parent"

        android:layout_width="@dimen/car_qs_footer_user_switch_icon_width"

        android:layout_centerVertical="true"

        android:layout_toEndOf="@+id/multi_user_switch"

        android:layout_marginLeft="@dimen/car_qs_footer_user_switch_icon_margin"

        android:layout_marginRight="@dimen/car_qs_footer_user_switch_icon_margin"

        android:src="@drawable/car_ic_arrow_drop_up"

        android:scaleType="fitCenter">

    </ImageView>



    <TextView android:id="@+id/user_name"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:textSize="@dimen/car_qs_footer_user_name_text_size"

        android:textColor="@color/car_qs_footer_user_name_color"

        android:gravity="start|center_vertical"

        android:layout_centerVertical="true"

        android:layout_toEndOf="@id/user_switch_expand_icon" />



    <com.android.systemui.statusbar.phone.SettingsButton

        android:id="@+id/settings_button"

        android:layout_alignParentEnd="true"

        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:contentDescription="@string/accessibility_quick_settings_settings"

        android:scaleType="centerCrop"

        android:src="@drawable/ic_settings_16dp"

        android:tint="?android:attr/colorForeground"

        style="@android:style/Widget.Material.Button.Borderless" />



</com.android.systemui.qs.car.CarQSFooter>

packages/CarSystemUI/res/layout/car_qs_panel.xml

deleted100644 → 0
+0 −43
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.

-->

<LinearLayout

    xmlns:android="http://schemas.android.com/apk/res/android"

    android:id="@+id/quick_settings_container"

    android:clipChildren="false"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:background="@color/car_qs_background_primary"

    android:orientation="vertical"

    android:elevation="4dp">



    <include layout="@layout/car_status_bar_header"/>

    <include layout="@layout/car_qs_footer"/>



    <RelativeLayout

        xmlns:android="http://schemas.android.com/apk/res/android"

        android:id="@+id/user_switcher_container"

        android:clipChildren="false"

        android:layout_width="match_parent"

        android:layout_height="@dimen/car_user_switcher_container_height">



        <com.android.systemui.car.userswitcher.UserGridRecyclerView

            android:id="@+id/user_grid"

            android:layout_width="match_parent"

            android:layout_height="match_parent"/>



    </RelativeLayout>



</LinearLayout>

packages/CarSystemUI/res/layout/car_status_bar_header.xml

+2 −2
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
  ~ limitations under the License

  -->

<!-- Extends LinearLayout -->

<com.android.systemui.qs.car.CarStatusBarHeader

<com.android.systemui.car.userswitcher.CarStatusBarHeader

    xmlns:android="http://schemas.android.com/apk/res/android"

    android:id="@+id/header"

    android:layout_width="match_parent"
@@ -27,4 +27,4 @@ 
        android:layout_height="match_parent"

        android:layout_weight="1"

    />

</com.android.systemui.qs.car.CarStatusBarHeader>
 
</com.android.systemui.car.userswitcher.CarStatusBarHeader>

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 −28
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>

    <color name="car_qs_background_primary">#263238</color> <!-- Blue Gray 900 -->

    <color name="car_qs_footer_user_name_color">@*android:color/car_grey_50</color>



    <!-- 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>