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

Commit 71d12071 authored by Aarthi Balachander's avatar Aarthi Balachander Committed by android-build-merger
Browse files

Merge "Refactored the UserRecyclerGridView to use PagedListView from the car... 

Merge "Refactored the UserRecyclerGridView to use PagedListView from the car support library.  This also surfaced a scrollbar. Additionally, added a touch ripple when you touch a user's picture and disabled the user buttons once a profile is selected" into pi-dev
am: 575fc02e

Change-Id: I8535d5a91c0539553850c92a407a745a4c7f706b
parents 184d9409 575fc02e

packages/SystemUI/res/drawable/car_progress_bar.xml

deleted100644 → 0
+0 −30
Original line number Diff line number Diff line 
<!--

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

-->

<layer-list xmlns:android="http://schemas.android.com/apk/res/android">

    <item android:id="@android:id/background">

        <shape>

            <solid android:color="@color/car_user_switcher_progress_bgcolor" />

        </shape>

    </item>



    <item android:id="@android:id/progress">

        <clip>

            <shape>

                <solid android:color="@color/car_user_switcher_progress_fgcolor" />

            </shape>

        </clip>

    </item>

</layer-list>

packages/SystemUI/res/drawable/car_round_button.xml

deleted100644 → 0
+0 −21
Original line number Diff line number Diff line 
<!--

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

-->

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

    android:shape="rectangle">



    <solid android:color="@color/car_start_driving_background" />

    <corners android:radius="@dimen/car_start_driving_corner_radius" />

</shape>

packages/SystemUI/res/layout/car_fullscreen_user_pod.xml

+2 −3
Original line number Diff line number Diff line
@@ -22,14 +22,13 @@ 
    android:alpha="0"

    android:layout_height="wrap_content"

    android:layout_width="match_parent"

    android:gravity="fill_horizontal"

    android:layout_marginTop="@dimen/car_padding_5"

    android:layout_marginStart="@dimen/car_padding_4">

    android:gravity="fill_horizontal">



    <ImageView android:id="@+id/user_avatar"

        android:layout_centerHorizontal="true"

        android:layout_width="@dimen/car_fullscreen_user_pod_image_avatar_width"

        android:layout_height="@dimen/car_fullscreen_user_pod_image_avatar_height"

        android:background="@drawable/car_button_ripple_background_inverse"

        />



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

packages/SystemUI/res/layout/car_fullscreen_user_switcher.xml

+13 −27
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
     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"

        android:layout_width="match_parent"

        android:layout_height="match_parent"
@@ -31,34 +32,19 @@ 
            android:theme="@android:style/Theme"

            android:layout_alignParentTop="true"/>



        <RelativeLayout

            android:id="@+id/fullscreen_user_switcher_container"

            android:layout_width="match_parent"

            android:layout_height="match_parent"

            android:layout_marginStart="@dimen/car_margin"

            android:layout_marginEnd="@dimen/car_margin">



            <RelativeLayout

                android:id="@+id/fullscreen_user_switcher_container_inner"

                android:layout_width="match_parent"

                android:layout_height="match_parent"

                android:layout_marginEnd="@dimen/car_padding_4">



        <!-- TODO: add app:verticallyCenterListContent="true" when car support lib is updated -->

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

            android:id="@+id/user_grid"

            android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

            android:layout_height="match_parent"

            android:layout_below="@+id/header"

                    android:scrollbars="vertical"

                    android:scrollbarFadeDuration="0"

                    android:verticalScrollbarPosition="left"

            android:layout_centerHorizontal="true"

            android:layout_centerVertical="true"

                    android:layout_alignParentRight="true"/>



            </RelativeLayout>



        </RelativeLayout>

            android:layout_alignParentRight="true"

            app:dayNightStyle="force_night"

            app:showPagedListViewDivider="false"

            app:gutter="both"

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



    </RelativeLayout>

</FrameLayout>

packages/SystemUI/res/layout/car_qs_panel.xml

+12 −17
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 


    <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:layout_marginStart="@dimen/car_margin"

        android:layout_marginEnd="@dimen/car_margin"
@@ -36,23 +37,17 @@ 
        android:layout_width="match_parent"

        android:layout_height="@dimen/car_user_switcher_container_height">



        <RelativeLayout

            android:id="@+id/fullscreen_user_switcher_container_inner"

            android:layout_width="match_parent"

            android:layout_height="match_parent"

            android:layout_marginEnd="@dimen/car_padding_4">



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

            android:id="@+id/user_grid"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

                android:scrollbars="vertical"

                android:verticalScrollbarPosition="left"

            android:layout_centerHorizontal="true"

            android:layout_centerVertical="true"

            android:layout_alignParentRight="true"

                android:scrollbarFadeDuration="0"/>

        </RelativeLayout>

            app:dayNightStyle="force_night"

            app:showPagedListViewDivider="false"

            app:gutter="both"

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



    </RelativeLayout>