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

Commit 509ae917 authored by András Klöczl's avatar András Klöczl Committed by Android (Google) Code Review
Browse files

Merge "Improve multi user settings screen" into rvc-dev

parents 1de5f2e7 d19dc306

res/drawable/ic_add_40dp.xml

0 → 100644
+36 −0
Original line number Diff line number Diff line 
<!--

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

  -->

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

        android:width="40dp"

        android:height="40dp"

        android:viewportWidth="20"

        android:viewportHeight="20"

        android:tint="?android:attr/colorControlNormal">



    <group

        android:scaleX="0.5"

        android:scaleY="0.5"

        android:pivotX="8"

        android:pivotY="8">



        <path

            android:fillColor="@android:color/white"

            android:pathData="M20,13h-7v7h-2v-7H4v-2h7V4h2v7h7V13z"/>



    </group>



</vector>

res/drawable/ic_phone.xml

0 → 100644
+29 −0
Original line number Diff line number Diff line 
<!--

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

  -->

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

        android:width="24dp"

        android:height="24dp"

        android:viewportWidth="24.0"

        android:viewportHeight="24.0"

        android:tint="?android:attr/colorControlNormal"

        android:autoMirrored="true">

    <path

        android:fillColor="#FF000000"

        android:pathData="M6.62,10.79c1.44,2.83 3.76,5.14 6.59,6.59l2.2,-2.2c0.27,-0.27 0.67,-0.36

            1.02,-0.24 1.12,0.37 2.33,0.57 3.57,0.57 0.55,0 1,0.45 1,1V20c0,0.55 -0.45,1 -1,1

            -9.39,0 -17,-7.61 -17,-17 0,-0.55 0.45,-1 1,-1h3.5c0.55,0 1,0.45 1,1 0,1.25 0.2,2.45

            0.57,3.57 0.11,0.35 0.03,0.74 -0.25,1.02l-2.2,2.2z"/>

</vector>
 
 No newline at end of file

res/drawable/ic_swap.xml

0 → 100644
+25 −0
Original line number Diff line number Diff line 
<!--

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

  -->

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

        android:width="24.0dp"

        android:height="24.0dp"

        android:viewportWidth="24.0"

        android:viewportHeight="24.0"

        android:tint="?android:attr/colorControlNormal">

    <path

        android:pathData="M6.99,11L3,15l3.99,4v-3H14v-2H6.99v-3zM21,9l-3.99,-4v3H10v2h7.01v3L21,9z"

        android:fillColor="#000000"/>

</vector>

res/layout/restricted_preference_user_delete_widget.xml

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

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

-->



<!-- Used by UserPreference to show the trash icon -->

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

    <include layout="@layout/restricted_icon" />



    <LinearLayout android:id="@+id/user_delete_widget"

            android:layout_width="wrap_content"

            android:layout_height="match_parent"

            android:orientation="horizontal">

        <View

            android:id="@+id/divider_manage"

            android:layout_width="2dip"

            android:layout_height="match_parent"

            android:layout_marginTop="5dip"

            android:layout_marginBottom="5dip"

            android:background="@android:drawable/divider_horizontal_dark" />

        <ImageView

            android:id="@+id/manage_user"

            android:layout_width="wrap_content"

            android:layout_height="fill_parent"

            android:paddingStart="16dip"

            android:paddingEnd="16dip"

            android:src="@drawable/ic_settings_accent"

            android:contentDescription="@string/settings_label"

            android:layout_gravity="center"

            android:background="?android:attr/selectableItemBackground" />

        <View

            android:id="@+id/divider_delete"

            android:layout_width="2dip"

            android:layout_height="match_parent"

            android:layout_marginTop="5dip"

            android:layout_marginBottom="5dip"

            android:background="@android:drawable/divider_horizontal_dark" />

        <ImageView

            android:id="@+id/trash_user"

            android:layout_width="wrap_content"

            android:layout_height="fill_parent"

            android:paddingStart="16dip"

            android:paddingEnd="16dip"

            android:src="@drawable/ic_delete"

            android:contentDescription="@string/user_delete_user_description"

            android:layout_gravity="center"

            android:background="?android:attr/selectableItemBackground" />

    </LinearLayout>

</merge>
 
 No newline at end of file

res/layout/user_info_header.xml

+37 −2
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
-->



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

              xmlns:tools="http://schemas.android.com/tools"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:minHeight="?android:attr/listPreferredItemHeight"
@@ -45,8 +46,7 @@ 
                android:layout_gravity="center"

                android:minWidth="48dp"

                android:scaleType="centerInside"

                android:layout_marginEnd="@*android:dimen/preference_item_padding_inner"

                 />

                android:layout_marginEnd="@*android:dimen/preference_item_padding_inner"/>

        </LinearLayout>

        <RelativeLayout

            android:layout_width="wrap_content"
@@ -60,6 +60,7 @@ 
                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:singleLine="true"

                tools:text="Richard"

                android:textAppearance="?android:attr/textAppearanceMedium"

                android:ellipsize="marquee"

                android:fadingEdge="horizontal"/>
@@ -88,6 +89,40 @@ 
                android:layout_gravity="center"

                android:background="?android:attr/selectableItemBackground" />

    </LinearLayout>



    <LinearLayout

        android:id="@+id/switch_pref"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:gravity="center_vertical"

        android:visibility="gone"

        tools:visibility="visible"

        android:paddingStart="?android:attr/listPreferredItemPaddingStart"

        android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"

        android:background="?android:attr/selectableItemBackground" >



        <ImageView

            android:id="@+id/switchIcon"

            android:layout_width="48dp"

            android:layout_height="48dp"

            android:layout_gravity="center"

            android:src="@drawable/ic_swap"

            android:minWidth="48dp"

            android:scaleType="centerInside"

            android:layout_marginEnd="@*android:dimen/preference_item_padding_inner"/>



        <TextView

            android:id="@+id/switchTitle"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:singleLine="true"

            tools:text="Switch to Richard"

            android:textAppearance="?android:attr/textAppearanceMedium"

            android:ellipsize="marquee"

            android:fadingEdge="horizontal"/>



    </LinearLayout>



    <View android:layout_width="match_parent"

          android:layout_height="2dp"

          android:background="@color/divider_color" />