diff options
| author | 2024-02-06 17:21:46 +0000 | |
|---|---|---|
| committer | 2024-02-06 17:21:46 +0000 | |
| commit | 1e775c89de01ad94525695824d72216a004d9f34 (patch) | |
| tree | 7dc46838dab4141b9055b29270af00426a8d37db | |
| parent | 54f1f1edd2fe03f1a8591293b801f678ef9e6d95 (diff) | |
| parent | 0e8b56d1ab7ae9c20108f5ea62bcc3039cae17e2 (diff) | |
Merge "Provide user infomation about avatar synchronisation" into main
| -rw-r--r-- | packages/SettingsLib/res/layout/edit_user_info_dialog_content.xml | 13 | ||||
| -rw-r--r-- | packages/SettingsLib/res/values/strings.xml | 3 |
2 files changed, 16 insertions, 0 deletions
diff --git a/packages/SettingsLib/res/layout/edit_user_info_dialog_content.xml b/packages/SettingsLib/res/layout/edit_user_info_dialog_content.xml index 2ded3c6e82eb..89d6ac39598b 100644 --- a/packages/SettingsLib/res/layout/edit_user_info_dialog_content.xml +++ b/packages/SettingsLib/res/layout/edit_user_info_dialog_content.xml @@ -38,6 +38,17 @@ android:src="@drawable/add_a_photo_circled" android:layout_gravity="bottom|right"/> </FrameLayout> + <TextView + android:id="@+id/edit_user_info_message" + android:gravity="center" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginStart="6dp" + android:layout_marginEnd="6dp" + android:layout_marginTop="24dp" + android:textAppearance="@style/android:TextAppearance.Material.Body1" + android:text="@string/edit_user_info_message" + /> <EditText android:id="@+id/user_name" @@ -46,6 +57,8 @@ android:layout_gravity="center" android:minWidth="200dp" android:layout_marginStart="6dp" + android:layout_marginEnd="6dp" + android:layout_marginTop="24dp" android:minHeight="@dimen/min_tap_target_size" android:ellipsize="end" android:singleLine="true" diff --git a/packages/SettingsLib/res/values/strings.xml b/packages/SettingsLib/res/values/strings.xml index 2e64212d298a..1092a16216f9 100644 --- a/packages/SettingsLib/res/values/strings.xml +++ b/packages/SettingsLib/res/values/strings.xml @@ -1484,6 +1484,9 @@ <!-- Title for the preference to enter the nickname of the user to display in the user switcher [CHAR LIMIT=25]--> <string name="user_nickname">Nickname</string> + <!-- Confirmation message on dialog for editing user name and profile picture. Inform user on who will be able to see the changes [CHAR LIMIT=NONE]--> + <string name="edit_user_info_message">Your name and picture will be visible to anyone that uses this device.</string> + <!-- Label for adding a new user in the user switcher [CHAR LIMIT=35] --> <string name="user_add_user">Add user</string> <!-- Label for adding a new guest in the user switcher [CHAR LIMIT=35] --> |