From 4a60c8876e0960ce1c7dfa7cbcf5eb07f2f701aa Mon Sep 17 00:00:00 2001
From: Jason Monk <jmonk@google.com>
Date: Tue, 26 Jan 2016 17:21:04 -0500
Subject: [PATCH 1/2] Add DND Suggestion after 30 days

Suggest users setup automatic rules if they haven't after 30 days

Also fix the id labeling for the RV adapter, so that it can handle
removing of suggestions properly.

Change-Id: I0cce76f3db1d444011f7d8a31348714d102650cf
---
 AndroidManifest.xml                           | 17 ++++++
 res/values/strings.xml                        |  3 +
 res/xml/suggestion_ordering.xml               |  2 +
 src/com/android/settings/Settings.java        |  1 +
 .../settings/dashboard/DashboardAdapter.java  | 57 +++++++++++++------
 .../settings/dashboard/SuggestionsChecks.java | 55 ++++++++++++++++++
 6 files changed, 118 insertions(+), 17 deletions(-)
 create mode 100644 src/com/android/settings/dashboard/SuggestionsChecks.java

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 90d87933c5e..8e58f489161 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -813,6 +813,23 @@
                 android:value="true" />
         </activity>
 
+        <activity android:name="Settings$ZenModeAutomationSuggestionActivity"
+                android:label="@string/zen_mode_automation_settings_title"
+                android:icon="@drawable/ic_settings_notifications"
+                android:exported="true"
+                android:taskAffinity="">
+            <intent-filter android:priority="1">
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="com.android.settings.suggested.category.SETTINGS_ONLY" />
+            </intent-filter>
+            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+                android:value="com.android.settings.notification.ZenModeAutomationSettings" />
+            <meta-data android:name="com.android.settings.dismiss"
+                android:value="30" />
+            <meta-data android:name="com.android.settings.title"
+                android:resource="@string/zen_mode_automation_suggestion_title" />
+        </activity>
+
         <activity android:name="Settings$ZenModeScheduleRuleSettingsActivity"
                 android:exported="true"
                 android:taskAffinity="">
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 9336feeb791..b510872eebd 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -5768,6 +5768,9 @@
     <!--  Do not disturb: Title for the zen mode automation option and associated settings page. [CHAR LIMIT=30] -->
     <string name="zen_mode_automation_settings_title">Automatic rules</string>
 
+    <!--  Do not disturb: Title for the zen mode automation option Suggestion. [CHAR LIMIT=30] -->
+    <string name="zen_mode_automation_suggestion_title">Set up Do Not Disturb Schedule</string>
+
     <!--  Do not disturb: Zen mode option: Important interruptions [CHAR LIMIT=60] -->
     <string name="zen_mode_option_important_interruptions">Priority only</string>
 
diff --git a/res/xml/suggestion_ordering.xml b/res/xml/suggestion_ordering.xml
index 339b195bc1f..55f7803be44 100644
--- a/res/xml/suggestion_ordering.xml
+++ b/res/xml/suggestion_ordering.xml
@@ -22,4 +22,6 @@
         multiple="true" />
     <step category="com.android.settings.suggested.category.DEFAULT"
         multiple="true" />
+    <step category="com.android.settings.suggested.category.SETTINGS_ONLY"
+        multiple="true" />
 </optional-steps>
diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java
index 1c636b8d807..99e69683548 100644
--- a/src/com/android/settings/Settings.java
+++ b/src/com/android/settings/Settings.java
@@ -103,6 +103,7 @@ public class Settings extends SettingsActivity {
     public static class ZenModeSettingsActivity extends SettingsActivity { /* empty */ }
     public static class ZenModePrioritySettingsActivity extends SettingsActivity { /* empty */ }
     public static class ZenModeAutomationSettingsActivity extends SettingsActivity { /* empty */ }
+    public static class ZenModeAutomationSuggestionActivity extends SettingsActivity { /* empty */ }
     public static class ZenModeScheduleRuleSettingsActivity extends SettingsActivity { /* empty */ }
     public static class ZenModeEventRuleSettingsActivity extends SettingsActivity { /* empty */ }
     public static class ZenModeExternalRuleSettingsActivity extends SettingsActivity { /* empty */ }
diff --git a/src/com/android/settings/dashboard/DashboardAdapter.java b/src/com/android/settings/dashboard/DashboardAdapter.java
index 0d92c620d49..f40fa9cecd6 100644
--- a/src/com/android/settings/dashboard/DashboardAdapter.java
+++ b/src/com/android/settings/dashboard/DashboardAdapter.java
@@ -43,6 +43,10 @@ import java.util.List;
 public class DashboardAdapter extends RecyclerView.Adapter<DashboardAdapter.DashboardItemHolder>
         implements View.OnClickListener {
     public static final String TAG = "DashboardAdapter";
+    private static final int NS_SPACER = 0;
+    private static final int NS_SUGGESTION = 1000;
+    private static final int NS_ITEMS = 2000;
+    private static final int NS_CONDITION = 3000;
 
     private static int SUGGESTION_MODE_DEFAULT = 0;
     private static int SUGGESTION_MODE_COLLAPSED = 1;
@@ -55,6 +59,7 @@ public class DashboardAdapter extends RecyclerView.Adapter<DashboardAdapter.Dash
     private final List<Integer> mIds = new ArrayList<>();
 
     private final Context mContext;
+    private final SuggestionsChecks mSuggestionsChecks;
 
     private List<DashboardCategory> mCategories;
     private List<Condition> mConditions;
@@ -71,13 +76,20 @@ public class DashboardAdapter extends RecyclerView.Adapter<DashboardAdapter.Dash
 
     public DashboardAdapter(Context context) {
         mContext = context;
+        mSuggestionsChecks = new SuggestionsChecks(mContext);
 
         setHasStableIds(true);
     }
 
     public void setSuggestions(SuggestionParser suggestionParser) {
-        mSuggestions = suggestionParser.getSuggestions();
         mSuggestionParser = suggestionParser;
+        mSuggestions = suggestionParser.getSuggestions();
+        for (int i = 0; i < mSuggestions.size(); i++) {
+            if (mSuggestionsChecks.isSuggestionComplete(mSuggestions.get(i))) {
+                disableSuggestion(mSuggestions.get(i));
+                mSuggestions.remove(i--);
+            }
+        }
         recountItems();
     }
 
@@ -127,35 +139,42 @@ public class DashboardAdapter extends RecyclerView.Adapter<DashboardAdapter.Dash
         for (int i = 0; mConditions != null && i < mConditions.size(); i++) {
             boolean shouldShow = mConditions.get(i).shouldShow();
             hasConditions |= shouldShow;
-            countItem(mConditions.get(i), R.layout.condition_card, shouldShow);
+            countItem(mConditions.get(i), R.layout.condition_card, shouldShow, NS_CONDITION);
         }
         boolean hasSuggestions = mSuggestions != null && mSuggestions.size() != 0;
-        countItem(null, R.layout.dashboard_spacer, hasConditions && hasSuggestions);
-        countItem(null, R.layout.suggestion_header, hasSuggestions);
+        countItem(null, R.layout.dashboard_spacer, hasConditions && hasSuggestions, NS_SPACER);
+        countItem(null, R.layout.suggestion_header, hasSuggestions, NS_SPACER);
+        resetCount();
         if (mSuggestions != null) {
             int maxSuggestions = mSuggestionMode == SUGGESTION_MODE_DEFAULT
                     ? Math.min(DEFAULT_SUGGESTION_COUNT, mSuggestions.size())
                     : mSuggestionMode == SUGGESTION_MODE_EXPANDED ? mSuggestions.size()
                     : 0;
             for (int i = 0; i < mSuggestions.size(); i++) {
-                countItem(mSuggestions.get(i), R.layout.suggestion_tile, i < maxSuggestions);
+                countItem(mSuggestions.get(i), R.layout.suggestion_tile, i < maxSuggestions,
+                        NS_SUGGESTION);
             }
         }
-        countItem(null, R.layout.dashboard_spacer, true);
+        countItem(null, R.layout.dashboard_spacer, true, NS_SPACER);
+        resetCount();
         for (int i = 0; mCategories != null && i < mCategories.size(); i++) {
             DashboardCategory category = mCategories.get(i);
-            countItem(category, R.layout.dashboard_category, mIsShowingAll);
+            countItem(category, R.layout.dashboard_category, mIsShowingAll, NS_ITEMS);
             for (int j = 0; j < category.tiles.size(); j++) {
                 Tile tile = category.tiles.get(j);
                 countItem(tile, R.layout.dashboard_tile, mIsShowingAll
                         || ArrayUtils.contains(DashboardSummary.INITIAL_ITEMS,
-                        tile.intent.getComponent().getClassName()));
+                        tile.intent.getComponent().getClassName()), NS_ITEMS);
             }
         }
-        countItem(null, R.layout.see_all, true);
+        countItem(null, R.layout.see_all, true, NS_ITEMS);
         notifyDataSetChanged();
     }
 
+    private void resetCount() {
+        mId = 0;
+    }
+
     private void reset() {
         mItems.clear();
         mTypes.clear();
@@ -163,12 +182,12 @@ public class DashboardAdapter extends RecyclerView.Adapter<DashboardAdapter.Dash
         mId = 0;
     }
 
