Merge tag 'android-4.3_r2.1' into cm-10.2cm-10.2.1cm-10.2.0cm-10.2-M1stable/cm-10.2cm-10.2

Android 4.3 release 2.1

1 files changed, 21 insertions, 1 deletions

diff --git a/src/com/android/dreams/phototable/AlbumSettings.java b/src/com/android/dreams/phototable/AlbumSettings.java
index 23dda46..1ccd498 100644
--- a/src/com/android/dreams/phototable/AlbumSettings.java
+++ b/src/com/android/dreams/phototable/AlbumSettings.java
@@ -51,11 +51,16 @@ public class AlbumSettings {
 
     public boolean isAlbumEnabled(String albumId) {
         synchronized (mEnabledAlbums) {
-            boolean isEnabled = mEnabledAlbums.contains(albumId);
             return mEnabledAlbums.contains(albumId);
         }
     }
 
+    public boolean areAllEnabled(Collection<String> validAlbums) {
+        synchronized (mEnabledAlbums) {
+            return mEnabledAlbums.containsAll(validAlbums);
+        }
+    }
+
     public void setAlbumEnabled(String albumId, boolean enabled) {
         if (isAlbumEnabled(albumId) != enabled) {
             synchronized (mEnabledAlbums) {
@@ -70,6 +75,21 @@ public class AlbumSettings {
         }
     }
 
+    public void disableAllAlbums() {
+        synchronized (mEnabledAlbums) {
+            mEnabledAlbums.clear();
+            writeEnabledAlbumsLocked();
+        }
+    }
+
+    public void enableAllAlbums(Collection<String> validAlbums) {
+        synchronized (mEnabledAlbums) {
+            mEnabledAlbums.clear();
+            mEnabledAlbums.addAll(validAlbums);
+            writeEnabledAlbumsLocked();
+        }
+    }
+
     public void pruneObsoleteSettings(Collection<String> validAlbums) {
         if (!validAlbums.containsAll(mEnabledAlbums)) {
             synchronized (mEnabledAlbums) {