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

Commit d8dd73e3 authored by Tetiana Meronyk's avatar Tetiana Meronyk Committed by Automerger Merge Worker
Browse files

Create single dialog for adding a user. am: 709264ad am: 510e241c am: 304dcc3b 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22849716



Change-Id: Ic00aee811227f7e5bcb16d37761c21305639c7e7
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6f856e25 304dcc3b

packages/SettingsLib/res/drawable/ic_person_add.xml

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

  ~ Copyright (C) 2023 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"

        android:viewportHeight="24"

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

    <path

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

        android:pathData="M18,14V11H15V9H18V6H20V9H23V11H20V14ZM9,12Q7.35,12 6.175,10.825Q5,9.65 5,8Q5,6.35 6.175,5.175Q7.35,4 9,4Q10.65,4 11.825,5.175Q13,6.35 13,8Q13,9.65 11.825,10.825Q10.65,12 9,12ZM1,20V17.2Q1,16.35 1.438,15.637Q1.875,14.925 2.6,14.55Q4.15,13.775 5.75,13.387Q7.35,13 9,13Q10.65,13 12.25,13.387Q13.85,13.775 15.4,14.55Q16.125,14.925 16.562,15.637Q17,16.35 17,17.2V20ZM3,18H15V17.2Q15,16.925 14.863,16.7Q14.725,16.475 14.5,16.35Q13.15,15.675 11.775,15.337Q10.4,15 9,15Q7.6,15 6.225,15.337Q4.85,15.675 3.5,16.35Q3.275,16.475 3.138,16.7Q3,16.925 3,17.2ZM9,10Q9.825,10 10.413,9.412Q11,8.825 11,8Q11,7.175 10.413,6.588Q9.825,6 9,6Q8.175,6 7.588,6.588Q7,7.175 7,8Q7,8.825 7.588,9.412Q8.175,10 9,10ZM9,8Q9,8 9,8Q9,8 9,8Q9,8 9,8Q9,8 9,8Q9,8 9,8Q9,8 9,8Q9,8 9,8Q9,8 9,8ZM9,18Q9,18 9,18Q9,18 9,18Q9,18 9,18Q9,18 9,18Q9,18 9,18Q9,18 9,18Q9,18 9,18Q9,18 9,18Z"/>

</vector>

packages/SettingsLib/res/layout/dialog_with_icon.xml

+73 −72
Original line number Diff line number Diff line
@@ -13,50 +13,53 @@ 
  ~ See the License for the specific language governing permissions and

  ~ limitations under the License.

  -->

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



<ScrollView

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

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:id="@+id/new_user_dialog_id">



    <LinearLayout

        android:orientation="vertical"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:gravity="center"

              android:padding="@dimen/grant_admin_dialog_padding"

              android:paddingBottom="0dp">

        android:padding="@dimen/dialog_content_padding">

        <ImageView

            android:id="@+id/dialog_with_icon_icon"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

        android:contentDescription=""/>

            android:importantForAccessibility="no"/>

        <TextView

            android:id="@+id/dialog_with_icon_title"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:gravity="center"

        style="@style/DialogWithIconTitle"

        android:text="@string/user_grant_admin_title"

        android:textDirection="locale"/>

            style="@style/DialogWithIconTitle"/>

        <TextView

            android:id="@+id/dialog_with_icon_message"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:padding="10dp"

            android:gravity="center"

        style="@style/TextAppearanceSmall"

        android:text=""

        android:textDirection="locale"/>

            style="@style/TextAppearanceSmall"/>



        <LinearLayout

            android:id="@+id/custom_layout"

            android:orientation="vertical"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

        android:gravity="center"

        android:paddingBottom="0dp">

            android:gravity="center">

        </LinearLayout>



        <LinearLayout

            android:id="@+id/button_panel"

            android:orientation="horizontal"

            android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:gravity="center"

        android:paddingBottom="0dp">

            android:layout_height="wrap_content"

            android:gravity="center">



            <Button

                android:id="@+id/button_cancel"

                style="@style/DialogButtonNegative"
@@ -64,36 +67,34 @@ 
                android:buttonCornerRadius="28dp"

                android:layout_height="wrap_content"

                android:visibility="gone"/>



            <Space

                android:layout_width="0dp"

                android:layout_height="1dp"

                android:layout_weight="1">

            </Space>



            <Button

                android:id="@+id/button_back"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                style="@style/DialogButtonNegative"

                android:buttonCornerRadius="40dp"

            android:clickable="true"

            android:focusable="true"

            android:text="Back"

            android:visibility="gone"

        />

                android:visibility="gone"/>



            <Space

                android:layout_width="0dp"

                android:layout_height="1dp"

            android:layout_weight="0.05"

        >

                android:layout_weight="0.05">

            </Space>



            <Button

                android:id="@+id/button_ok"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                style="@style/DialogButtonPositive"

            android:clickable="true"

            android:focusable="true"

                android:visibility="gone"

            />

        </LinearLayout>

    </LinearLayout>

</ScrollView>

packages/SettingsLib/res/layout/edit_user_info_dialog_content.xml

+2 −1
Original line number Diff line number Diff line
@@ -28,7 +28,8 @@ 
        android:orientation="vertical">

        <TextView

            android:id="@+id/user_info_title"

            android:layout_width="wrap_content"

            android:gravity="center"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            style="@style/EditUserDialogTitle"

            android:text="@string/user_info_settings_title"

packages/SettingsLib/res/layout/grant_admin_dialog_content.xml

+13 −3
Original line number Diff line number Diff line
@@ -14,10 +14,14 @@ 
  ~ limitations under the License.

  -->

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

              android:id="@+id/grant_admin_view"

              android:orientation="vertical"

              android:layout_width="match_parent"

              android:layout_height="match_parent"

              android:padding="@dimen/grant_admin_dialog_padding">

              android:paddingLeft="@dimen/dialog_content_padding"

              android:paddingBottom="@dimen/dialog_content_padding"

              android:paddingRight="@dimen/dialog_content_padding">



    <RadioGroup

        android:id="@+id/choose_admin"

        android:layout_width="match_parent"
@@ -25,13 +29,19 @@ 
        android:orientation="vertical">

        <RadioButton

            android:id="@+id/grant_admin_yes"

            android:layout_width="wrap_content"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:paddingTop="@dimen/radio_button_padding"

            android:paddingBottom="@dimen/radio_button_padding"

            android:paddingStart="@dimen/radio_button_padding_start"

            android:text="@string/grant_admin"/>

        <RadioButton

            android:id="@+id/grant_admin_no"

            android:layout_width="wrap_content"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:paddingTop="@dimen/radio_button_padding"

            android:paddingBottom="@dimen/radio_button_padding"

            android:paddingStart="@dimen/radio_button_padding_start"

            android:text="@string/not_grant_admin"/>

    </RadioGroup>

</LinearLayout>

packages/SettingsLib/res/values/dimens.xml

+3 −2
Original line number Diff line number Diff line
@@ -112,8 +112,9 @@ 
    <dimen name="broadcast_dialog_btn_minHeight">44dp</dimen>

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



    <!-- Size of grant admin privileges dialog padding -->

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

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

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

    <dimen name="radio_button_padding_start">8dp</dimen>



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

    <dimen name="dialog_button_vertical_padding">8dp</dimen>