Add summary back to the homepage

Also update some summaries with new strings. Bug: 183586663 Test: robotests & atest & visual Change-Id: I692be9b34e8867501aaa8c8e40428870b99644f8
2021-05-05 23:49:06 +08:00
parent ad3dd1abbc
commit d1312e8e6e
22 changed files with 33 additions and 344 deletions
--- a/src/com/android/settings/accounts/TopLevelAccountEntryPreferenceController.java
+++ b/src/com/android/settings/accounts/TopLevelAccountEntryPreferenceController.java
@@ -17,11 +17,9 @@
 package com.android.settings.accounts;

 import android.content.Context;
-import android.util.FeatureFlagUtils;

 import com.android.settings.R;
 import com.android.settings.core.BasePreferenceController;
-import com.android.settings.core.FeatureFlags;

 public class TopLevelAccountEntryPreferenceController extends BasePreferenceController {
    public TopLevelAccountEntryPreferenceController(Context context, String preferenceKey) {
@@ -35,10 +33,6 @@ public class TopLevelAccountEntryPreferenceController extends BasePreferenceCont

    @Override
    public CharSequence getSummary() {
-        // Remove homepage summaries for silky home.
-        if (FeatureFlagUtils.isEnabled(mContext, FeatureFlags.SILKY_HOME)) {
-            return null;
-        }
        return mContext.getString(R.string.account_dashboard_default_summary);
    }
 }
--- a/src/com/android/settings/connecteddevice/TopLevelConnectedDevicesPreferenceController.java
+++ b/src/com/android/settings/connecteddevice/TopLevelConnectedDevicesPreferenceController.java
@@ -17,11 +17,9 @@
 package com.android.settings.connecteddevice;

 import android.content.Context;
-import android.util.FeatureFlagUtils;

 import com.android.settings.R;
 import com.android.settings.core.BasePreferenceController;
-import com.android.settings.core.FeatureFlags;

 public class TopLevelConnectedDevicesPreferenceController extends BasePreferenceController {

@@ -38,11 +36,6 @@ public class TopLevelConnectedDevicesPreferenceController extends BasePreference

    @Override
    public CharSequence getSummary() {
-        // Remove homepage summaries for silky home.
-        if (FeatureFlagUtils.isEnabled(mContext, FeatureFlags.SILKY_HOME)) {
-            return null;
-        }
-
        return mContext.getText(
                AdvancedConnectedDeviceController.getConnectedDevicesSummaryResourceId(mContext));
    }
--- a/src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java
+++ b/src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java
@@ -261,12 +261,6 @@ public class DashboardFeatureProviderImpl implements DashboardFeatureProvider {
    }

    private DynamicDataObserver bindSummaryAndGetObserver(Preference preference, Tile tile) {
-        // Skip binding homepage tile summaries for silky home.
-        if (FeatureFlagUtils.isEnabled(mContext, FeatureFlags.SILKY_HOME)
-                && TextUtils.equals(tile.getCategory(), CategoryKey.CATEGORY_HOMEPAGE)) {
-            return null;
-        }
-
        final CharSequence summary = tile.getSummary(mContext);
        if (summary != null) {
            preference.setSummary(summary);
--- a/src/com/android/settings/deviceinfo/TopLevelStoragePreferenceController.java
+++ b/src/com/android/settings/deviceinfo/TopLevelStoragePreferenceController.java
@@ -19,14 +19,12 @@ package com.android.settings.deviceinfo;
 import android.content.Context;
 import android.os.storage.StorageManager;
 import android.text.format.Formatter;
-import android.util.FeatureFlagUtils;

 import androidx.annotation.VisibleForTesting;
 import androidx.preference.Preference;

 import com.android.settings.R;
 import com.android.settings.core.BasePreferenceController;
-import com.android.settings.core.FeatureFlags;
 import com.android.settingslib.deviceinfo.PrivateStorageInfo;
 import com.android.settingslib.deviceinfo.StorageManagerVolumeProvider;
 import com.android.settingslib.utils.ThreadUtils;
@@ -52,11 +50,6 @@ public class TopLevelStoragePreferenceController extends BasePreferenceControlle

    @Override
    protected void refreshSummary(Preference preference) {
-        // Remove homepage summaries for silky home.
-        if (FeatureFlagUtils.isEnabled(mContext, FeatureFlags.SILKY_HOME)) {
-            return;
-        }
-
        if (preference == null) {
            return;
        }
--- a/src/com/android/settings/deviceinfo/aboutphone/TopLevelAboutDevicePreferenceController.java
+++ b/src/com/android/settings/deviceinfo/aboutphone/TopLevelAboutDevicePreferenceController.java
@@ -17,10 +17,8 @@
 package com.android.settings.deviceinfo.aboutphone;

 import android.content.Context;
-import android.util.FeatureFlagUtils;

 import com.android.settings.core.BasePreferenceController;
-import com.android.settings.core.FeatureFlags;
 import com.android.settings.deviceinfo.DeviceNamePreferenceController;

 public class TopLevelAboutDevicePreferenceController extends BasePreferenceController {
@@ -36,11 +34,6 @@ public class TopLevelAboutDevicePreferenceController extends BasePreferenceContr

    @Override
    public CharSequence getSummary() {
-        // Remove homepage summaries for silky home.
-        if (FeatureFlagUtils.isEnabled(mContext, FeatureFlags.SILKY_HOME)) {
-            return null;
-        }
-
        final DeviceNamePreferenceController deviceNamePreferenceController =
                new DeviceNamePreferenceController(mContext, "unused_key");
        return deviceNamePreferenceController.getSummary();
--- a/src/com/android/settings/display/TopLevelDisplayPreferenceController.java
+++ b/src/com/android/settings/display/TopLevelDisplayPreferenceController.java
@@ -17,11 +17,9 @@
 package com.android.settings.display;

 import android.content.Context;
-import android.util.FeatureFlagUtils;

 import com.android.settings.R;
 import com.android.settings.core.BasePreferenceController;
-import com.android.settings.core.FeatureFlags;

 public class TopLevelDisplayPreferenceController extends BasePreferenceController {

@@ -38,11 +36,6 @@ public class TopLevelDisplayPreferenceController extends BasePreferenceControlle

    @Override
    public CharSequence getSummary() {
-        // Remove homepage summaries for silky home.
-        if (FeatureFlagUtils.isEnabled(mContext, FeatureFlags.SILKY_HOME)) {
-            return null;
-        }
-
        final WallpaperPreferenceController controller =
                new WallpaperPreferenceController(mContext, "unused_key");
        if (controller.isAvailable()) {
--- a/src/com/android/settings/fuelgauge/TopLevelBatteryPreferenceController.java
+++ b/src/com/android/settings/fuelgauge/TopLevelBatteryPreferenceController.java
@@ -17,7 +17,6 @@
 package com.android.settings.fuelgauge;

 import android.content.Context;
-import android.util.FeatureFlagUtils;

 import androidx.annotation.VisibleForTesting;
 import androidx.preference.Preference;
@@ -25,7 +24,6 @@ import androidx.preference.PreferenceScreen;

 import com.android.settings.R;
 import com.android.settings.core.BasePreferenceController;
-import com.android.settings.core.FeatureFlags;
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settingslib.core.lifecycle.LifecycleObserver;
 import com.android.settingslib.core.lifecycle.events.OnStart;
@@ -87,10 +85,6 @@ public class TopLevelBatteryPreferenceController extends BasePreferenceControlle
    }

    private CharSequence getSummary(boolean batteryStatusUpdate) {
-        // Remove homepage summaries for silky home.
-        if (FeatureFlagUtils.isEnabled(mContext, FeatureFlags.SILKY_HOME)) {
-            return null;
-        }
        // Display help message if battery is not present.
        if (!mIsBatteryPresent) {
            return mContext.getText(R.string.battery_missing_message);
--- a/src/com/android/settings/location/TopLevelLocationPreferenceController.java
+++ b/src/com/android/settings/location/TopLevelLocationPreferenceController.java
@@ -11,7 +11,6 @@ import android.location.LocationManager;
 import android.os.UserHandle;
 import android.os.UserManager;
 import android.permission.PermissionControllerManager;
-import android.util.FeatureFlagUtils;

 import androidx.annotation.VisibleForTesting;
 import androidx.preference.Preference;
@@ -19,7 +18,6 @@ import androidx.preference.Preference;
 import com.android.settings.R;
 import com.android.settings.Utils;
 import com.android.settings.core.BasePreferenceController;
-import com.android.settings.core.FeatureFlags;
 import com.android.settingslib.core.lifecycle.LifecycleObserver;
 import com.android.settingslib.core.lifecycle.events.OnStart;
 import com.android.settingslib.core.lifecycle.events.OnStop;
@@ -52,11 +50,6 @@ public class TopLevelLocationPreferenceController extends BasePreferenceControll

    @Override
    public CharSequence getSummary() {
-        // Remove homepage summaries for silky home.
-        if (FeatureFlagUtils.isEnabled(mContext, FeatureFlags.SILKY_HOME)) {
-            return null;
-        }
-
        if (mLocationManager.isLocationEnabled()) {
            if (mNumTotal == -1) {
                return mContext.getString(R.string.location_settings_loading_app_permission_stats);
--- a/src/com/android/settings/network/TopLevelNetworkEntryPreferenceController.java
+++ b/src/com/android/settings/network/TopLevelNetworkEntryPreferenceController.java
@@ -20,12 +20,10 @@ import android.content.Context;
 import android.icu.text.ListFormatter;
 import android.text.BidiFormatter;
 import android.text.TextUtils;
-import android.util.FeatureFlagUtils;

 import com.android.settings.R;
 import com.android.settings.Utils;
 import com.android.settings.core.BasePreferenceController;
-import com.android.settings.core.FeatureFlags;
 import com.android.settings.wifi.WifiPrimarySwitchPreferenceController;

 import java.util.ArrayList;
@@ -53,11 +51,6 @@ public class TopLevelNetworkEntryPreferenceController extends BasePreferenceCont

    @Override
    public CharSequence getSummary() {
-        // Remove homepage summaries for silky home.
-        if (FeatureFlagUtils.isEnabled(mContext, FeatureFlags.SILKY_HOME)) {
-            return null;
-        }
-
        final String wifiSummary = BidiFormatter.getInstance()
                .unicodeWrap(mContext.getString(R.string.wifi_settings_title));
        final String mobileSummary = mContext.getString(
--- a/src/com/android/settings/security/TopLevelSecurityEntryPreferenceController.java
+++ b/src/com/android/settings/security/TopLevelSecurityEntryPreferenceController.java
@@ -17,17 +17,11 @@
 package com.android.settings.security;

 import android.content.Context;
-import android.hardware.face.FaceManager;
-import android.hardware.fingerprint.FingerprintManager;
 import android.text.TextUtils;
-import android.util.FeatureFlagUtils;

 import androidx.preference.Preference;

-import com.android.settings.R;
-import com.android.settings.Utils;
 import com.android.settings.core.BasePreferenceController;
-import com.android.settings.core.FeatureFlags;
 import com.android.settings.core.SubSettingLauncher;
 import com.android.settings.overlay.FeatureFactory;

@@ -42,26 +36,6 @@ public class TopLevelSecurityEntryPreferenceController extends BasePreferenceCon
        return AVAILABLE;
    }

-    @Override
-    public CharSequence getSummary() {
-        // Remove homepage summaries for silky home.
-        if (FeatureFlagUtils.isEnabled(mContext, FeatureFlags.SILKY_HOME)) {
-            return null;
-        }
-
-        final FingerprintManager fpm =
-                Utils.getFingerprintManagerOrNull(mContext);
-        final FaceManager faceManager =
-                Utils.getFaceManagerOrNull(mContext);
-        if (faceManager != null && faceManager.isHardwareDetected()) {
-            return mContext.getText(R.string.security_dashboard_summary_face);
-        } else if (fpm != null && fpm.isHardwareDetected()) {
-            return mContext.getText(R.string.security_dashboard_summary);
-        } else {
-            return mContext.getText(R.string.security_dashboard_summary_no_fingerprint);
-        }
-    }
-
    @Override
    public boolean handlePreferenceTreeClick(Preference preference) {
        if (!TextUtils.equals(preference.getKey(), getPreferenceKey())) {