Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c69f73f4 authored by Matthew Fritze's avatar Matthew Fritze
Browse files

Support getDynamicSummary in BasePreferenceController 

Adds dynamic summary getter in relevant BasePreferenceControllers.
Preferece controllers that don't have dynamic summaries or which
are not yet BasePreferenceControllers are not changed right now.

Change-Id: I435ccab7758d90515583fd8ca10a9b1ef0c858b9
Fixes: 71514936
Test: robotests
parent ce3633be

src/com/android/settings/applications/AppPermissionsPreferenceController.java

+2 −1
Original line number Diff line number Diff line
@@ -75,7 +75,8 @@ public class AppPermissionsPreferenceController extends AbstractPreferenceContro 
       The 3 permissions are the first three from the list which any app has granted:

       Location, Microphone, Camera, Sms, Contacts, and Phone

     */

    private String getSummary() {

    @Override

    public String getSummary() {

        final Set<String> permissions = getAllPermissionsInGroups();

        Set<String> grantedPermissionGroups = getGrantedPermissionGroups(permissions);

        CharSequence summary = null;

src/com/android/settings/applications/appinfo/DefaultAppShortcutPreferenceControllerBase.java

+9 −2
Original line number Diff line number Diff line
@@ -14,7 +14,6 @@ 


package com.android.settings.applications.appinfo;



import android.app.slice.Slice;

import android.content.Context;

import android.os.Bundle;

import android.os.UserManager;
@@ -52,7 +51,13 @@ public abstract class DefaultAppShortcutPreferenceControllerBase extends BasePre 


    @Override

    public void updateState(Preference preference) {

        preference.setSummary(isDefaultApp() ? R.string.yes : R.string.no);

        preference.setSummary(getSummary());

    }



    @Override

    public String getSummary() {

        int summaryResId = isDefaultApp() ? R.string.yes : R.string.no;

        return mContext.getString(summaryResId);

    }



    @Override
@@ -69,12 +74,14 @@ public abstract class DefaultAppShortcutPreferenceControllerBase extends BasePre 


    /**

     * Check whether the app has the default app capability

     *

     * @return true if the app has the default app capability

     */

    protected abstract boolean hasAppCapability();



    /**

     * Check whether the app is the default app

     *

     * @return true if the app is the default app

     */

    protected abstract boolean isDefaultApp();

src/com/android/settings/applications/appinfo/DrawOverlayDetailPreferenceController.java

+3 −5
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ import static android.Manifest.permission.SYSTEM_ALERT_WINDOW; 
import android.content.Context;

import android.content.pm.PackageInfo;

import android.os.UserManager;

import android.support.annotation.VisibleForTesting;

import android.support.v7.preference.Preference;



import com.android.settings.SettingsPreferenceFragment;
@@ -61,9 +60,8 @@ public class DrawOverlayDetailPreferenceController extends AppInfoPreferenceCont 
        return DrawOverlayDetails.class;

    }



    @VisibleForTesting

    CharSequence getSummary() {

        return DrawOverlayDetails.getSummary(mContext, mParent.getAppEntry());

    @Override

    public String getSummary() {

        return DrawOverlayDetails.getSummary(mContext, mParent.getAppEntry()).toString();

    }



}

src/com/android/settings/applications/appinfo/WriteSystemSettingsPreferenceController.java

+4 −5
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ import static android.Manifest.permission.WRITE_SETTINGS; 
import android.content.Context;

import android.content.pm.PackageInfo;

import android.os.UserManager;

import android.support.annotation.VisibleForTesting;

import android.support.v7.preference.Preference;



import com.android.settings.SettingsPreferenceFragment;
@@ -62,9 +61,9 @@ public class WriteSystemSettingsPreferenceController extends AppInfoPreferenceCo 
        return WriteSettingsDetails.class;

    }



    @VisibleForTesting

    CharSequence getSummary() {

        return WriteSettingsDetails.getSummary(mContext, mParent.getAppEntry());

    }

    @Override

    public String getSummary() {

        return WriteSettingsDetails.getSummary(mContext, mParent.getAppEntry()).toString();



    }

}

src/com/android/settings/backup/BackupSettingsActivityPreferenceController.java

+8 −5
Original line number Diff line number Diff line
@@ -23,8 +23,6 @@ import android.support.v7.preference.Preference; 


import com.android.settings.R;

import com.android.settings.core.BasePreferenceController;

import com.android.settings.core.PreferenceControllerMixin;

import com.android.settingslib.core.AbstractPreferenceController;



public class BackupSettingsActivityPreferenceController extends BasePreferenceController {

    private static final String TAG = "BackupSettingActivityPC";
@@ -49,10 +47,15 @@ public class BackupSettingsActivityPreferenceController extends BasePreferenceCo 


    @Override

    public void updateState(Preference preference) {

        preference.setSummary(getSummary());

    }



    @Override

    public String getSummary() {

        final boolean backupEnabled = mBackupManager.isBackupEnabled();



        preference.setSummary(backupEnabled

                ? R.string.accessibility_feature_state_on

                : R.string.accessibility_feature_state_off);

        return backupEnabled

                ? mContext.getString(R.string.accessibility_feature_state_on)

                : mContext.getString(R.string.accessibility_feature_state_off);

    }

}
 
 No newline at end of file