From b1b7deb41ba7ec9e2b99331993855295116c6904 Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Fri, 26 May 2017 09:49:24 +0530 Subject: [PATCH] DevelopmentSettings: Add dynamic dashboard summary Dashboard summary changes with ADB toggle's value Change-Id: I4daf82f3258562a5a54a30f2094f1793d41757e4 --- res/values/aosip_strings.xml | 5 ++- .../android/settings/DevelopmentSettings.java | 36 ++++++++++++++++++- 2 files changed, 39 insertions(+), 2 deletions(-) diff --git a/res/values/aosip_strings.xml b/res/values/aosip_strings.xml index 81e44dbf53e..f043c4c03ba 100644 --- a/res/values/aosip_strings.xml +++ b/res/values/aosip_strings.xml @@ -257,7 +257,10 @@ Enable camera shutter sound Disabling the camera shutter sound is illegal in some areas! Please check the applicable law in your country - + Volume adjustment sounds + + ADB Enabled + ADB Disabled diff --git a/src/com/android/settings/DevelopmentSettings.java b/src/com/android/settings/DevelopmentSettings.java index 1f54f19dce8..258ea79b06a 100644 --- a/src/com/android/settings/DevelopmentSettings.java +++ b/src/com/android/settings/DevelopmentSettings.java @@ -84,6 +84,7 @@ import com.android.internal.app.LocalePicker; import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.settings.applications.BackgroundCheckSummary; +import com.android.settings.dashboard.SummaryLoader; import com.android.settings.fuelgauge.InactiveApps; import com.android.settings.search.BaseSearchIndexProvider; import com.android.settings.search.Indexable; @@ -94,7 +95,6 @@ import com.android.settings.util.Helpers; import dalvik.system.VMRuntime; - import java.util.ArrayList; import java.util.Arrays; import java.util.HashSet; @@ -2478,4 +2478,38 @@ private boolean isOemUnlockAllowed() { return !(mUm.hasBaseUserRestriction(UserManager.DISALLOW_OEM_UNLOCK, userHandle) || mUm.hasBaseUserRestriction(UserManager.DISALLOW_FACTORY_RESET, userHandle)); } + + private static class SummaryProvider implements SummaryLoader.SummaryProvider { + + private final Context mContext; + private final SummaryLoader mSummaryLoader; + private ContentResolver resolver; + + public SummaryProvider(Context context, SummaryLoader summaryLoader) { + mContext = context; + mSummaryLoader = summaryLoader; + resolver = mContext.getContentResolver(); + } + + @Override + public void setListening(boolean listening) { + if (listening) { + boolean adbEnabled = Settings.Global.getInt(resolver, + Settings.Global.ADB_ENABLED, 0) != 0; + String newSummary = adbEnabled ? mContext.getString(R.string.adb_enabled) + : mContext.getString(R.string.adb_disabled); + mSummaryLoader.setSummary(this, newSummary); + } + } + } + + public static final SummaryLoader.SummaryProviderFactory SUMMARY_PROVIDER_FACTORY + = new SummaryLoader.SummaryProviderFactory() { + @Override + public SummaryLoader.SummaryProvider createSummaryProvider(Activity activity, + SummaryLoader summaryLoader) { + return new SummaryProvider(activity, summaryLoader); + } + }; + }