Merge "Hide password managers from cred man settings"

res/xml/accounts_dashboard_settings_credman.xml

@@ -45,13 +45,6 @@
         settings:controller="com.android.settings.applications.credentials.CredentialManagerPreferenceController"
         settings:keywords="@string/credman_keywords" />
 
-    <PreferenceCategory
-        android:key="passwords_category"
-        android:order="30"
-        android:persistent="false"
-        settings:controller="com.android.settings.applications.autofill.PasswordsPreferenceController"
-        settings:keywords="@string/autofill_keywords" />
-
     <PreferenceCategory
         android:key="dashboard_tile_placeholder"
         android:order="130"/>

res/xml/accounts_personal_dashboard_settings_credman.xml

@@ -46,13 +46,6 @@
         settings:controller="com.android.settings.applications.credentials.CredentialManagerPreferenceController"
         settings:keywords="@string/credman_keywords" />
 
-    <PreferenceCategory
-        android:key="passwords_category"
-        android:order="30"
-        android:persistent="false"
-        settings:controller="com.android.settings.applications.autofill.PasswordsPreferenceController"
-        settings:keywords="@string/autofill_keywords" />
-
     <PreferenceCategory
         android:key="dashboard_tile_placeholder"
         android:order="130"/>

res/xml/accounts_work_dashboard_settings_credman.xml

@@ -46,13 +46,6 @@
         settings:controller="com.android.settings.applications.credentials.CredentialManagerPreferenceController"
         settings:keywords="@string/credman_keywords" />
 
-    <PreferenceCategory
-        android:key="passwords_category"
-        android:order="30"
-        android:persistent="false"
-        settings:controller="com.android.settings.applications.autofill.PasswordsPreferenceController"
-        settings:keywords="@string/autofill_keywords" />
-
     <PreferenceCategory
         android:key="dashboard_tile_placeholder"
         android:order="130"/>

src/com/android/settings/accounts/AccountDashboardFragment.java

@@ -76,10 +76,10 @@ public class AccountDashboardFragment extends DashboardFragment {
             CredentialManagerPreferenceController cmpp =
                     use(CredentialManagerPreferenceController.class);
             cmpp.init(this, getFragmentManager());
-        }
+        } else {
-
             getSettingsLifecycle().addObserver(use(PasswordsPreferenceController.class));
         }
+    }
 
     @Override
     protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {

src/com/android/settings/accounts/AccountPersonalDashboardFragment.java

@@ -70,10 +70,10 @@ public class AccountPersonalDashboardFragment extends DashboardFragment {
             CredentialManagerPreferenceController cmpp =
                     use(CredentialManagerPreferenceController.class);
             cmpp.init(this, getFragmentManager());
-        }
+        } else {
-
             getSettingsLifecycle().addObserver(use(PasswordsPreferenceController.class));
         }
+    }
 
     @Override
     protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {

src/com/android/settings/accounts/AccountWorkProfileDashboardFragment.java

@@ -70,10 +70,10 @@ public class AccountWorkProfileDashboardFragment extends DashboardFragment {
             CredentialManagerPreferenceController cmpp =
                     use(CredentialManagerPreferenceController.class);
             cmpp.init(this, getFragmentManager());
-        }
+        } else {
-
             getSettingsLifecycle().addObserver(use(PasswordsPreferenceController.class));
         }
+    }
 
     @Override
     protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {