Add suggestions to settings
Use an XML to define the categories that Settings will look for,
and surface enabled activities under those categories as suggestions.
When clicked on the activity will be started for result. If the result
is not cancelled, then the operation is assumed successful and the
suggestion is disabled. Users can also use an overflow -> remove
flow to get rid of unwanted suggestions.
Change-Id: I767abf8efe103af0509bc6b6b55888ae82643512
diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java
index 4d9e2f0..ba975a2 100644
--- a/src/com/android/settings/SettingsActivity.java
+++ b/src/com/android/settings/SettingsActivity.java
@@ -50,7 +50,6 @@
import android.view.ViewGroup;
import android.widget.Button;
import android.widget.SearchView;
-import com.android.internal.logging.MetricsLogger;
import com.android.internal.util.ArrayUtils;
import com.android.settings.Settings.WifiSettingsActivity;
import com.android.settings.accessibility.AccessibilitySettings;
@@ -111,7 +110,7 @@
import com.android.settings.wifi.WifiSettings;
import com.android.settings.wifi.p2p.WifiP2pSettings;
import com.android.settingslib.drawer.DashboardCategory;
-import com.android.settingslib.drawer.DashboardTile;
+import com.android.settingslib.drawer.Tile;
import com.android.settingslib.drawer.SettingsDrawerActivity;
import java.util.ArrayList;
@@ -199,6 +198,8 @@
private static final String EMPTY_QUERY = "";
+ private static final int REQUEST_SUGGESTION = 42;
+
private String mFragmentClass;
private CharSequence mInitialTitle;
@@ -365,6 +366,7 @@
private int mHomeActivitiesCount = 1;
private Intent mResultIntentData;
+ private ComponentName mCurrentSuggestion;
public SwitchBar getSwitchBar() {
return mSwitchBar;
@@ -1031,7 +1033,7 @@
// When on restricted users, disable all extra categories (but only the settings ones).
List<DashboardCategory> categories = getDashboardCategories();
for (DashboardCategory category : categories) {
- for (DashboardTile tile : category.tiles) {
+ for (Tile tile : category.tiles) {
ComponentName component = tile.intent.getComponent();
if (packageName.equals(component)&& !ArrayUtils.contains(
SETTINGS_FOR_RESTRICTED, component.getClassName())) {
@@ -1146,7 +1148,7 @@
}
@Override
- protected void onTileClicked(DashboardTile tile) {
+ protected void onTileClicked(Tile tile) {
if (mIsShowingDashboard) {
// If on dashboard, don't finish so the back comes back to here.
openTile(tile);
@@ -1200,4 +1202,20 @@
public void setResultIntentData(Intent resultIntentData) {
mResultIntentData = resultIntentData;
}
+
+ public void startSuggestion(Intent intent) {
+ mCurrentSuggestion = intent.getComponent();
+ startActivityForResult(intent, REQUEST_SUGGESTION);
+ }
+
+ @Override
+ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+ if (requestCode == REQUEST_SUGGESTION && mCurrentSuggestion != null
+ && resultCode != RESULT_CANCELED) {
+ getPackageManager().setComponentEnabledSetting(mCurrentSuggestion,
+ PackageManager.COMPONENT_ENABLED_STATE_DISABLED, PackageManager.DONT_KILL_APP);
+ }
+ super.onActivityResult(requestCode, resultCode, data);
+ }
+
}