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

Commit 1be68cb8 authored by Jovana Knezevic's avatar Jovana Knezevic Committed by android-build-merger
Browse files

Merge "Removing the countdown timer and countdown progress bar from the Car... 

Merge "Removing the countdown timer and countdown progress bar from the Car User Picker." into pi-dev
am: 660a7639

Change-Id: I31f7ca3cdb55196df319e0e3aff9f348d7246e22
parents f3919e00 660a7639

packages/SystemUI/res/layout/car_fullscreen_user_switcher.xml

+1 −11
Original line number Diff line number Diff line
@@ -39,22 +39,12 @@ 
            android:theme="@android:style/Theme"

            android:layout_alignParentTop="true"/>



        <!-- This progress bar is the countdown timer. -->

        <ProgressBar

            android:id="@+id/countdown_progress"

            android:layout_width="match_parent"

            android:layout_height="@dimen/car_user_switcher_progress_bar_height"

            style="@style/CarUserSwitcher.ProgressBar"

            android:layout_marginTop="@dimen/car_user_switcher_progress_bar_margin_top"

            android:layout_alignParentTop="true"/>



        <com.android.systemui.statusbar.car.UserGridView

            android:id="@+id/user_grid"

            android:layout_width="match_parent"

            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

packages/SystemUI/res/layout/car_qs_panel.xml

+0 −1
Original line number Diff line number Diff line
@@ -42,7 +42,6 @@ 
            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_above="@id/user_switcher_page_indicator" />



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

packages/SystemUI/res/values/dimens_car.xml

+0 −3
Original line number Diff line number Diff line
@@ -36,8 +36,6 @@ 
    <dimen name="car_page_indicator_dot_diameter">12dp</dimen>

    <dimen name="car_page_indicator_margin_bottom">24dp</dimen>



    <dimen name="car_user_switcher_progress_bar_height">6dp</dimen>

    <dimen name="car_user_switcher_progress_bar_margin_top">@dimen/status_bar_height</dimen>

    <dimen name="car_start_driving_corner_radius">16dp</dimen>

    <dimen name="car_start_driving_padding_side">30dp</dimen>

    <dimen name="car_start_driving_height">80dp</dimen>
@@ -57,7 +55,6 @@ 
    <dimen name="car_user_switcher_container_height">420dp</dimen>

    <!-- This must be the negative of car_user_switcher_container_height for the animation. -->

    <dimen name="car_user_switcher_container_anim_height">-420dp</dimen>

    <dimen name="car_user_grid_margin_bottom">28dp</dimen>



    <dimen name="car_body2_size">26sp</dimen>

</resources>

packages/SystemUI/res/values/integers_car.xml

+0 −3
Original line number Diff line number Diff line
@@ -16,8 +16,5 @@ 
-->



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

    <integer name="car_user_switcher_timeout_ms">15000</integer>

    <!-- This values less than ProgressBar.PROGRESS_ANIM_DURATION for a smooth animation. -->

    <integer name="car_user_switcher_anim_update_ms">60</integer>

    <integer name="car_user_switcher_anim_cascade_delay_ms">27</integer>

</resources>

packages/SystemUI/res/values/styles_car.xml

+0 −8
Original line number Diff line number Diff line
@@ -16,14 +16,6 @@ 
-->



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

    <style name="CarUserSwitcher.ProgressBar" parent="@android:style/Widget.ProgressBar.Horizontal">

        <item name="android:progressDrawable">@drawable/car_progress_bar</item>

        <item name="android:min">0</item>

        <item name="android:max">@integer/car_user_switcher_timeout_ms</item>

        <item name="android:progress">0</item>

        <item name="android:interpolator">@android:anim/linear_interpolator</item>

    </style>



    <style name="CarUserSwitcher.StartDrivingButton" parent="@android:style/Widget.Material.Button">

        <item name="android:background">@drawable/car_round_button</item>

        <item name="android:textSize">@dimen/car_start_driving_text_size</item>