From a6db6c28a467f5dc55c288a549a76faf9b0d4bfd Mon Sep 17 00:00:00 2001
From: Yasin Kilicdere <tyk@google.com>
Date: Tue, 25 Jan 2022 20:07:54 +0000
Subject: [PATCH] Set default name when creating a supervised user in fallback
 activity.

Fallback activity for supervised user creation was creating a supervised user
without a name (null), now creates it with a default name.
Also put an explanation on the activity stating it's just a placeholder.

Bug: 215232217
Bug: 207495450
Test: croot && make RunSettingsRoboTests -j40 ROBOTEST_FILTER="com.android.settings.users.UserSettingsTest"

Change-Id: I8090fde38155817ac2b4f88271abe8a0ad1ce747
---
 res/layout/add_supervised_user.xml                 | 14 ++++++++++----
 res/values/strings.xml                             |  3 +++
 .../settings/users/AddSupervisedUserActivity.java  |  4 +++-
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/res/layout/add_supervised_user.xml b/res/layout/add_supervised_user.xml
index b95e0f7763d..33032bd58f7 100644
--- a/res/layout/add_supervised_user.xml
+++ b/res/layout/add_supervised_user.xml
@@ -15,12 +15,18 @@
   ~ limitations under the License.
   -->
 
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-             android:layout_width="match_parent"
-             android:layout_height="match_parent">
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:layout_margin="16dp"
+              android:orientation="vertical">
     <Button
         android:id="@+id/createSupervisedUser"
         android:layout_height="wrap_content"
         android:layout_width="wrap_content"
         android:text="@*android:string/supervised_user_creation_label" />
-</FrameLayout>
\ No newline at end of file
+    <TextView
+        android:layout_height="wrap_content"
+        android:layout_width="wrap_content"
+        android:text="@string/placeholder_activity" />
+</LinearLayout>
\ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
index b9bba98eab9..a019c8580f7 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -13846,4 +13846,7 @@
     <string name="reboot_dialog_reboot_now">Reboot now</string>
     <!-- Text on the dialog button to reboot the device later [CHAR LIMIT=50] -->
     <string name="reboot_dialog_reboot_later">Reboot later</string>
+
+    <!-- Text to explain an activity is a temporary placeholder [CHAR LIMIT=none] -->
+    <string name="placeholder_activity" translatable="false">*This is a temporary placeholder fallback activity.</string>
 </resources>
diff --git a/src/com/android/settings/users/AddSupervisedUserActivity.java b/src/com/android/settings/users/AddSupervisedUserActivity.java
index f3c5867d220..8a3221d2816 100644
--- a/src/com/android/settings/users/AddSupervisedUserActivity.java
+++ b/src/com/android/settings/users/AddSupervisedUserActivity.java
@@ -65,7 +65,9 @@ public class AddSupervisedUserActivity extends Activity {
     }
 
     private void createUser() {
-        final NewUserRequest request = new NewUserRequest.Builder().build();
+        final NewUserRequest request = new NewUserRequest.Builder()
+                .setName(getString(R.string.user_new_user_name))
+                .build();
 
         final AlertDialog pleaseWaitDialog = new AlertDialog.Builder(this)
                 .setMessage(getString(R.string.creating_new_user_dialog_message))