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

Remove NewDeviceIntroSuggestion

Browse Source 
The functionality is entirely replaced by other apps.

Change-Id: Id3d425cf92a07bae070cd22c0d726aba0472dd5d
Fixes: 111195449
Test: robotest
This commit is contained in:
Fan Zhang
2018-07-12 10:58:13 -07:00
parent 00d42c510d
commit 5c3816ba03
9 changed files with 18 additions and 394 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -31,7 +31,6 @@ import com.android.settings.Settings;
import com.android.settings.biometrics.fingerprint.FingerprintEnrollSuggestionActivity;
import com.android.settings.biometrics.fingerprint.FingerprintSuggestionActivity;
import com.android.settings.notification.ZenSuggestionActivity;
import com.android.settings.support.NewDeviceIntroSuggestionActivity;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.wallpaper.WallpaperSuggestionActivity;
import com.android.settings.wifi.calling.WifiCallingSuggestionActivity;
@@ -46,41 +45,41 @@ public class SettingsSuggestionsTest {
@Test
public void wallpaperSuggestion_isValid() {
assertSuggestionEquals(
WallpaperSuggestionActivity.class.getName(),
R.string.wallpaper_suggestion_title,
R.string.wallpaper_suggestion_summary);
WallpaperSuggestionActivity.class.getName(),
R.string.wallpaper_suggestion_title,
R.string.wallpaper_suggestion_summary);
}
@Test
public void fingerprintSuggestion_isValid() {
assertSuggestionEquals(
FingerprintSuggestionActivity.class.getName(),
R.string.suggestion_additional_fingerprints,
R.string.suggestion_additional_fingerprints_summary);
FingerprintSuggestionActivity.class.getName(),
R.string.suggestion_additional_fingerprints,
R.string.suggestion_additional_fingerprints_summary);
}
@Test
public void fingerprintEnrollSuggestion_isValid() {
assertSuggestionEquals(
FingerprintEnrollSuggestionActivity.class.getName(),
R.string.suggested_fingerprint_lock_settings_title,
R.string.suggested_fingerprint_lock_settings_summary);
FingerprintEnrollSuggestionActivity.class.getName(),
R.string.suggested_fingerprint_lock_settings_title,
R.string.suggested_fingerprint_lock_settings_summary);
}
@Test
public void wifiCallingSuggestion_isValid() {
assertSuggestionEquals(
WifiCallingSuggestionActivity.class.getName(),
R.string.wifi_calling_suggestion_title,
R.string.wifi_calling_suggestion_summary);
WifiCallingSuggestionActivity.class.getName(),
R.string.wifi_calling_suggestion_title,
R.string.wifi_calling_suggestion_summary);
}
@Test
public void nightDisplaySuggestion_isValid() {
assertSuggestionEquals(
Settings.NightDisplaySuggestionActivity.class.getName(),
R.string.night_display_suggestion_title,
R.string.night_display_suggestion_summary);
Settings.NightDisplaySuggestionActivity.class.getName(),
R.string.night_display_suggestion_title,
R.string.night_display_suggestion_summary);
}
@Test
@@ -91,16 +90,8 @@ public class SettingsSuggestionsTest {
R.string.zen_suggestion_summary);
}
@Test
public void newDeviceIntroSuggestion_isValid() {
assertSuggestionEquals(
NewDeviceIntroSuggestionActivity.class.getName(),
R.string.new_device_suggestion_title,
R.string.new_device_suggestion_summary);
}
private void assertSuggestionEquals(String activityName, @StringRes int titleRes,
@StringRes int summaryRes) {
@StringRes int summaryRes) {
final Context context = RuntimeEnvironment.application;
final PackageManager pm = context.getPackageManager();
@@ -117,13 +108,13 @@ public class SettingsSuggestionsTest {
final String title = (String) info.metaData.get("com.android.settings.title");
final String actualTitle =
context.getString(resources.getIdentifier(title.substring(8), "string", pName));
context.getString(resources.getIdentifier(title.substring(8), "string", pName));
final String expectedTitle = context.getString(titleRes);
assertThat(actualTitle).isEqualTo(expectedTitle);
final String summary = (String) info.metaData.get("com.android.settings.summary");
final String actualSummary =
context.getString(resources.getIdentifier(summary.substring(8), "string", pName));
context.getString(resources.getIdentifier(summary.substring(8), "string", pName));
final String expectedSummary = context.getString(summaryRes);
assertThat(actualSummary).isEqualTo(expectedSummary);
}