Merge "Go to the old storage settings when using non-internal storage."
diff --git a/res/layout/preference_footer.xml b/res/layout/preference_footer.xml
index 64fad74..e336ac1 100644
--- a/res/layout/preference_footer.xml
+++ b/res/layout/preference_footer.xml
@@ -42,7 +42,7 @@
android:layout_height="wrap_content"/>
</LinearLayout>
- <com.android.settings.widget.LinkTextView
+ <com.android.settingslib.widget.LinkTextView
android:id="@android:id/title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
diff --git a/res/layout/support_disclaimer_content.xml b/res/layout/support_disclaimer_content.xml
index 196bef2..1e81f1a 100644
--- a/res/layout/support_disclaimer_content.xml
+++ b/res/layout/support_disclaimer_content.xml
@@ -23,7 +23,7 @@
android:orientation="vertical"
android:padding="24dp">
- <com.android.settings.widget.LinkTextView
+ <com.android.settingslib.widget.LinkTextView
android:id="@+id/support_disclaimer_text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 099a290..2879002 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -7004,8 +7004,8 @@
<!-- Label for list to control apps that ignore battery saving restrictions [CHAR LIMIT=27]-->
<string name="high_power_apps">Battery optimization</string>
- <!-- Label for menu to launch additional battery info -->
- <string name="additional_battery_info" translatable="false">Additional battery info</string>
+ <!-- Label for menu to launch a screen showing usage alerts for battery [CHAR LIMIT=30] -->
+ <string name="additional_battery_info">Usage alerts</string>
<!-- Filter for apps allowed to use a lot of power [CHAR LIMIT=25] -->
<string name="high_power_filter_on">Not optimized</string>
diff --git a/res/xml/location_settings.xml b/res/xml/location_settings.xml
index ecce221..adfff63 100644
--- a/res/xml/location_settings.xml
+++ b/res/xml/location_settings.xml
@@ -37,7 +37,12 @@
<!-- This preference category gets removed if new_recent_location_ui is disabled -->
<Preference
android:key="app_level_permissions"
- android:title="@string/location_app_level_permissions" />
+ android:title="@string/location_app_level_permissions">
+ <intent android:action="android.intent.action.MANAGE_PERMISSION_APPS">
+ <extra android:name="android.intent.extra.PERMISSION_NAME"
+ android:value="android.permission-group.LOCATION" />
+ </intent>
+ </Preference>
<com.android.settings.DividedCategory
android:key="recent_location_requests"
diff --git a/src/com/android/settings/AllowBindAppWidgetActivity.java b/src/com/android/settings/AllowBindAppWidgetActivity.java
index c3bf78a..2f98ab3 100644
--- a/src/com/android/settings/AllowBindAppWidgetActivity.java
+++ b/src/com/android/settings/AllowBindAppWidgetActivity.java
@@ -42,6 +42,7 @@
private CheckBox mAlwaysUse;
private int mAppWidgetId;
+ private Bundle mBindOptions;
private UserHandle mProfile;
private ComponentName mComponentName;
private String mCallingPackage;
@@ -57,7 +58,7 @@
if (mAppWidgetId != -1 && mComponentName != null && mCallingPackage != null) {
try {
final boolean bound = mAppWidgetManager.bindAppWidgetIdIfAllowed(mAppWidgetId,
- mProfile, mComponentName, null);
+ mProfile, mComponentName, mBindOptions);
if (bound) {
Intent result = new Intent();
result.putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, mAppWidgetId);
@@ -100,6 +101,8 @@
}
mComponentName =
intent.getParcelableExtra(AppWidgetManager.EXTRA_APPWIDGET_PROVIDER);
+ mBindOptions =
+ intent.getParcelableExtra(AppWidgetManager.EXTRA_APPWIDGET_OPTIONS);
mCallingPackage = getCallingPackage();
PackageManager pm = getPackageManager();
ApplicationInfo ai = pm.getApplicationInfo(mCallingPackage, 0);
diff --git a/src/com/android/settings/DefaultRingtonePreference.java b/src/com/android/settings/DefaultRingtonePreference.java
index 6893a21..09f5af4 100644
--- a/src/com/android/settings/DefaultRingtonePreference.java
+++ b/src/com/android/settings/DefaultRingtonePreference.java
@@ -30,7 +30,7 @@
public class DefaultRingtonePreference extends RingtonePreference {
private static final String TAG = "DefaultRingtonePreference";
- private int mUserId;
+ private int mUserId = UserHandle.USER_CURRENT;
protected Context mUserContext;
public DefaultRingtonePreference(Context context, AttributeSet attrs) {
@@ -40,21 +40,19 @@
public void setUserId(int userId) {
mUserId = userId;
- Context context = getContext();
- mUserContext = Utils.createPackageContextAsUser(context, mUserId);
+ mUserContext = Utils.createPackageContextAsUser(getContext(), mUserId);
}
@Override
public void performClick() {
- if (!Utils.startQuietModeDialogIfNecessary(getContext(), UserManager.get(getContext()),
- mUserId)) {
- super.performClick();
+ if (mUserId != UserHandle.USER_CURRENT) {
+ if (Utils.unlockWorkProfileIfNecessary(getContext(), mUserId) ||
+ Utils.startQuietModeDialogIfNecessary(getContext(),
+ UserManager.get(getContext()), mUserId)) {
+ return;
+ }
}
- }
-
- public void clearUserId(int userId) {
- mUserId = UserHandle.USER_CURRENT;
- mUserContext = getContext();
+ super.performClick();
}
@Override
diff --git a/src/com/android/settings/core/instrumentation/MetricsFeatureProviderImpl.java b/src/com/android/settings/core/instrumentation/MetricsFeatureProviderImpl.java
index b74c886..091eb54 100644
--- a/src/com/android/settings/core/instrumentation/MetricsFeatureProviderImpl.java
+++ b/src/com/android/settings/core/instrumentation/MetricsFeatureProviderImpl.java
@@ -34,6 +34,7 @@
protected void installLogWriters() {
mLoggerWriters.add(new EventLogWriter());
+ mLoggerWriters.add(new SettingSuggestionsLogWriter());
}
@Override
diff --git a/src/com/android/settings/core/instrumentation/SettingSuggestionsLogWriter.java b/src/com/android/settings/core/instrumentation/SettingSuggestionsLogWriter.java
new file mode 100644
index 0000000..4c277fb
--- /dev/null
+++ b/src/com/android/settings/core/instrumentation/SettingSuggestionsLogWriter.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright (C) 2017 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.core.instrumentation;
+
+import android.content.Context;
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
+import com.android.internal.logging.MetricsLogger;
+import com.android.settings.suggestions.EventStore;
+
+/**
+ * {@link LogWriter} that writes setting suggestion related logs.
+ */
+public class SettingSuggestionsLogWriter implements LogWriter {
+
+ private EventStore mEventStore;
+
+ @Override
+ public void visible(Context context, int category) {
+ }
+
+ @Override
+ public void hidden(Context context, int category) {
+ }
+
+ @Override
+ public void action(Context context, int category) {
+ }
+
+ @Override
+ public void action(Context context, int category, int value) {
+ }
+
+ @Override
+ public void action(Context context, int category, boolean value) {
+ }
+
+ @Override
+ public void action(Context context, int category, String pkg) {
+ if (mEventStore == null) {
+ mEventStore = new EventStore(context);
+ }
+ switch (category) {
+ case MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION:
+ mEventStore.writeEvent(pkg, EventStore.EVENT_SHOWN);
+ break;
+ case MetricsEvent.ACTION_SETTINGS_DISMISS_SUGGESTION:
+ mEventStore.writeEvent(pkg, EventStore.EVENT_DISMISSED);
+ break;
+ case MetricsEvent.ACTION_SETTINGS_SUGGESTION:
+ mEventStore.writeEvent(pkg, EventStore.EVENT_CLICKED);
+ break;
+ }
+ }
+
+ @Override
+ public void count(Context context, String name, int value) {
+ }
+
+ @Override
+ public void histogram(Context context, String name, int bucket) {
+ }
+
+}
diff --git a/src/com/android/settings/dashboard/DashboardSummary.java b/src/com/android/settings/dashboard/DashboardSummary.java
index 9d64d4c..fddf2d7 100644
--- a/src/com/android/settings/dashboard/DashboardSummary.java
+++ b/src/com/android/settings/dashboard/DashboardSummary.java
@@ -36,6 +36,9 @@
import com.android.settings.dashboard.conditional.ConditionManager;
import com.android.settings.dashboard.conditional.FocusRecyclerView;
import com.android.settings.overlay.FeatureFactory;
+import com.android.settings.suggestions.EventStore;
+import com.android.settings.suggestions.SuggestionFeaturizer;
+import com.android.settings.suggestions.SuggestionRanker;
import com.android.settingslib.SuggestionParser;
import com.android.settingslib.drawer.CategoryKey;
import com.android.settingslib.drawer.DashboardCategory;
@@ -66,11 +69,13 @@
private SummaryLoader mSummaryLoader;
private ConditionManager mConditionManager;
private SuggestionParser mSuggestionParser;
+ private SuggestionRanker mSuggestionRanker;
private LinearLayoutManager mLayoutManager;
private SuggestionsChecks mSuggestionsChecks;
private ArrayList<String> mSuggestionsShownLogged;
private ArrayList<String> mSuggestionsHiddenLogged;
private DashboardFeatureProvider mDashboardFeatureProvider;
+ private SuggestionFeatureProvider mSuggestionFeatureProvider;
@Override
public int getMetricsCategory() {
@@ -84,6 +89,8 @@
final Activity activity = getActivity();
mDashboardFeatureProvider = FeatureFactory.getFactory(activity)
.getDashboardFeatureProvider(activity);
+ mSuggestionFeatureProvider = FeatureFactory.getFactory(activity)
+ .getSuggestionFeatureProvider();
if (mDashboardFeatureProvider.isEnabled()) {
mSummaryLoader = new SummaryLoader(activity, CategoryKey.CATEGORY_HOMEPAGE);
@@ -95,6 +102,8 @@
mConditionManager = ConditionManager.get(activity, false);
mSuggestionParser = new SuggestionParser(activity,
activity.getSharedPreferences(SUGGESTIONS, 0), R.xml.suggestion_ordering);
+ mSuggestionRanker = new SuggestionRanker(
+ new SuggestionFeaturizer(new EventStore(activity)));
mSuggestionsChecks = new SuggestionsChecks(getContext());
if (savedInstanceState == null) {
mSuggestionsShownLogged = new ArrayList<>();
@@ -260,6 +269,16 @@
protected List<Tile> doInBackground(Void... params) {
final Context context = getContext();
List<Tile> suggestions = mSuggestionParser.getSuggestions();
+ if (mSuggestionFeatureProvider.isSmartSuggestionEnabled(context)) {
+ List<String> suggestionIds = new ArrayList<>(suggestions.size());
+ for (Tile suggestion : suggestions) {
+ suggestionIds.add(
+ DashboardAdapter.getSuggestionIdentifier(context, suggestion));
+ }
+ // TODO: create a Suggestion class to maintain the id and other info
+ mSuggestionRanker.rank(suggestions, suggestionIds);
+ // TODO: consider showing only top-k (e.g., top-3)
+ }
for (int i = 0; i < suggestions.size(); i++) {
Tile suggestion = suggestions.get(i);
if (mSuggestionsChecks.isSuggestionComplete(suggestion)) {
diff --git a/src/com/android/settings/location/LocationSettings.java b/src/com/android/settings/location/LocationSettings.java
index d6ff4dc..4177afb 100644
--- a/src/com/android/settings/location/LocationSettings.java
+++ b/src/com/android/settings/location/LocationSettings.java
@@ -18,7 +18,6 @@
import android.app.Activity;
import android.app.admin.DevicePolicyManager;
-import android.content.ActivityNotFoundException;
import android.content.BroadcastReceiver;
import android.content.ComponentName;
import android.content.Context;
@@ -96,14 +95,11 @@
private static final String KEY_LOCATION_MODE = "location_mode";
/** Key for preference category "Recent location requests" */
private static final String KEY_RECENT_LOCATION_REQUESTS = "recent_location_requests";
- /** Key for preference "App-level permissions" */
- private static final String KEY_APP_LEVEL_PERMISSIONS = "app_level_permissions";
/** Key for preference category "Location services" */
private static final String KEY_LOCATION_SERVICES = "location_services";
private static final int MENU_SCANNING = Menu.FIRST;
- private static final String KEY_LOCATION_PERMISSION = "android.permission-group.LOCATION";
private SwitchBar mSwitchBar;
private Switch mSwitch;
private boolean mValidListener = false;
@@ -211,11 +207,6 @@
final AppLocationPermissionPreferenceController preferenceController =
new AppLocationPermissionPreferenceController(activity);
preferenceController.displayPreference(root);
- if (preferenceController.isAvailable()) {
- Preference preferenceAppLevelPermissions =
- root.findPreference(KEY_APP_LEVEL_PERMISSIONS);
- setupAppLevelPermissionsPreference(preferenceAppLevelPermissions);
- }
mCategoryRecentLocationRequests =
(PreferenceCategory) root.findPreference(KEY_RECENT_LOCATION_REQUESTS);
@@ -276,23 +267,6 @@
}
}
- private void setupAppLevelPermissionsPreference(Preference preference) {
- preference.setOnPreferenceClickListener(
- new Preference.OnPreferenceClickListener() {
- @Override
- public boolean onPreferenceClick(Preference preference) {
- Intent intent = new Intent(Intent.ACTION_MANAGE_PERMISSION_APPS)
- .putExtra(Intent.EXTRA_PERMISSION_NAME, KEY_LOCATION_PERMISSION);
- try {
- getActivity().startActivity(intent);
- } catch (ActivityNotFoundException e) {
- Log.w("Permission", "No app to handle " + intent);
- }
- return true;
- }
- });
- }
-
private void changeManagedProfileLocationAccessStatus(boolean mainSwitchOn) {
if (mManagedProfileSwitch == null) {
return;
diff --git a/src/com/android/settings/notification/WorkSoundPreferenceController.java b/src/com/android/settings/notification/WorkSoundPreferenceController.java
index 96d88c9..c94991c 100644
--- a/src/com/android/settings/notification/WorkSoundPreferenceController.java
+++ b/src/com/android/settings/notification/WorkSoundPreferenceController.java
@@ -160,9 +160,8 @@
}
private CharSequence updateRingtoneName(Context context, int type) {
- if (context == null) {
- Log.e(TAG, "Unable to update ringtone name, no context provided");
- return null;
+ if (context == null || !UserManager.get(context).isUserUnlocked(context.getUserId())) {
+ return context.getString(R.string.managed_profile_not_available_label);
}
Uri ringtoneUri = RingtoneManager.getActualDefaultRingtoneUri(context, type);
return Ringtone.getTitle(context, ringtoneUri, false /* followSettingsUri */,
diff --git a/src/com/android/settings/overlay/SurveyFeatureProvider.java b/src/com/android/settings/overlay/SurveyFeatureProvider.java
index 907bed8..416a602 100644
--- a/src/com/android/settings/overlay/SurveyFeatureProvider.java
+++ b/src/com/android/settings/overlay/SurveyFeatureProvider.java
@@ -20,6 +20,7 @@
import android.content.Context;
import android.content.IntentFilter;
import android.support.annotation.Nullable;
+import android.support.v4.content.LocalBroadcastManager;
/**
* An interface for classes wishing to provide the ability to serve surveys to implement.
@@ -81,5 +82,11 @@
* after a call to {@link #createAndRegisterReceiver(Activity)}.
* @param activity The activity that was used to register the BroadcastReceiver.
*/
- void unregisterReceiver(Activity activity, BroadcastReceiver receiver);
+ static void unregisterReceiver(Activity activity, BroadcastReceiver receiver) {
+ if (activity == null) {
+ throw new IllegalStateException("Cannot unregister receiver if activity is null");
+ }
+
+ LocalBroadcastManager.getInstance(activity).unregisterReceiver(receiver);
+ }
}
diff --git a/src/com/android/settings/suggestions/EventStore.java b/src/com/android/settings/suggestions/EventStore.java
new file mode 100644
index 0000000..bf94f48
--- /dev/null
+++ b/src/com/android/settings/suggestions/EventStore.java
@@ -0,0 +1,102 @@
+/*
+ * Copyright (C) 2017 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.suggestions;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.util.Log;
+
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
+
+/**
+ * Stores suggestion related statistics.
+ */
+public class EventStore {
+
+ public static final String TAG = "SuggestionEventStore";
+
+ public static final String EVENT_SHOWN = "shown";
+ public static final String EVENT_DISMISSED = "dismissed";
+ public static final String EVENT_CLICKED = "clicked";
+ public static final String METRIC_LAST_EVENT_TIME = "last_event_time";
+ public static final String METRIC_COUNT = "count";
+
+ private static final Set<String> EVENTS = new HashSet<String>(
+ Arrays.asList(new String[] {EVENT_SHOWN, EVENT_DISMISSED, EVENT_CLICKED}));
+ private static final Set<String> METRICS = new HashSet<String>(
+ Arrays.asList(new String[] {METRIC_LAST_EVENT_TIME, METRIC_COUNT}));
+
+ private final SharedPreferences mSharedPrefs;
+
+ public EventStore(Context context) {
+ mSharedPrefs = context.getSharedPreferences(TAG, Context.MODE_PRIVATE);
+ }
+
+ /**
+ * Writes individual log events.
+ * @param pkgName: Package for which this event is reported.
+ * @param eventType: Type of event (one of {@link #EVENTS}).
+ */
+ public void writeEvent(String pkgName, String eventType) {
+ if (!EVENTS.contains(eventType)) {
+ Log.w(TAG, "Reported event type " + eventType + " is not a valid type!");
+ return;
+ }
+ final String lastTimePrefKey = getPrefKey(pkgName, eventType, METRIC_LAST_EVENT_TIME);
+ final String countPrefKey = getPrefKey(pkgName, eventType, METRIC_COUNT);
+ writePref(lastTimePrefKey, System.currentTimeMillis());
+ writePref(countPrefKey, readPref(countPrefKey, (long) 0) + 1);
+ }
+
+ /**
+ * Reads metric of the the reported events (e.g., counts).
+ * @param pkgName: Package for which this metric is queried.
+ * @param eventType: Type of event (one of {@link #EVENTS}).
+ * @param metricType: Type of the queried metric (one of {@link #METRICS}).
+ * @return the corresponding metric.
+ */
+ public long readMetric(String pkgName, String eventType, String metricType) {
+ if (!EVENTS.contains(eventType)) {
+ Log.w(TAG, "Reported event type " + eventType + " is not a valid event!");
+ return 0;
+ } else if (!METRICS.contains(metricType)) {
+ Log.w(TAG, "Required stat type + " + metricType + " is not a valid stat!");
+ return 0;
+ }
+ return readPref(getPrefKey(pkgName, eventType, metricType), (long) 0);
+ }
+
+ private void writePref(String prefKey, long value) {
+ mSharedPrefs.edit().putLong(prefKey, value).commit();
+ }
+
+ private long readPref(String prefKey, Long defaultValue) {
+ return mSharedPrefs.getLong(prefKey, defaultValue);
+ }
+
+ private String getPrefKey(String pkgName, String eventType, String statType) {
+ return new StringBuilder()
+ .append("setting_suggestion_")
+ .append(pkgName)
+ .append("_")
+ .append(eventType)
+ .append("_")
+ .append(statType)
+ .toString();
+ }
+}
diff --git a/src/com/android/settings/suggestions/SuggestionFeaturizer.java b/src/com/android/settings/suggestions/SuggestionFeaturizer.java
new file mode 100644
index 0000000..eb43272
--- /dev/null
+++ b/src/com/android/settings/suggestions/SuggestionFeaturizer.java
@@ -0,0 +1,106 @@
+/*
+ * Copyright (C) 2017 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.suggestions;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Creates a set of interaction features (i.e., metrics) to represent each setting suggestion. These
+ * features currently include normalized time from previous events (shown, dismissed and clicked)
+ * for any particular suggestion and also counts of these events. These features are used as signals
+ * to find the best ranking for suggestion items.
+ */
+public class SuggestionFeaturizer {
+
+ // Key of the features used for ranking.
+ public static final String FEATURE_IS_SHOWN = "is_shown";
+ public static final String FEATURE_IS_DISMISSED = "is_dismissed";
+ public static final String FEATURE_IS_CLICKED = "is_clicked";
+ public static final String FEATURE_TIME_FROM_LAST_SHOWN = "time_from_last_shown";
+ public static final String FEATURE_TIME_FROM_LAST_DISMISSED = "time_from_last_dismissed";
+ public static final String FEATURE_TIME_FROM_LAST_CLICKED = "time_from_last_clicked";
+ public static final String FEATURE_SHOWN_COUNT = "shown_count";
+ public static final String FEATURE_DISMISSED_COUNT = "dismissed_count";
+ public static final String FEATURE_CLICKED_COUNT = "clicked_count";
+
+ // The following numbers are estimated from histograms.
+ public static final double TIME_NORMALIZATION_FACTOR = 2e10;
+ public static final double COUNT_NORMALIZATION_FACTOR = 500;
+
+ private final EventStore mEventStore;
+
+ /**
+ * Constructor
+ *
+ * @param eventStore An instance of {@code EventStore} which maintains the recorded suggestion
+ * events.
+ */
+ public SuggestionFeaturizer(EventStore eventStore) {
+ mEventStore = eventStore;
+ }
+
+ /**
+ * Extracts the features for each package name.
+ *
+ * @param pkgNames: List of package names for which features are queried.
+ * @return A Map containing the features, keyed by the package names. Each map value contains
+ * another map with key-value pairs of the features.
+ */
+ public Map<String, Map<String, Double>> featurize(List<String> pkgNames) {
+ Map<String, Map<String, Double>> features = new HashMap<>();
+ Long curTimeMs = System.currentTimeMillis();
+ for (String pkgName : pkgNames) {
+ Map<String, Double> featureMap = new HashMap<>();
+ features.put(pkgName, featureMap);
+ Long lastShownTime = mEventStore
+ .readMetric(pkgName, EventStore.EVENT_SHOWN, EventStore.METRIC_LAST_EVENT_TIME);
+ Long lastDismissedTime = mEventStore.readMetric(pkgName, EventStore.EVENT_DISMISSED,
+ EventStore.METRIC_LAST_EVENT_TIME);
+ Long lastClickedTime = mEventStore.readMetric(pkgName, EventStore.EVENT_CLICKED,
+ EventStore.METRIC_LAST_EVENT_TIME);
+ featureMap.put(FEATURE_IS_SHOWN, booleanToDouble(lastShownTime > 0));
+ featureMap.put(FEATURE_IS_DISMISSED, booleanToDouble(lastDismissedTime > 0));
+ featureMap.put(FEATURE_IS_CLICKED, booleanToDouble(lastClickedTime > 0));
+ featureMap.put(FEATURE_TIME_FROM_LAST_SHOWN,
+ normalizedTimeDiff(curTimeMs, lastShownTime));
+ featureMap.put(FEATURE_TIME_FROM_LAST_DISMISSED,
+ normalizedTimeDiff(curTimeMs, lastDismissedTime));
+ featureMap.put(FEATURE_TIME_FROM_LAST_CLICKED,
+ normalizedTimeDiff(curTimeMs, lastClickedTime));
+ featureMap.put(FEATURE_SHOWN_COUNT, normalizedCount(mEventStore
+ .readMetric(pkgName, EventStore.EVENT_SHOWN, EventStore.METRIC_COUNT)));
+ featureMap.put(FEATURE_DISMISSED_COUNT, normalizedCount(mEventStore
+ .readMetric(pkgName, EventStore.EVENT_DISMISSED, EventStore.METRIC_COUNT)));
+ featureMap.put(FEATURE_CLICKED_COUNT, normalizedCount(mEventStore
+ .readMetric(pkgName, EventStore.EVENT_CLICKED, EventStore.METRIC_COUNT)));
+ }
+ return features;
+ }
+
+ private static double booleanToDouble(boolean bool) {
+ return bool ? 1 : 0;
+ }
+
+ private static double normalizedTimeDiff(long curTimeMs, long preTimeMs) {
+ return Math.min(1, (curTimeMs - preTimeMs) / TIME_NORMALIZATION_FACTOR);
+ }
+
+ private static double normalizedCount(long count) {
+ return Math.min(1, count / COUNT_NORMALIZATION_FACTOR);
+ }
+}
diff --git a/src/com/android/settings/suggestions/SuggestionRanker.java b/src/com/android/settings/suggestions/SuggestionRanker.java
new file mode 100644
index 0000000..d0b9140
--- /dev/null
+++ b/src/com/android/settings/suggestions/SuggestionRanker.java
@@ -0,0 +1,83 @@
+/*
+ * Copyright (C) 2017 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.suggestions;
+
+import com.android.settingslib.drawer.Tile;
+
+import android.support.annotation.VisibleForTesting;
+
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class SuggestionRanker {
+
+ private static final String TAG = "SuggestionRanker";
+
+ // The following coefficients form a linear model, which mixes the features to obtain a
+ // relevance metric for ranking the suggestion items. This model is learned with off-line data
+ // by training a binary classifier to detect the clicked items. The higher the obtained
+ // relevance metric, the higher chance of getting clicked.
+ private static final Map<String, Double> WEIGHTS = new HashMap<String, Double>() {{
+ put(SuggestionFeaturizer.FEATURE_IS_SHOWN, 4.07506758256);
+ put(SuggestionFeaturizer.FEATURE_IS_DISMISSED, 2.11535473578);
+ put(SuggestionFeaturizer.FEATURE_IS_CLICKED, 1.21885461304);
+ put(SuggestionFeaturizer.FEATURE_TIME_FROM_LAST_SHOWN, 3.18832024515);
+ put(SuggestionFeaturizer.FEATURE_TIME_FROM_LAST_DISMISSED, 1.09902706645);
+ put(SuggestionFeaturizer.FEATURE_TIME_FROM_LAST_CLICKED, 0.262631082877);
+ put(SuggestionFeaturizer.FEATURE_SHOWN_COUNT, -0.918484103748 * 240);
+ }};
+
+ private final SuggestionFeaturizer mSuggestionFeaturizer;
+
+ private final Map<Tile, Double> relevanceMetrics;
+
+ Comparator<Tile> suggestionComparator = new Comparator<Tile>() {
+ @Override
+ public int compare(Tile suggestion1, Tile suggestion2) {
+ return relevanceMetrics.get(suggestion1) < relevanceMetrics.get(suggestion2) ? 1 : -1;
+ }
+ };
+
+ public SuggestionRanker(SuggestionFeaturizer suggestionFeaturizer) {
+ mSuggestionFeaturizer = suggestionFeaturizer;
+ relevanceMetrics = new HashMap<Tile, Double>();
+ }
+
+ public void rank(final List<Tile> suggestions, List<String> suggestionIds) {
+ relevanceMetrics.clear();
+ Map<String, Map<String, Double>> features = mSuggestionFeaturizer.featurize(suggestionIds);
+ for (int i = 0; i < suggestionIds.size(); i++) {
+ relevanceMetrics.put(suggestions.get(i),
+ getRelevanceMetric(features.get(suggestionIds.get(i))));
+ }
+ Collections.sort(suggestions, suggestionComparator);
+ }
+
+ @VisibleForTesting
+ double getRelevanceMetric(Map<String, Double> features) {
+ double sum = 0;
+ if (features == null) {
+ return sum;
+ }
+ for (String feature : WEIGHTS.keySet()) {
+ sum += WEIGHTS.get(feature) * features.get(feature);
+ }
+ return sum;
+ }
+}
diff --git a/src/com/android/settings/survey/SurveyMixin.java b/src/com/android/settings/survey/SurveyMixin.java
index 74b7f10..72cd634 100644
--- a/src/com/android/settings/survey/SurveyMixin.java
+++ b/src/com/android/settings/survey/SurveyMixin.java
@@ -74,9 +74,8 @@
public void onPause() {
Activity activity = mFragment.getActivity();
if (mReceiver != null && activity != null) {
- SurveyFeatureProvider provider =
- FeatureFactory.getFactory(activity).getSurveyFeatureProvider(activity);
- provider.unregisterReceiver(activity, mReceiver);
+ SurveyFeatureProvider.unregisterReceiver(activity, mReceiver);
+ mReceiver = null;
}
}
}
diff --git a/src/com/android/settings/widget/LinkTextView.java b/src/com/android/settings/widget/LinkTextView.java
deleted file mode 100644
index e0fa723..0000000
--- a/src/com/android/settings/widget/LinkTextView.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright (C) 2014 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.widget;
-
-import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.v13.view.ViewCompat;
-import android.text.Spanned;
-import android.text.method.LinkMovementMethod;
-import android.text.style.ClickableSpan;
-import android.util.AttributeSet;
-import android.view.MotionEvent;
-import android.widget.TextView;
-import com.android.setupwizardlib.util.LinkAccessibilityHelper;
-
-/**
- * Copied from setup wizard.
- */
-public class LinkTextView extends TextView {
-
- private LinkAccessibilityHelper mAccessibilityHelper;
-
- public LinkTextView(Context context) {
- this(context, null);
- }
-
- public LinkTextView(Context context, AttributeSet attrs) {
- super(context, attrs);
- mAccessibilityHelper = new LinkAccessibilityHelper(this);
- ViewCompat.setAccessibilityDelegate(this, mAccessibilityHelper);
- }
-
- @Override
- public void setText(CharSequence text, BufferType type) {
- super.setText(text, type);
- if (text instanceof Spanned) {
- final ClickableSpan[] spans =
- ((Spanned) text).getSpans(0, text.length(), ClickableSpan.class);
- if (spans.length > 0) {
- setMovementMethod(LinkMovementMethod.getInstance());
- }
- }
- }
-
- @Override
- protected boolean dispatchHoverEvent(@NonNull MotionEvent event) {
- if (mAccessibilityHelper.dispatchHoverEvent(event)) {
- return true;
- }
- return super.dispatchHoverEvent(event);
- }
-}
diff --git a/tests/robotests/src/com/android/settings/suggestions/EventStoreTest.java b/tests/robotests/src/com/android/settings/suggestions/EventStoreTest.java
new file mode 100644
index 0000000..9db11b8
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/suggestions/EventStoreTest.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright (C) 2017 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.suggestions;
+
+import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.annotation.Config;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import org.robolectric.RuntimeEnvironment;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class EventStoreTest {
+
+ private EventStore mEventStore;
+
+ @Before
+ public void setUp() {
+ mEventStore = new EventStore(RuntimeEnvironment.application);
+ }
+
+ @Test
+ public void testWriteRead() {
+ mEventStore.writeEvent("pkg", EventStore.EVENT_SHOWN);
+ long timeMs = System.currentTimeMillis();
+ assertThat(mEventStore.readMetric("pkg", EventStore.EVENT_SHOWN, EventStore.METRIC_COUNT))
+ .isEqualTo(1);
+ assertThat(Math.abs(timeMs - mEventStore
+ .readMetric("pkg", EventStore.EVENT_SHOWN, EventStore.METRIC_LAST_EVENT_TIME)) < 10000)
+ .isTrue();
+ }
+
+ @Test
+ public void testWriteRead_shouldHaveLatestValues() {
+ mEventStore.writeEvent("pkg", EventStore.EVENT_DISMISSED);
+ mEventStore.writeEvent("pkg", EventStore.EVENT_DISMISSED);
+ assertThat(
+ mEventStore.readMetric("pkg", EventStore.EVENT_DISMISSED, EventStore.METRIC_COUNT))
+ .isEqualTo(2);
+ }
+
+ @Test
+ public void testWriteRead_shouldReturnDefaultIfNotAvailable() {
+ assertThat(mEventStore.readMetric("pkg", EventStore.EVENT_SHOWN, EventStore.METRIC_COUNT))
+ .isEqualTo(0);
+ assertThat(
+ mEventStore
+ .readMetric("pkg", EventStore.EVENT_SHOWN, EventStore.METRIC_LAST_EVENT_TIME))
+ .isEqualTo(0);
+ }
+
+}
diff --git a/tests/robotests/src/com/android/settings/suggestions/SuggestionFeaturizerTest.java b/tests/robotests/src/com/android/settings/suggestions/SuggestionFeaturizerTest.java
new file mode 100644
index 0000000..3c5bd4f
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/suggestions/SuggestionFeaturizerTest.java
@@ -0,0 +1,109 @@
+/*
+ * Copyright (C) 2017 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.suggestions;
+
+import java.util.Arrays;
+import java.util.Map;
+
+import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.annotation.Config;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import org.robolectric.RuntimeEnvironment;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class SuggestionFeaturizerTest {
+
+ private EventStore mEventStore;
+ private SuggestionFeaturizer mSuggestionFeaturizer;
+
+ @Before
+ public void setUp() {
+ mEventStore = new EventStore(RuntimeEnvironment.application);
+ mSuggestionFeaturizer = new SuggestionFeaturizer(mEventStore);
+ }
+
+ @Test
+ public void testFeaturize_singlePackage() {
+ mEventStore.writeEvent("pkg", EventStore.EVENT_DISMISSED);
+ mEventStore.writeEvent("pkg", EventStore.EVENT_SHOWN);
+ mEventStore.writeEvent("pkg", EventStore.EVENT_SHOWN);
+ Map<String, Double> features = mSuggestionFeaturizer.featurize(Arrays.asList("pkg"))
+ .get("pkg");
+ assertThat(features.get(SuggestionFeaturizer.FEATURE_IS_SHOWN)).isEqualTo(1.0);
+ assertThat(features.get(SuggestionFeaturizer.FEATURE_IS_DISMISSED)).isEqualTo(1.0);
+ assertThat(features.get(SuggestionFeaturizer.FEATURE_IS_CLICKED)).isEqualTo(0.0);
+
+ assertThat(features.get(SuggestionFeaturizer.FEATURE_TIME_FROM_LAST_SHOWN)).isLessThan(1.0);
+ assertThat(features.get(SuggestionFeaturizer.FEATURE_TIME_FROM_LAST_DISMISSED))
+ .isLessThan(1.0);
+ assertThat(features.get(SuggestionFeaturizer.FEATURE_TIME_FROM_LAST_CLICKED))
+ .isEqualTo(1.0);
+ assertThat(features.get(SuggestionFeaturizer.FEATURE_SHOWN_COUNT))
+ .isEqualTo(2.0 / SuggestionFeaturizer.COUNT_NORMALIZATION_FACTOR);
+ assertThat(features.get(SuggestionFeaturizer.FEATURE_DISMISSED_COUNT))
+ .isEqualTo(1.0 / SuggestionFeaturizer.COUNT_NORMALIZATION_FACTOR);
+ assertThat(features.get(SuggestionFeaturizer.FEATURE_CLICKED_COUNT)).isEqualTo(0.0);
+ }
+
+ @Test
+ public void testFeaturize_multiplePackages() {
+ mEventStore.writeEvent("pkg1", EventStore.EVENT_DISMISSED);
+ mEventStore.writeEvent("pkg2", EventStore.EVENT_SHOWN);
+ mEventStore.writeEvent("pkg1", EventStore.EVENT_SHOWN);
+ Map<String, Map<String, Double>> features = mSuggestionFeaturizer
+ .featurize(Arrays.asList("pkg1", "pkg2"));
+ Map<String, Double> features1 = features.get("pkg1");
+ Map<String, Double> features2 = features.get("pkg2");
+
+ assertThat(features1.get(SuggestionFeaturizer.FEATURE_IS_SHOWN)).isEqualTo(1.0);
+ assertThat(features1.get(SuggestionFeaturizer.FEATURE_IS_DISMISSED)).isEqualTo(1.0);
+ assertThat(features1.get(SuggestionFeaturizer.FEATURE_IS_CLICKED)).isEqualTo(0.0);
+ assertThat(features1.get(SuggestionFeaturizer.FEATURE_TIME_FROM_LAST_SHOWN))
+ .isLessThan(1.0);
+ assertThat(features1.get(SuggestionFeaturizer.FEATURE_TIME_FROM_LAST_DISMISSED))
+ .isLessThan(1.0);
+ assertThat(features1.get(SuggestionFeaturizer.FEATURE_TIME_FROM_LAST_CLICKED))
+ .isEqualTo(1.0);
+ assertThat(features1.get(SuggestionFeaturizer.FEATURE_SHOWN_COUNT))
+ .isEqualTo(1.0 / SuggestionFeaturizer.COUNT_NORMALIZATION_FACTOR);
+ assertThat(features1.get(SuggestionFeaturizer.FEATURE_DISMISSED_COUNT))
+ .isEqualTo(1.0 / SuggestionFeaturizer.COUNT_NORMALIZATION_FACTOR);
+ assertThat(features1.get(SuggestionFeaturizer.FEATURE_CLICKED_COUNT)).isEqualTo(0.0);
+
+ assertThat(features2.get(SuggestionFeaturizer.FEATURE_IS_SHOWN)).isEqualTo(1.0);
+ assertThat(features2.get(SuggestionFeaturizer.FEATURE_IS_DISMISSED)).isEqualTo(0.0);
+ assertThat(features2.get(SuggestionFeaturizer.FEATURE_IS_CLICKED)).isEqualTo(0.0);
+ assertThat(features2.get(SuggestionFeaturizer.FEATURE_TIME_FROM_LAST_SHOWN))
+ .isLessThan(1.0);
+ assertThat(features2.get(SuggestionFeaturizer.FEATURE_TIME_FROM_LAST_DISMISSED))
+ .isEqualTo(1.0);
+ assertThat(features2.get(SuggestionFeaturizer.FEATURE_TIME_FROM_LAST_CLICKED))
+ .isEqualTo(1.0);
+ assertThat(features2.get(SuggestionFeaturizer.FEATURE_SHOWN_COUNT))
+ .isEqualTo(1.0 / SuggestionFeaturizer.COUNT_NORMALIZATION_FACTOR);
+ assertThat(features2.get(SuggestionFeaturizer.FEATURE_DISMISSED_COUNT)).isEqualTo(0.0);
+ assertThat(features2.get(SuggestionFeaturizer.FEATURE_CLICKED_COUNT)).isEqualTo(0.0);
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/suggestions/SuggestionRankerTest.java b/tests/robotests/src/com/android/settings/suggestions/SuggestionRankerTest.java
new file mode 100644
index 0000000..e1807a8
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/suggestions/SuggestionRankerTest.java
@@ -0,0 +1,94 @@
+/*
+ * Copyright (C) 2017 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.suggestions;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+import com.android.settingslib.drawer.Tile;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.annotation.Config;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import org.robolectric.RuntimeEnvironment;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+import static org.mockito.Mockito.same;
+import static org.mockito.Mockito.spy;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class SuggestionRankerTest {
+
+ @Mock
+ private SuggestionRanker mSuggestionRanker;
+ @Mock
+ private SuggestionFeaturizer mSuggestionFeaturizer;
+ private Map<String, Map<String, Double>> mFeatures;
+ private List<String> mPkgNames;
+ private List<Tile> mSuggestions;
+
+ @Before
+ public void setUp() {
+ MockitoAnnotations.initMocks(this);
+ mPkgNames = Arrays.asList("pkg1", "pkg2", "pkg3");
+ mFeatures = new HashMap<String, Map<String, Double>>();
+ mFeatures.put("pkg1", new HashMap<String, Double>());
+ mFeatures.put("pkg2", new HashMap<String, Double>());
+ mFeatures.put("pkg3", new HashMap<String, Double>());
+ mSuggestions = new ArrayList<Tile>() {
+ {
+ add(new Tile());
+ add(new Tile());
+ add(new Tile());
+ }
+ };
+ mSuggestionFeaturizer = mock(SuggestionFeaturizer.class);
+ mSuggestionRanker = new SuggestionRanker(mSuggestionFeaturizer);
+ when(mSuggestionFeaturizer.featurize(mPkgNames)).thenReturn(mFeatures);
+ mSuggestionRanker = spy(mSuggestionRanker);
+ when(mSuggestionRanker.getRelevanceMetric(same(mFeatures.get("pkg1")))).thenReturn(0.9);
+ when(mSuggestionRanker.getRelevanceMetric(same(mFeatures.get("pkg2")))).thenReturn(0.1);
+ when(mSuggestionRanker.getRelevanceMetric(same(mFeatures.get("pkg3")))).thenReturn(0.5);
+ }
+
+ @Test
+ public void testRank() {
+ List<Tile> expectedOrderdList = new ArrayList<Tile>() {
+ {
+ add(mSuggestions.get(0)); // relevance = 0.9
+ add(mSuggestions.get(2)); // relevance = 0.5
+ add(mSuggestions.get(1)); // relevance = 0.1
+ }
+ };
+ mSuggestionRanker.rank(mSuggestions, mPkgNames);
+ assertThat(mSuggestions).isEqualTo(expectedOrderdList);
+ }
+}
+
diff --git a/tests/robotests/src/com/android/settings/survey/SurveyMixinTest.java b/tests/robotests/src/com/android/settings/survey/SurveyMixinTest.java
index 20c50ce..73fe09e 100644
--- a/tests/robotests/src/com/android/settings/survey/SurveyMixinTest.java
+++ b/tests/robotests/src/com/android/settings/survey/SurveyMixinTest.java
@@ -1,5 +1,6 @@
package com.android.settings.survey;
+import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.never;
@@ -11,11 +12,15 @@
import android.app.Activity;
import android.content.BroadcastReceiver;
import android.content.Context;
+import android.content.IntentFilter;
+import android.support.v4.content.LocalBroadcastManager;
import com.android.settings.SettingsRobolectricTestRunner;
import com.android.settings.TestConfig;
import com.android.settings.core.InstrumentedPreferenceFragment;
import com.android.settings.overlay.SurveyFeatureProvider;
import com.android.settings.testutils.FakeFeatureFactory;
+import java.util.ArrayList;
+import java.util.HashMap;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -24,6 +29,7 @@
import org.robolectric.Robolectric;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
+import org.robolectric.util.ReflectionHelpers;
@RunWith(SettingsRobolectricTestRunner.class)
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
@@ -102,7 +108,7 @@
}
@Test
- public void onPause_removesReceiverWhenInstantiated() {
+ public void onPause_removesReceiverIfPreviouslySet() {
// Pretend there is a survey in memory
when(mProvider.getSurveyExpirationDate(any(), any())).thenReturn(-1L);
@@ -110,12 +116,16 @@
Activity temp = Robolectric.setupActivity(Activity.class);
when(mFragment.getActivity()).thenReturn(temp);
when(mProvider.createAndRegisterReceiver(any())).thenReturn(mReceiver);
+ LocalBroadcastManager manager = LocalBroadcastManager.getInstance(temp);
SurveyMixin mixin = new SurveyMixin(mFragment, FAKE_KEY);
mixin.onResume();
+ manager.registerReceiver(mReceiver, new IntentFilter());
mixin.onPause();
// Verify we remove the receiver
- verify(mProvider, times(1)).unregisterReceiver(any(), any());
+ HashMap<BroadcastReceiver, ArrayList<IntentFilter>> map =
+ ReflectionHelpers.getField(manager, "mReceivers");
+ assertThat(map.containsKey(mReceiver)).isFalse();
}
@Test
@@ -129,15 +139,15 @@
SurveyMixin mixin = new SurveyMixin(mFragment, FAKE_KEY);
mixin.onPause();
- // Verify we do nothing
- verify(mProvider, never()).unregisterReceiver(any(), any());
+ // Verify we do nothing;
+ verify(mProvider, never()).showSurveyIfAvailable(any(), any());
// pretend the activity died before onPause
when(mFragment.getActivity()).thenReturn(null);
mixin.onPause();
// Verify we do nothing
- verify(mProvider, never()).unregisterReceiver(any(), any());
+ verify(mProvider, never()).showSurveyIfAvailable(any(), any());
}
}