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

Commit 80177080 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Best effort dismissal of the login screen."

parents d7f0d5c5 97ff8583

packages/SystemUI/res/drawable/car_progress_bar.xml

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

-->

<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

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

-->

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

+17 −0
Original line number Diff line number Diff line
@@ -20,6 +20,14 @@ 
    android:layout_height="match_parent"

    android:visibility="gone">



    <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"
@@ -34,4 +42,13 @@ 
        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

        android:id="@+id/start_driving"

        android:layout_width="wrap_content"

        android:layout_height="@dimen/car_start_driving_height"

        android:text="@string/start_driving"

        style="@style/CarUserSwitcher.StartDrivingButton"

        android:layout_alignParentBottom="true"

        android:layout_centerHorizontal="true" />

</RelativeLayout>

packages/SystemUI/res/values/colors_car.xml

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

<!--

/*

 * Copyright 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.

 */

-->

<resources>

    <color name="car_user_switcher_progress_bgcolor">#00000000</color> <!-- Transparent -->

    <color name="car_user_switcher_progress_fgcolor">#80CBC4</color> <!-- Teal 200 -->

    <color name="car_start_driving_background">#FAFAFA</color> <!-- Grey 50 -->

    <color name="car_start_driving_text">#212121</color> <!-- Grey 900 -->

</resources>

packages/SystemUI/res/values/dimens_car.xml

+8 −1
Original line number Diff line number Diff line
@@ -22,11 +22,18 @@ 
    <dimen name="car_fullscreen_user_pod_margin_above_text">24dp</dimen>

    <dimen name="car_fullscreen_user_pod_image_avatar_width">192dp</dimen>

    <dimen name="car_fullscreen_user_pod_image_avatar_height">192dp</dimen>

    <dimen name="car_fullscreen_user_pod_text_size">40sp</dimen>

    <dimen name="car_fullscreen_user_pod_text_size">40sp</dimen> <!-- B1 -->



    <dimen name="car_navigation_button_width">64dp</dimen>

    <dimen name="car_navigation_bar_width">760dp</dimen>



    <dimen name="car_page_indicator_dot_diameter">12dp</dimen>

    <dimen name="car_page_indicator_margin_top">32dp</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>

    <dimen name="car_start_driving_text_size">32sp</dimen> <!-- B2 -->

</resources>