Merge "Add Intentfilter BasePreferenceController" into pi-dev

src/com/android/settings/core/BasePreferenceController.java

@@ -15,6 +15,7 @@ package com.android.settings.core;
 
 import android.annotation.IntDef;
 import android.content.Context;
+import android.content.IntentFilter;
 import android.text.TextUtils;
 import android.util.Log;
 
@@ -220,6 +221,14 @@ public abstract class BasePreferenceController extends AbstractPreferenceControl
         return SliceData.SliceType.INTENT;
     }
 
+    /**
+     * @return an {@link IntentFilter} that includes all broadcasts which can affect the state of
+     * this Setting.
+     */
+    public IntentFilter getIntentFilter() {
+        return null;
+    }
+
     /**
      * Updates non-indexable keys for search provider.
      *

src/com/android/settings/notification/AdjustVolumeRestrictedPreferenceController.java

@@ -17,6 +17,8 @@
 package com.android.settings.notification;
 
 import android.content.Context;
+import android.content.IntentFilter;
+import android.media.AudioManager;
 import android.os.UserHandle;
 import android.os.UserManager;
 import android.support.v7.preference.Preference;
@@ -57,4 +59,12 @@ public abstract class AdjustVolumeRestrictedPreferenceController extends
                 UserManager.DISALLOW_ADJUST_VOLUME, UserHandle.myUserId());
     }
 
+    @Override
+    public IntentFilter getIntentFilter() {
+        final IntentFilter filter = new IntentFilter();
+        filter.addAction(AudioManager.VOLUME_CHANGED_ACTION);
+        filter.addAction(AudioManager.STREAM_MUTE_CHANGED_ACTION);
+        filter.addAction(AudioManager.MASTER_MUTE_CHANGED_ACTION);
+        return filter;
+    }
 }

src/com/android/settings/slices/SettingsSliceProvider.java

@@ -22,7 +22,6 @@ import android.app.slice.SliceManager;
 import android.content.ContentResolver;
 import android.content.Intent;
 import android.content.IntentFilter;
-import android.content.Context;
 import android.net.Uri;
 import android.provider.SettingsSlicesContract;
 import android.support.annotation.VisibleForTesting;
@@ -33,6 +32,7 @@ import android.util.Log;
 import android.util.Pair;
 
 import com.android.settings.overlay.FeatureFactory;
+import com.android.settings.core.BasePreferenceController;
 import com.android.settings.wifi.WifiSliceBuilder;
 import com.android.settings.wifi.calling.WifiCallingSliceHelper;
 import com.android.settings.notification.ZenModeSliceBuilder;
@@ -143,8 +143,6 @@ public class SettingsSliceProvider extends SliceProvider {
     public void onSlicePinned(Uri sliceUri) {
         if (WifiSliceBuilder.WIFI_URI.equals(sliceUri)) {
             registerIntentToUri(WifiSliceBuilder.INTENT_FILTER , sliceUri);
-            // TODO (b/) Register IntentFilters for database entries.
-            mRegisteredUris.add(sliceUri);
             return;
         } else if (ZenModeSliceBuilder.ZEN_MODE_URI.equals(sliceUri)) {
             registerIntentToUri(ZenModeSliceBuilder.INTENT_FILTER, sliceUri);
@@ -159,6 +157,7 @@ public class SettingsSliceProvider extends SliceProvider {
     @Override
     public void onSliceUnpinned(Uri sliceUri) {
         if (mRegisteredUris.contains(sliceUri)) {
+            Log.d(TAG, "Unregistering uri broadcast relay: " + sliceUri);
             SliceBroadcastRelay.unregisterReceivers(getContext(), sliceUri);
             mRegisteredUris.remove(sliceUri);
         }
@@ -280,7 +279,15 @@ public class SettingsSliceProvider extends SliceProvider {
         long startBuildTime = System.currentTimeMillis();
 
         final SliceData sliceData = mSlicesDatabaseAccessor.getSliceDataFromUri(uri);
-        List<Uri> pinnedSlices = getContext().getSystemService(
+
+        final BasePreferenceController controller = SliceBuilderUtils.getPreferenceController(
+                getContext(), sliceData);
+        final IntentFilter filter = controller.getIntentFilter();
+        if (filter != null) {
+            registerIntentToUri(filter, uri);
+        }
+
+        final List<Uri> pinnedSlices = getContext().getSystemService(
                 SliceManager.class).getPinnedSlices();
         if (pinnedSlices.contains(uri)) {
             mSliceDataCache.put(uri, sliceData);
@@ -333,6 +340,8 @@ public class SettingsSliceProvider extends SliceProvider {
      * {@param intentFilter} happen.
      */
     void registerIntentToUri(IntentFilter intentFilter, Uri sliceUri) {
+        Log.d(TAG, "Registering Uri for broadcast relay: " + sliceUri);
+        mRegisteredUris.add(sliceUri);
         SliceBroadcastRelay.registerReceiver(getContext(), sliceUri, SliceBroadcastReceiver.class,
                 intentFilter);
     }