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

Commit 4bd6e6bc authored by Heemin Seog's avatar Heemin Seog
Browse files

Remove all QS related code from CarSystemUI 

QS is not used in Car System UI

Bug: 154357193
Test: mp carsysui (on hawk)
Change-Id: I27462acf821dca61a007a4e1506beb06b4ddc7e5
parent 872afaea

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_car.xml

+0 −3
Original line number Diff line number Diff line
@@ -17,9 +17,6 @@ 
 */

-->

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

packages/CarSystemUI/res/values/dimens.xml

+0 −1
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ 


    <dimen name="status_bar_icon_drawing_size_dark">36dp</dimen>

    <dimen name="status_bar_icon_drawing_size">36dp</dimen>

    <dimen name="car_qs_header_system_icons_area_height">96dp</dimen>

    <!-- The amount by which to scale up the status bar icons. -->

    <item name="status_bar_icon_scale_factor" format="float" type="dimen">1.75</item>