PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove DND and all gesture suggestions from Settings" into oc-dr1-dev am: 9064072ed7

Browse Source 
am: 1b62cfb973

Change-Id: I2911fd45b056eb9ecf8f523a824878cf23747b8d
This commit is contained in:
Fan Zhang
2017-07-31 19:28:28 +00:00
committed by android-build-merger
parent 7bea7b2cdd 1b62cfb973
commit b43867dc5e
5 changed files with 6 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/com/android/settings/Settings.java
View File

@@ -145,7 +145,6 @@ public class Settings extends SettingsActivity {
public static class ManageAppExternalSourcesActivity extends SettingsActivity { /* empty */ }
public static class WifiCallingSuggestionActivity extends SettingsActivity { /* empty */ }
public static class ZenModeAutomationSuggestionActivity extends SettingsActivity { /* empty */ }
public static class FingerprintEnrollSuggestionActivity extends FingerprintEnrollIntroduction {
/* empty */
}

21
src/com/android/settings/dashboard/suggestions/SuggestionsChecks.java
View File

@@ -16,30 +16,24 @@
package com.android.settings.dashboard.suggestions;
import android.app.AutomaticZenRule;
import android.app.KeyguardManager;
import android.app.NotificationManager;
import android.app.WallpaperManager;
import android.app.admin.DevicePolicyManager;
import android.content.ComponentName;
import android.content.Context;
import android.hardware.fingerprint.FingerprintManager;
import android.provider.Settings;
import android.support.annotation.VisibleForTesting;
import com.android.ims.ImsManager;
import com.android.settings.Settings.FingerprintEnrollSuggestionActivity;
import com.android.settings.Settings.ScreenLockSuggestionActivity;
import com.android.settings.Settings.WifiCallingSuggestionActivity;
import com.android.settings.Settings.ZenModeAutomationSuggestionActivity;
import com.android.settings.Utils;
import com.android.settings.fingerprint.FingerprintSuggestionActivity;
import com.android.settings.overlay.FeatureFactory;
import com.android.settings.wallpaper.WallpaperSuggestionActivity;
import com.android.settingslib.drawer.Tile;
import java.util.Collection;
/**
* The Home of all stupidly dynamic Settings Suggestions checks.
*/
@@ -58,9 +52,7 @@ public class SuggestionsChecks {
public boolean isSuggestionComplete(Tile suggestion) {
ComponentName component = suggestion.intent.getComponent();
String className = component.getClassName();
if (className.equals(ZenModeAutomationSuggestionActivity.class.getName())) {
return hasEnabledZenAutoRules();
} else if (className.equals(WallpaperSuggestionActivity.class.getName())) {
if (className.equals(WallpaperSuggestionActivity.class.getName())) {
return hasWallpaperSet();
} else if (className.equals(WifiCallingSuggestionActivity.class.getName())) {
return isWifiCallingUnavailableOrEnabled();
@@ -103,17 +95,6 @@ public class SuggestionsChecks {
&& ImsManager.isNonTtyOrTtyOnVolteEnabled(mContext);
}
private boolean hasEnabledZenAutoRules() {
Collection<AutomaticZenRule> zenRules =
NotificationManager.from(mContext).getAutomaticZenRules().values();
for (AutomaticZenRule rule : zenRules) {
if (rule.isEnabled()) {
return true;
}
}
return false;
}
@VisibleForTesting
boolean hasWallpaperSet() {
return mWallpaperManager.getWallpaperId(WallpaperManager.FLAG_SYSTEM) > 0;