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

Commit 4d25a1d9 authored by Xiyuan Xia's avatar Xiyuan Xia Committed by Android (Google) Code Review
Browse files

Merge "Add full screen user switcher to lock screen"

parents cbb6c16f cc3a74f6

packages/SystemUI/res/layout/fullscreen_user_pod.xml

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

<!--

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

-->



<!--  LinearLayout -->

<LinearLayout

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

    android:orientation="vertical"

    android:gravity="top|center_horizontal"

    android:layout_width="180dp"

    android:layout_height="wrap_content">



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

               android:padding="10dp"

               android:layout_gravity="center"

               android:layout_width="160dp"

               android:layout_height="160dp" />



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

              android:layout_width="wrap_content"

              android:layout_height="wrap_content"

              android:textSize="@dimen/qs_detail_item_secondary_text_size"

              android:textColor="@color/qs_user_detail_name"

              android:gravity="center_horizontal" />

</LinearLayout>

packages/SystemUI/res/layout/fullscreen_user_switcher.xml

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

<!--

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

-->



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

             android:fitsSystemWindows="true"

             android:layout_width="match_parent"

             android:layout_height="match_parent"

             android:visibility="gone">

    <com.android.systemui.statusbar.UserGridView

        android:id="@+id/user_grid"

        android:layout_gravity="center"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:paddingStart="10dp"

        android:paddingEnd="10dp"

        android:columnWidth="180dp"

        android:verticalSpacing="10dp"

        android:horizontalSpacing="10dp"

        android:stretchMode="columnWidth"

        android:gravity="center">

    </com.android.systemui.statusbar.UserGridView>

</FrameLayout>

packages/SystemUI/res/layout/super_status_bar.xml

+5 −0
Original line number Diff line number Diff line
@@ -79,6 +79,11 @@ 
        </FrameLayout>

    </FrameLayout>



    <ViewStub android:id="@+id/fullscreen_user_switcher_stub"

              android:layout="@layout/fullscreen_user_switcher"

              android:layout_width="match_parent"

              android:layout_height="match_parent"/>



    <com.android.systemui.statusbar.phone.PanelHolder

        android:id="@+id/panel_holder"

        android:layout_width="match_parent"

packages/SystemUI/res/values/config.xml

+3 −0
Original line number Diff line number Diff line
@@ -294,5 +294,8 @@ 
    <!-- Whether to show a "shelf" of apps at the bottom of the screen. -->

    <bool name="config_enableAppShelf">false</bool>



    <!-- Whether to show the full screen user switcher. -->

    <bool name="enable_fullscreen_user_switcher">false</bool>



</resources>

packages/SystemUI/res/values/strings.xml

+8 −0
Original line number Diff line number Diff line
@@ -867,6 +867,14 @@ 
    <!-- Message for add user confirmation dialog - short version. [CHAR LIMIT=none] -->

    <string name="user_add_user_message_short" msgid="1511354412249044381">When you add a new user, that person needs to set up their space.\n\nAny user can update apps for all other users. </string>



    <!-- Title of the confirmation dialog when exiting guest session [CHAR LIMIT=NONE] -->

    <string name="user_remove_user_title">Remove user?</string>



    <!-- Message of the confirmation dialog when exiting guest session [CHAR LIMIT=NONE] -->

    <string name="user_remove_user_message">All apps and data of this user will be deleted.</string>



    <!-- Label for button in confirmation dialog when exiting guest session [CHAR LIMIT=35] -->

    <string name="user_remove_user_remove">Remove</string>



    <!-- Battery saver notification title. [CHAR LIMIT=60]-->

    <string name="battery_saver_notification_title">Battery saver is on</string>