Snap for 5670726 from 509d6bcf73 to qt-c2f2-release

Change-Id: Ieb5d0c2ef9a476d2bd37432ad3a4270baa554237

res/values/strings.xml

@@ -3981,6 +3981,9 @@
     <!-- About phone settings screen, setting option name to see licensing info -->
     <string name="license_title">License</string>
     <!-- Note: this may be replaced by a more-specific title of the activity that will get launched --> <skip />
+    <!-- About phone settings screen, setting option name to see licensing info for Google Play system updates [CHAR LIMIT=50] -->
+    <string name="module_license_title">Google Play system update licenses</string>
+    <!-- Note: this may be replaced by a more-specific title of the activity that will get launched --> <skip />
     <!-- About phone settings screen, setting option name to see terms and conditions -->
     <string name="terms_title">Terms and conditions</string>
     <!-- Note: this may be replaced by a more-specific title of the activity that will get launched --> <skip />

src/com/android/settings/biometrics/face/FaceEnrollAccessibilityToggle.java

@@ -60,6 +60,8 @@ public class FaceEnrollAccessibilityToggle extends LinearLayout {
         }
         mSwitch = findViewById(R.id.toggle);
         mSwitch.setChecked(false);
+        mSwitch.setClickable(false);
+        mSwitch.setFocusable(false);
     }
 
     public boolean isChecked() {

src/com/android/settings/biometrics/face/FaceEnrollEducation.java

@@ -159,13 +159,12 @@ public class FaceEnrollEducation extends BiometricEnrollBase {
 
         mSwitchDiversity = findViewById(R.id.toggle_diversity);
         mSwitchDiversity.setListener(mSwitchDiversityListener);
-
-        if (accessibilityEnabled) {
-            accessibilityButton.callOnClick();
-            mSwitchDiversity.setClickable(true);
         mSwitchDiversity.setOnClickListener(v -> {
             mSwitchDiversity.getSwitch().toggle();
         });
+
+        if (accessibilityEnabled) {
+            accessibilityButton.callOnClick();
         }
     }
 

src/com/android/settings/biometrics/face/FaceSettings.java

@@ -228,6 +228,11 @@ public class FaceSettings extends DashboardFragment {
         }
     }
 
+    @Override
+    public int getHelpResource() {
+        return R.string.help_url_face;
+    }
+
     @Override
     protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
         if (!isAvailable(context)) {

src/com/android/settings/users/UserSettings.java

@@ -271,6 +271,10 @@ public class UserSettings extends SettingsPreferenceFragment
             mMePreference.setSummary(R.string.user_admin);
         }
         mAddUser = (RestrictedPreference) findPreference(KEY_ADD_USER);
+        if (!mUserCaps.mCanAddRestrictedProfile) {
+            // Label should only mention adding a "user", not a "profile"
+            mAddUser.setTitle(R.string.user_add_user_menu);
+        }
         mAddUser.setOnPreferenceClickListener(this);
 
         activity.registerReceiverAsUser(