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

Add configs to display/hide a few tiles in device info page

Browse Source 
- Displaying/hiding Emergency info, branded account, device header
  widget are now driven by config flags
- Also refactored controllers to use BasePreferenceController

Change-Id: Ie601ebf689e0744c6a05a2cca5513fa43ef355e0
Fixes: 119607340
Test: robotests
This commit is contained in:
Fan Zhang
2019-01-28 13:10:32 -08:00
parent c2448a1e8c
commit 5c3301b0ab
11 changed files with 100 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -32,11 +32,10 @@ import com.android.settings.core.SubSettingLauncher;
import com.android.settings.overlay.FeatureFactory;
public class BrandedAccountPreferenceController extends BasePreferenceController {
private static final String KEY_PREFERENCE_TITLE = "branded_account";
private final Account[] mAccounts;
public BrandedAccountPreferenceController(Context context) {
super(context, KEY_PREFERENCE_TITLE);
public BrandedAccountPreferenceController(Context context, String key) {
super(context, key);
final AccountFeatureProvider accountFeatureProvider = FeatureFactory.getFactory(
mContext).getAccountFeatureProvider();
mAccounts = accountFeatureProvider.getAccounts(mContext);
@@ -44,6 +43,10 @@ public class BrandedAccountPreferenceController extends BasePreferenceController
@Override
public int getAvailabilityStatus() {
if (!mContext.getResources().getBoolean(
R.bool.config_show_branded_account_in_device_info)) {
return UNSUPPORTED_ON_DEVICE;
}
if (mAccounts != null && mAccounts.length > 0) {
return AVAILABLE;
}
@@ -55,7 +58,7 @@ public class BrandedAccountPreferenceController extends BasePreferenceController
super.displayPreference(screen);
final AccountFeatureProvider accountFeatureProvider = FeatureFactory.getFactory(
mContext).getAccountFeatureProvider();
final Preference accountPreference = screen.findPreference(KEY_PREFERENCE_TITLE);
final Preference accountPreference = screen.findPreference(getPreferenceKey());
if (accountPreference != null && (mAccounts == null || mAccounts.length == 0)) {
screen.removePreference(accountPreference);
return;