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

The new About > Account behavior

Browse Source 
- Change the display content of the summary while multiple accounts.
- Goto the Passwords & accounts page when users click Account item.

Fixes: 290593956
Test: atest BrandedAccountPreferenceControllerTest
Change-Id: Iae32803076d86455f52f2ffd278e06995161adfe
This commit is contained in:
Sunny Shao
2023-09-05 10:10:09 +08:00
parent 1d7a5e125b
commit b44fb93aa8
3 changed files with 64 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/com/android/settings/deviceinfo/BrandedAccountPreferenceController.java
View File

@@ -19,14 +19,13 @@ package com.android.settings.deviceinfo;
import android.accounts.Account;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.os.Bundle;
import android.text.TextUtils;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import com.android.settings.R;
import com.android.settings.accounts.AccountDetailDashboardFragment;
import com.android.settings.accounts.AccountDashboardFragment;
import com.android.settings.accounts.AccountFeatureProvider;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.core.SubSettingLauncher;
@@ -63,7 +62,11 @@ public class BrandedAccountPreferenceController extends BasePreferenceController
return;
}
accountPreference.setSummary(mAccounts[0].name);
if (mAccounts.length == 1) {
accountPreference.setSummary(mAccounts[0].name);
} else {
accountPreference.setSummary(getAccountSummary(mAccounts.length));
}
}
@Override
@@ -72,18 +75,9 @@ public class BrandedAccountPreferenceController extends BasePreferenceController
return false;
}
final Bundle args = new Bundle();
args.putParcelable(AccountDetailDashboardFragment.KEY_ACCOUNT,
mAccounts[0]);
args.putParcelable(AccountDetailDashboardFragment.KEY_USER_HANDLE,
android.os.Process.myUserHandle());
args.putString(AccountDetailDashboardFragment.KEY_ACCOUNT_TYPE,
mAccountFeatureProvider.getAccountType());
new SubSettingLauncher(mContext)
.setDestination(AccountDetailDashboardFragment.class.getName())
.setTitleRes(R.string.account_sync_title)
.setArguments(args)
.setDestination(AccountDashboardFragment.class.getName())
.setTitleRes(R.string.account_dashboard_title)
.setSourceMetricsCategory(SettingsEnums.DEVICEINFO)
.launch();
return true;
@@ -97,4 +91,9 @@ public class BrandedAccountPreferenceController extends BasePreferenceController
preference.setVisible(false);
}
}
private String getAccountSummary(int accountNo) {
return mContext.getResources()
.getString(R.string.my_device_info_account_preference_summary, accountNo);
}
}