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

Browse Source 
am: 9064072ed7

Change-Id: Ic4bb153fc670441f3f1a04be40e56d59d31f4275
This commit is contained in:
Fan Zhang
2017-07-31 19:12:11 +00:00
committed by android-build-merger
parent 68af5f3a5d 9064072ed7
commit 1b62cfb973
5 changed files with 6 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
AndroidManifest.xml
View File

@@ -772,25 +772,6 @@
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>
<action android:name="android.intent.action.MAIN" />
<category android:name="com.android.settings.suggested.category.FIRST_IMPRESSION" />
</intent-filter>
<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
android:value="com.android.settings.notification.ZenModeSettings" />
<meta-data android:name="com.android.settings.dismiss"
android:value="8,12,30" />
<meta-data android:name="com.android.settings.title"
android:resource="@string/zen_mode_automation_suggestion_title" />
<meta-data android:name="com.android.settings.summary"
android:resource="@string/zen_mode_automation_suggestion_summary" />
</activity>
<activity android:name="Settings$WallpaperSettingsActivity"
android:label="@string/wallpaper_settings_fragment_title"
android:icon="@drawable/ic_wallpaper"
@@ -3160,10 +3141,6 @@
<action android:name="android.intent.action.MAIN" />
<category android:name="com.android.settings.suggested.category.GESTURE" />
</intent-filter>
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="com.android.settings.suggested.category.FIRST_IMPRESSION" />
</intent-filter>
<meta-data android:name="com.android.settings.dismiss"
android:value="4,8,30" />
<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
@@ -3182,10 +3159,6 @@
<action android:name="android.intent.action.MAIN" />
<category android:name="com.android.settings.suggested.category.GESTURE" />
</intent-filter>
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="com.android.settings.suggested.category.FIRST_IMPRESSION" />
</intent-filter>
<meta-data android:name="com.android.settings.dismiss"
android:value="4,8,30" />
<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
@@ -3204,10 +3177,6 @@
<action android:name="android.intent.action.MAIN" />
<category android:name="com.android.settings.suggested.category.GESTURE" />
</intent-filter>
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="com.android.settings.suggested.category.FIRST_IMPRESSION" />
</intent-filter>
<meta-data android:name="com.android.settings.dismiss"
android:value="9,13,30" />
<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
@@ -3226,10 +3195,6 @@
<action android:name="android.intent.action.MAIN" />
<category android:name="com.android.settings.suggested.category.GESTURE" />
</intent-filter>
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="com.android.settings.suggested.category.FIRST_IMPRESSION" />
</intent-filter>
<meta-data android:name="com.android.settings.dismiss"
android:value="9,13,30" />
<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
@@ -3248,10 +3213,6 @@
<action android:name="android.intent.action.MAIN" />
<category android:name="com.android.settings.suggested.category.GESTURE" />
</intent-filter>
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="com.android.settings.suggested.category.FIRST_IMPRESSION" />
</intent-filter>
<meta-data android:name="com.android.settings.dismiss"
android:value="9,13,30" />
<meta-data android:name="com.android.settings.FRAGMENT_CLASS"

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

@@ -141,7 +141,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;

2
tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionsChecksTest.java
View File

@@ -31,8 +31,8 @@ import android.content.pm.PackageManager;
import android.hardware.fingerprint.FingerprintManager;
import com.android.settings.Settings;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.drawer.Tile;
import org.junit.Before;

16
tests/robotests/src/com/android/settings/suggestions/SettingsSuggestionsTest.java
View File

@@ -16,13 +16,16 @@
package com.android.settings.suggestions;
import static com.android.settings.TestConfig.MANIFEST_PATH;
import static com.google.common.truth.Truth.assertThat;
import android.annotation.StringRes;
import android.content.Context;
import com.android.settings.R;
import com.android.settings.TestConfig;
import com.android.settings.fingerprint.FingerprintSuggestionActivity;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.TestConfig;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -37,9 +40,6 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import static com.android.settings.TestConfig.MANIFEST_PATH;
import static com.google.common.truth.Truth.assertThat;
@RunWith(SettingsRobolectricTestRunner.class)
@Config(manifest = MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class SettingsSuggestionsTest {
@@ -50,14 +50,6 @@ public class SettingsSuggestionsTest {
private static final String CATEGORY_SETTINGS_ONLY =
"com.android.settings.suggested.category.SETTINGS_ONLY";
@Test
public void zenModeAutomationSuggestion_isValid() {
assertSuggestionEquals("Settings$ZenModeAutomationSuggestionActivity",
CATEGORY_FIRST_IMPRESSION,
R.string.zen_mode_automation_suggestion_title,
R.string.zen_mode_automation_suggestion_summary);
}
@Test
public void wallpaperSuggestion_isValid() {
assertSuggestionEquals("com.android.settings.wallpaper.WallpaperSuggestionActivity",