PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add Credential Manager settings

Browse Source 
Autofill is evolving into CredMan which means we need
to update the settings to have CredMan providers.

This CL adds CredMan equivalent classes to list the
Credential Manager providers and allow the user
to select a number of providers.

Test: Manual & atest SettingsUnitTests & make RunSettingsRoboTests -j
Bug: 253157366

Change-Id: Ice76187cfee91d844d211205b44b661acf2f6a44
This commit is contained in:
Becca Hughes
2022-11-23 22:02:14 +00:00
parent cae1834631
commit 8c6f627a93
10 changed files with 1011 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/com/android/settings/accounts/AccountDashboardFragment.java
View File

@@ -22,11 +22,13 @@ import android.accounts.AccountManager;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.content.pm.UserInfo;
import android.credentials.CredentialManager;
import android.os.UserHandle;
import android.os.UserManager;
import com.android.settings.R;
import com.android.settings.applications.autofill.PasswordsPreferenceController;
import com.android.settings.applications.credentials.CredentialManagerPreferenceController;
import com.android.settings.applications.defaultapps.DefaultAutofillPreferenceController;
import com.android.settings.applications.defaultapps.DefaultWorkAutofillPreferenceController;
import com.android.settings.dashboard.DashboardFragment;
@@ -47,7 +49,6 @@ public class AccountDashboardFragment extends DashboardFragment {
private static final String TAG = "AccountDashboardFrag";
@Override
public int getMetricsCategory() {
return SettingsEnums.ACCOUNT;
@@ -60,7 +61,7 @@ public class AccountDashboardFragment extends DashboardFragment {
@Override
protected int getPreferenceScreenResId() {
return R.xml.accounts_dashboard_settings;
return getPreferenceLayoutResId();
}
@Override
@@ -71,6 +72,12 @@ public class AccountDashboardFragment extends DashboardFragment {
@Override
public void onAttach(Context context) {
super.onAttach(context);
if (CredentialManager.isServiceEnabled()) {
CredentialManagerPreferenceController cmpp =
use(CredentialManagerPreferenceController.class);
cmpp.setParentFragment(this);
}
getSettingsLifecycle().addObserver(use(PasswordsPreferenceController.class));
}
@@ -95,11 +102,13 @@ public class AccountDashboardFragment extends DashboardFragment {
}
private static void buildAccountPreferenceControllers(
Context context, DashboardFragment parent, String[] authorities,
Context context,
DashboardFragment parent,
String[] authorities,
List<AbstractPreferenceController> controllers) {
final AccountPreferenceController accountPrefController =
new AccountPreferenceController(context, parent, authorities,
ProfileSelectFragment.ProfileType.ALL);
new AccountPreferenceController(
context, parent, authorities, ProfileSelectFragment.ProfileType.ALL);
if (parent != null) {
parent.getSettingsLifecycle().addObserver(accountPrefController);
}
@@ -109,8 +118,14 @@ public class AccountDashboardFragment extends DashboardFragment {
controllers.add(new AutoSyncWorkDataPreferenceController(context, parent));
}
public static int getPreferenceLayoutResId() {
return CredentialManager.isServiceEnabled()
? R.xml.accounts_dashboard_settings_credman
: R.xml.accounts_dashboard_settings;
}
public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
new BaseSearchIndexProvider(R.xml.accounts_dashboard_settings) {
new BaseSearchIndexProvider(getPreferenceLayoutResId()) {
@Override
public List<AbstractPreferenceController> createPreferenceControllers(
@@ -124,11 +139,11 @@ public class AccountDashboardFragment extends DashboardFragment {
@SuppressWarnings("MissingSuperCall") // TODO: Fix me
@Override
public List<SearchIndexableRaw> getDynamicRawDataToIndex(Context context,
boolean enabled) {
public List<SearchIndexableRaw> getDynamicRawDataToIndex(
Context context, boolean enabled) {
final List<SearchIndexableRaw> indexRaws = new ArrayList<>();
final UserManager userManager = (UserManager) context.getSystemService(
Context.USER_SERVICE);
final UserManager userManager =
(UserManager) context.getSystemService(Context.USER_SERVICE);
final List<UserInfo> profiles = userManager.getProfiles(UserHandle.myUserId());
for (final UserInfo userInfo : profiles) {
if (userInfo.isManagedProfile()) {

46
src/com/android/settings/accounts/AccountPersonalDashboardFragment.java
View File

@@ -22,9 +22,11 @@ import static com.android.settings.accounts.AccountDashboardFragment.buildAutofi
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.credentials.CredentialManager;
import com.android.settings.R;
import com.android.settings.applications.autofill.PasswordsPreferenceController;
import com.android.settings.applications.credentials.CredentialManagerPreferenceController;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.dashboard.profileselector.ProfileSelectFragment;
import com.android.settings.users.AutoSyncDataPreferenceController;
@@ -34,9 +36,7 @@ import com.android.settingslib.core.AbstractPreferenceController;
import java.util.ArrayList;
import java.util.List;
/**
* Account Setting page for personal profile.
*/
/** Account Setting page for personal profile. */
public class AccountPersonalDashboardFragment extends DashboardFragment {
private static final String TAG = "AccountPersonalFrag";
@@ -53,6 +53,9 @@ public class AccountPersonalDashboardFragment extends DashboardFragment {
@Override
protected int getPreferenceScreenResId() {
if (CredentialManager.isServiceEnabled()) {
return R.xml.accounts_personal_dashboard_settings_credman;
}
return R.xml.accounts_personal_dashboard_settings;
}
@@ -64,6 +67,13 @@ public class AccountPersonalDashboardFragment extends DashboardFragment {
@Override
public void onAttach(Context context) {
super.onAttach(context);
if (CredentialManager.isServiceEnabled()) {
CredentialManagerPreferenceController cmpp =
use(CredentialManagerPreferenceController.class);
cmpp.setParentFragment(this);
}
getSettingsLifecycle().addObserver(use(PasswordsPreferenceController.class));
}
@@ -77,11 +87,13 @@ public class AccountPersonalDashboardFragment extends DashboardFragment {
}
private static void buildAccountPreferenceControllers(
Context context, DashboardFragment parent, String[] authorities,
Context context,
DashboardFragment parent,
String[] authorities,
List<AbstractPreferenceController> controllers) {
final AccountPreferenceController accountPrefController =
new AccountPreferenceController(context, parent, authorities,
ProfileSelectFragment.ProfileType.PERSONAL);
new AccountPreferenceController(
context, parent, authorities, ProfileSelectFragment.ProfileType.PERSONAL);
if (parent != null) {
parent.getSettingsLifecycle().addObserver(accountPrefController);
}
@@ -91,15 +103,15 @@ public class AccountPersonalDashboardFragment extends DashboardFragment {
}
// TODO: b/141601408. After featureFlag settings_work_profile is launched, unmark this
// public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
// new BaseSearchIndexProvider(R.xml.accounts_personal_dashboard_settings) {
//
// @Override
// public List<AbstractPreferenceController> createPreferenceControllers(
// Context context) {
// ..Add autofill here too..
// return buildPreferenceControllers(
// context, null /* parent */, null /* authorities*/);
// }
// };
// public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
// new BaseSearchIndexProvider(R.xml.accounts_personal_dashboard_settings) {
//
// @Override
// public List<AbstractPreferenceController> createPreferenceControllers(
// Context context) {
// ..Add autofill here too..
// return buildPreferenceControllers(
// context, null /* parent */, null /* authorities*/);
// }
// };
}

46
src/com/android/settings/accounts/AccountWorkProfileDashboardFragment.java
View File

@@ -22,9 +22,11 @@ import static com.android.settings.accounts.AccountDashboardFragment.buildAutofi
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.credentials.CredentialManager;
import com.android.settings.R;
import com.android.settings.applications.autofill.PasswordsPreferenceController;
import com.android.settings.applications.credentials.CredentialManagerPreferenceController;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.dashboard.profileselector.ProfileSelectFragment;
import com.android.settings.users.AutoSyncDataPreferenceController;
@@ -34,9 +36,7 @@ import com.android.settingslib.core.AbstractPreferenceController;
import java.util.ArrayList;
import java.util.List;
/**
* Account Setting page for work profile.
*/
/** Account Setting page for work profile. */
public class AccountWorkProfileDashboardFragment extends DashboardFragment {
private static final String TAG = "AccountWorkProfileFrag";
@@ -53,6 +53,9 @@ public class AccountWorkProfileDashboardFragment extends DashboardFragment {
@Override
protected int getPreferenceScreenResId() {
if (CredentialManager.isServiceEnabled()) {
return R.xml.accounts_work_dashboard_settings_credman;
}
return R.xml.accounts_work_dashboard_settings;
}
@@ -64,6 +67,13 @@ public class AccountWorkProfileDashboardFragment extends DashboardFragment {
@Override
public void onAttach(Context context) {
super.onAttach(context);
if (CredentialManager.isServiceEnabled()) {
CredentialManagerPreferenceController cmpp =
use(CredentialManagerPreferenceController.class);
cmpp.setParentFragment(this);
}
getSettingsLifecycle().addObserver(use(PasswordsPreferenceController.class));
}
@@ -77,11 +87,13 @@ public class AccountWorkProfileDashboardFragment extends DashboardFragment {
}
private static void buildAccountPreferenceControllers(
Context context, DashboardFragment parent, String[] authorities,
Context context,
DashboardFragment parent,
String[] authorities,
List<AbstractPreferenceController> controllers) {
final AccountPreferenceController accountPrefController =
new AccountPreferenceController(context, parent, authorities,
ProfileSelectFragment.ProfileType.WORK);
new AccountPreferenceController(
context, parent, authorities, ProfileSelectFragment.ProfileType.WORK);
if (parent != null) {
parent.getSettingsLifecycle().addObserver(accountPrefController);
}
@@ -91,15 +103,15 @@ public class AccountWorkProfileDashboardFragment extends DashboardFragment {
}
// TODO: b/141601408. After featureFlag settings_work_profile is launched, unmark this
// public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
// new BaseSearchIndexProvider(R.xml.accounts_work_dashboard_settings) {
//
// @Override
// public List<AbstractPreferenceController> createPreferenceControllers(
// Context context) {
// ..Add autofill here too..
// return buildPreferenceControllers(
// context, null /* parent */, null /* authorities*/);
// }
// };
// public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
// new BaseSearchIndexProvider(R.xml.accounts_work_dashboard_settings) {
//
// @Override
// public List<AbstractPreferenceController> createPreferenceControllers(
// Context context) {
// ..Add autofill here too..
// return buildPreferenceControllers(
// context, null /* parent */, null /* authorities*/);
// }
// };
}