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

Commit 715bdbcd authored by Bryan Eyler's avatar Bryan Eyler
Browse files

Add pagination dots and fix animation of user switcher. 

- Adds pagination dots to user switcher dropdown.
- Adds device name text view for when devices are associated with users.
- Fixes the layout of the user grid to handle changing height for
  proper animation.

Bug: 65423882
Tested on Mojave with longer animation times to ensure correctness.

Change-Id: I54ae5cc93f9caa9d6c4a5c2c7e9e2488a6257001
(cherry picked from commit 0de35b5386ad7e00f13a7611fce36ca990b201e0)
parent 9c829527

packages/SystemUI/res/anim/car_user_switcher_close_animation.xml

0 → 100644
+20 −0
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.

-->

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

        android:duration="133"

        android:valueType="intType"

        android:valueFrom="@dimen/car_user_switcher_container_height"

        android:valueTo="0"

        android:interpolator="@android:interpolator/fast_out_slow_in" />

packages/SystemUI/res/anim/car_user_switcher_open_animation.xml

0 → 100644
+20 −0
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.

-->

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

        android:duration="200"

        android:valueType="intType"

        android:valueFrom="0"

        android:valueTo="@dimen/car_user_switcher_container_height"

        android:interpolator="@android:interpolator/fast_out_slow_in" />

packages/SystemUI/res/layout/car_fullscreen_user_pod.xml

+20 −9
Original line number Diff line number Diff line
@@ -15,27 +15,38 @@ 
     limitations under the License.

-->



<LinearLayout

<RelativeLayout

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

    android:orientation="vertical"

    android:layout_width="wrap_content"

    android:layout_height="wrap_content"

    android:gravity="center" >

    android:layout_height="@dimen/car_fullscreen_user_pod_height"

    android:layout_gravity="center_horizontal|bottom" >



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

        android:layout_gravity="center"

        android:layout_centerHorizontal="true"

        android:layout_marginTop="@dimen/car_fullscreen_user_pod_margin_image_top"

        android:layout_width="@dimen/car_fullscreen_user_pod_image_avatar_width"

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

        android:layout_height="@dimen/car_fullscreen_user_pod_image_avatar_height"

        android:layout_above="@id/user_name" />



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

        android:layout_width="@dimen/car_fullscreen_user_pod_width"

        android:layout_height="wrap_content"

        android:layout_marginTop="@dimen/car_fullscreen_user_pod_margin_name_top"

        android:layout_marginBottom="@dimen/car_fullscreen_user_pod_margin_name_bottom"

        android:textSize="@dimen/car_fullscreen_user_pod_text_size"

        android:textSize="@dimen/car_fullscreen_user_pod_name_text_size"

        android:textColor="@color/qs_user_detail_name"

        android:ellipsize="end"

        android:singleLine="true"

        android:gravity="center_horizontal"

        android:layout_above="@id/device_name" />



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

        android:layout_width="@dimen/car_fullscreen_user_pod_width"

        android:layout_height="wrap_content"

        android:textSize="@dimen/car_fullscreen_user_pod_device_text_size"

        android:textColor="@color/qs_user_detail_name"

        android:ellipsize="end"

        android:singleLine="true"

        android:gravity="center_horizontal"

        android:layout_gravity="center_horizontal" />

</LinearLayout>
 
        android:layout_alignParentBottom="true" />

</RelativeLayout>

packages/SystemUI/res/layout/car_fullscreen_user_pod_container.xml

+1 −2
Original line number Diff line number Diff line
@@ -18,8 +18,7 @@ 
    xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:gravity="center"

    android:layout_gravity="center" >

    android:gravity="center" >



    <!-- car_fullscreen_user_pods will be dynamically added here. -->

</LinearLayout>

packages/SystemUI/res/layout/car_fullscreen_user_switcher.xml

+1 −1
Original line number Diff line number Diff line
@@ -54,13 +54,13 @@ 
            android:layout_height="wrap_content"

            android:layout_marginLeft="@dimen/car_margin"

            android:layout_marginRight="@dimen/car_margin"

            android:layout_marginBottom="@dimen/car_user_grid_margin_bottom"

            android:layout_centerInParent="true" />



        <com.android.systemui.statusbar.car.PageIndicator

            android:id="@+id/user_switcher_page_indicator"

            android:layout_width="match_parent"

            android:layout_height="@dimen/car_page_indicator_dot_diameter"

            android:layout_marginTop="@dimen/car_page_indicator_margin_top"

            android:layout_below="@+id/user_grid" />



        <Button