-    private void countItem(Object object, int type, boolean add) {
+    private void countItem(Object object, int type, boolean add, int nameSpace) {
         if (add) {
             mItems.add(object);
             mTypes.add(type);
             // TODO: Counting namespaces for handling of suggestions/conds appearing/disappearing.
-            mIds.add(mId);
+            mIds.add(mId + nameSpace);
         }
         mId++;
     }
@@ -238,12 +257,7 @@ public class DashboardAdapter extends RecyclerView.Adapter<DashboardAdapter.Dash
                 new MenuItem.OnMenuItemClickListener() {
             @Override
             public boolean onMenuItemClick(MenuItem item) {
-                if (mSuggestionParser.dismissSuggestion(suggestion)) {
-                    mContext.getPackageManager().setComponentEnabledSetting(
-                            suggestion.intent.getComponent(),
-                            PackageManager.COMPONENT_ENABLED_STATE_DISABLED,
-                            PackageManager.DONT_KILL_APP);
-                }
+                disableSuggestion(suggestion);
                 mSuggestions.remove(suggestion);
                 recountItems();
                 return true;
@@ -252,6 +266,15 @@ public class DashboardAdapter extends RecyclerView.Adapter<DashboardAdapter.Dash
         popup.show();
     }
 
+    private void disableSuggestion(Tile suggestion) {
+        if (mSuggestionParser.dismissSuggestion(suggestion)) {
+            mContext.getPackageManager().setComponentEnabledSetting(
+                    suggestion.intent.getComponent(),
+                    PackageManager.COMPONENT_ENABLED_STATE_DISABLED,
+                    PackageManager.DONT_KILL_APP);
+        }
+    }
+
     private void onBindSuggestionHeader(final DashboardItemHolder holder) {
         holder.icon.setImageResource(hasMoreSuggestions() ? R.drawable.ic_expand_more
                 : R.drawable.ic_expand_less);
diff --git a/src/com/android/settings/dashboard/SuggestionsChecks.java b/src/com/android/settings/dashboard/SuggestionsChecks.java
new file mode 100644
index 00000000000..b8a03c4eead
--- /dev/null
+++ b/src/com/android/settings/dashboard/SuggestionsChecks.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the
+ * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package com.android.settings.dashboard;
+
+import android.app.AutomaticZenRule;
+import android.app.NotificationManager;
+import android.content.Context;
+import com.android.settings.Settings.ZenModeAutomationSuggestionActivity;
+import com.android.settingslib.drawer.Tile;
+
+import java.util.List;
+
+/**
+ * The Home of all stupidly dynamic Settings Suggestions checks.
+ */
+public class SuggestionsChecks {
+
+    private final Context mContext;
+
+    public SuggestionsChecks(Context context) {
+        mContext = context;
+    }
+
+    public boolean isSuggestionComplete(Tile suggestion) {
+        if (suggestion.intent.getComponent().getClassName().equals(
+                ZenModeAutomationSuggestionActivity.class.getName())) {
+            return hasEnabledZenAutoRules();
+        }
+        return false;
+    }
+
+    private boolean hasEnabledZenAutoRules() {
+        List<AutomaticZenRule> zenRules = NotificationManager.from(mContext).getAutomaticZenRules();
+        final int N = zenRules.size();
+        for (int i = 0; i < N; i++) {
+            if (zenRules.get(i).isEnabled()) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+}

From b9e5d238b64abf3a45f148b43b8d8fcca912d976 Mon Sep 17 00:00:00 2001
From: Jason Monk <jmonk@google.com>
Date: Tue, 26 Jan 2016 17:43:57 -0500
Subject: [PATCH 2/2] Add wallpaper suggestion if one isn't set.

Change-Id: I81380323f0d4f5af842a81028a763219958833bc
---
 AndroidManifest.xml                           | 14 +++++++++
 res/values/strings.xml                        |  2 ++
 src/com/android/settings/Settings.java        |  2 ++
 .../android/settings/SettingsActivity.java    |  1 +
 .../settings/dashboard/SuggestionsChecks.java | 30 +++++++++++++++++--
 5 files changed, 47 insertions(+), 2 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 8e58f489161..a0b2b77200e 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -830,6 +830,20 @@
                 android:resource="@string/zen_mode_automation_suggestion_title" />
         </activity>
 
+        <activity android:name="Settings$WallpaperSuggestionActivity"
+                android:label="@string/wallpaper_settings_title"
+                android:exported="true"
+                android:taskAffinity="">
+            <intent-filter android:priority="1">
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="com.android.settings.suggested.category.SETTINGS_ONLY" />
+            </intent-filter>
+            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+                android:value="com.android.settings.WallpaperTypeSettings" />
+            <meta-data android:name="com.android.settings.title"
+                android:resource="@string/wallpaper_suggestion_title" />
+        </activity>
+
         <activity android:name="Settings$ZenModeScheduleRuleSettingsActivity"
                 android:exported="true"
                 android:taskAffinity="">
diff --git a/res/values/strings.xml b/res/values/strings.xml
index b510872eebd..086797b7266 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -2064,6 +2064,8 @@
     <string name="screen_timeout_summary">After <xliff:g id="timeout_description">%1$s</xliff:g> of inactivity</string>
     <!-- Wallpaper settings title [CHAR LIMIT=30] -->
     <string name="wallpaper_settings_title">Wallpaper</string>
+    <!-- Wallpaper suggestion title [CHAR LIMIT=30] -->
+    <string name="wallpaper_suggestion_title">Set up wallpaper</string>
     <!-- Wallpaper settings fragment title [CHAR LIMIT=30] -->
     <string name="wallpaper_settings_fragment_title">Choose wallpaper from</string>
     <!-- Display settings screen, trigger for screen saver options -->
diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java
index 99e69683548..41412747b40 100644
--- a/src/com/android/settings/Settings.java
+++ b/src/com/android/settings/Settings.java
@@ -125,6 +125,8 @@ public class Settings extends SettingsActivity {
     public static class AppWriteSettingsActivity extends SettingsActivity { /* empty */ }
     public static class ManageDefaultAppsActivity extends SettingsActivity { /* empty */ }
 
+    public static class WallpaperSuggestionActivity extends SettingsActivity { /* empty */ }
+
     // Categories.
     public static class WirelessSettings extends SettingsActivity { /* empty */ }
     public static class DeviceSettings extends SettingsActivity { /* empty */ }
diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java
index a375cb15040..32888601856 100644
--- a/src/com/android/settings/SettingsActivity.java
+++ b/src/com/android/settings/SettingsActivity.java
@@ -314,6 +314,7 @@ public class SettingsActivity extends SettingsDrawerActivity
             DrawOverlayDetails.class.getName(),
             WriteSettingsDetails.class.getName(),
             ManageDefaultApps.class.getName(),
+            WallpaperTypeSettings.class.getName(),
     };
 
 
diff --git a/src/com/android/settings/dashboard/SuggestionsChecks.java b/src/com/android/settings/dashboard/SuggestionsChecks.java
index b8a03c4eead..b483ac7ed04 100644
--- a/src/com/android/settings/dashboard/SuggestionsChecks.java
+++ b/src/com/android/settings/dashboard/SuggestionsChecks.java
@@ -15,8 +15,16 @@
 package com.android.settings.dashboard;
 
 import android.app.AutomaticZenRule;
+import android.app.IWallpaperManager;
+import android.app.IWallpaperManager.Stub;
+import android.app.IWallpaperManagerCallback;
 import android.app.NotificationManager;
 import android.content.Context;
+import android.os.Bundle;
+import android.os.IBinder;
+import android.os.RemoteException;
+import android.os.ServiceManager;
+import com.android.settings.Settings.WallpaperSuggestionActivity;
 import com.android.settings.Settings.ZenModeAutomationSuggestionActivity;
 import com.android.settingslib.drawer.Tile;
 
@@ -34,9 +42,11 @@ public class SuggestionsChecks {
     }
 
     public boolean isSuggestionComplete(Tile suggestion) {
-        if (suggestion.intent.getComponent().getClassName().equals(
-                ZenModeAutomationSuggestionActivity.class.getName())) {
+        String className = suggestion.intent.getComponent().getClassName();
+        if (className.equals(ZenModeAutomationSuggestionActivity.class.getName())) {
             return hasEnabledZenAutoRules();
+        } else if (className.equals(WallpaperSuggestionActivity.class.getName())) {
+            return hasWallpaperSet();
         }
         return false;
     }
@@ -52,4 +62,20 @@ public class SuggestionsChecks {
         return false;
     }
 
+    private boolean hasWallpaperSet() {
+        IBinder b = ServiceManager.getService(Context.WALLPAPER_SERVICE);
+        IWallpaperManager service = Stub.asInterface(b);
+        try {
+            return service.getWallpaper(mCallback, new Bundle()) != null;
+        } catch (RemoteException e) {
+        }
+        return false;
+    }
+
+    private final IWallpaperManagerCallback mCallback = new IWallpaperManagerCallback.Stub() {
+        @Override
+        public void onWallpaperChanged() throws RemoteException {
+             // Don't care.
+        }
+    };
 }