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

Commit 0d5e018a authored by Heemin Seog's avatar Heemin Seog
Browse files

Theme fixit for Car Sys UI 

Notifications to use recyclerview in CarSysUI
SysUI UserSwitcher changes for PLV -> RecyclerView
Car SysUI Volume PLV -> RecyclerView

Bug: 128545260
Test: manual
Change-Id: Ic618b85d6836cfc9e4bb9b40c9ba3c0e0a96af76
parent 5b07ac09

packages/CarSystemUI/Android.bp

+0 −2
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ android_app { 
        "SystemUISharedLib",

        "SettingsLib",

        "android.car.userlib",

        "androidx.car_car",

        "androidx.legacy_legacy-support-v4",

        "androidx.recyclerview_recyclerview",

        "androidx.preference_preference",
@@ -46,7 +45,6 @@ android_app { 
        "androidx.slice_slice-builders",

        "androidx.arch.core_core-runtime",

        "androidx.lifecycle_lifecycle-extensions",

        "car-theme-lib-bp",

        "SystemUI-tags",

        "SystemUI-proto",

    ],

packages/CarSystemUI/res/layout/car_fullscreen_user_switcher.xml

+19 −18
Original line number Diff line number Diff line
@@ -14,11 +14,11 @@ 
     See the License for the specific language governing permissions and

     limitations under the License.

-->

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

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

        android:fitsSystemWindows="true"

<FrameLayout

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

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:fitsSystemWindows="true"

    android:visibility="gone">



    <LinearLayout
@@ -27,20 +27,21 @@ 
        android:layout_height="match_parent"

        android:orientation="vertical">



        <include layout="@layout/car_status_bar_header"

            android:theme="@android:style/Theme"

            android:layout_alignParentTop="true"/>

        <include

            layout="@layout/car_status_bar_header"

            android:layout_alignParentTop="true"

            android:theme="@android:style/Theme"/>



        <FrameLayout

            android:layout_width="match_parent"

            android:layout_height="match_parent">

            <com.android.systemui.statusbar.car.UserGridRecyclerView

                android:id="@+id/user_grid"

                android:layout_width="match_parent"

            android:layout_height="match_parent"

            android:layout_marginTop="@dimen/car_user_switcher_margin_top"

            android:theme="@style/PagedListTheme"

            app:verticallyCenterListContent="true"

            app:showPagedListViewDivider="false"

            app:gutter="both"

            app:itemSpacing="@dimen/car_user_switcher_vertical_spacing_between_users"/>

                android:layout_height="wrap_content"

                android:layout_gravity="center_vertical"

                android:layout_marginTop="@dimen/car_user_switcher_margin_top"/>

        </FrameLayout>



    </LinearLayout>

</FrameLayout>

packages/CarSystemUI/res/layout/car_qs_panel.xml

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


    <RelativeLayout

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

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

        android:id="@+id/user_switcher_container"

        android:clipChildren="false"

        android:layout_width="match_parent"
@@ -37,11 +36,7 @@ 
        <com.android.systemui.statusbar.car.UserGridRecyclerView

            android:id="@+id/user_grid"

            android:layout_width="match_parent"

            android:layout_height="match_parent"

            android:theme="@style/PagedListTheme"

            app:showPagedListViewDivider="false"

            app:gutter="both"

            app:itemSpacing="@dimen/car_user_switcher_vertical_spacing_between_users"/>

            android:layout_height="match_parent"/>



    </RelativeLayout>

packages/CarSystemUI/res/layout/car_volume_dialog.xml

+2 −8
Original line number Diff line number Diff line
@@ -14,15 +14,9 @@ 
  ~ See the License for the specific language governing permissions and

  ~ limitations under the License

  -->

<androidx.car.widget.PagedListView

<androidx.recyclerview.widget.RecyclerView

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

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

    android:id="@+id/volume_list"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:minWidth="@dimen/volume_dialog_panel_width"

    android:theme="@style/PagedListViewTheme"

    app:gutter="none"

    app:scrollBarEnabled="false"

    app:listDividerColor="@color/list_divider_color"

    app:showPagedListViewDivider="true"/>
 
    android:minWidth="@dimen/volume_dialog_panel_width"/>

packages/CarSystemUI/res/layout/car_volume_item.xml

0 → 100644
+71 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

    Copyright (C) 2019 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.

-->



<RelativeLayout

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

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:minHeight="@dimen/car_volume_item_height">



    <!-- Primary Action. -->

    <ImageView

        android:id="@+id/primary_icon"

        android:layout_width="@dimen/car_primary_icon_size"

        android:layout_centerVertical="true"

        android:layout_marginStart="@dimen/car_volume_item_margin_horizontal"

        android:layout_alignParentStart="true"

        android:layout_height="@dimen/car_primary_icon_size"/>



    <!-- Note: the horizontal padding and offset are set to 0 so that the track and thumb

             aligns with the proper keylines. -->

    <SeekBar

        android:id="@+id/seek_bar"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_marginBottom="@dimen/car_volume_item_seekbar_margin_vertical"

        android:layout_marginTop="@dimen/car_volume_item_seekbar_margin_vertical"

        android:min="0"

        android:paddingBottom="@dimen/car_volume_item_seekbar_padding_vertical"

        android:layout_centerVertical="true"

        android:paddingEnd="0dp"

        android:paddingStart="0dp"

        android:paddingTop="@dimen/car_volume_item_seekbar_padding_vertical"

        android:splitTrack="false"

        android:layout_toStartOf="@id/supplemental_icon_divider"

        android:layout_marginStart="@dimen/car_volume_item_seekbar_margin_start"

        android:layout_marginEnd="@dimen/car_volume_item_seekbar_margin_end"

        android:thumbOffset="0dp"/>



    <!-- Supplemental action. -->

    <View

        android:id="@+id/supplemental_icon_divider"

        android:layout_width="@dimen/car_volume_item_divider_width"

        android:layout_height="@dimen/car_volume_item_divider_height"

        android:layout_marginEnd="@dimen/car_volume_item_divider_margin_end"

        android:layout_centerVertical="true"

        android:layout_toStartOf="@id/supplemental_icon"

        android:background="@color/car_volume_item_divider_color"/>

    <ImageView

        android:id="@+id/supplemental_icon"

        android:layout_width="@dimen/car_primary_icon_size"

        android:layout_height="@dimen/car_primary_icon_size"

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

        android:layout_centerVertical="true"

        android:layout_alignParentEnd="true"

        android:layout_marginEnd="@dimen/car_volume_item_margin_horizontal"

        android:scaleType="fitCenter"/>

</RelativeLayout>