Added Night Light Suggestion and tests

Bug: 34900174
Test: make ROBOTEST_FILTER=SettingsSuggestionsTest RunSettingsRoboTests
Change-Id: I5b2d4e5debc1403cfcbf9c6ecf9397d1074e3a29
This commit is contained in:
Sean Stout
2017-02-15 14:04:25 -08:00
parent b9f570ff44
commit 062512641e
2 changed files with 112 additions and 2 deletions

View File

@@ -901,14 +901,24 @@
android:enabled="@*android:bool/config_nightDisplayAvailable" android:enabled="@*android:bool/config_nightDisplayAvailable"
android:icon="@drawable/ic_settings_night_display" android:icon="@drawable/ic_settings_night_display"
android:taskAffinity=""> android:taskAffinity="">
<intent-filter android:priority="1">
<action android:name="android.intent.action.MAIN" />
<category android:name="com.android.settings.suggested.category.SETTINGS_ONLY" />
</intent-filter>
<intent-filter android:priority="1"> <intent-filter android:priority="1">
<action android:name="android.settings.NIGHT_DISPLAY_SETTINGS" /> <action android:name="android.settings.NIGHT_DISPLAY_SETTINGS" />
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />
</intent-filter> </intent-filter>
<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
android:value="com.android.settings.display.NightDisplaySettings" />
<meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED" <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
android:value="true" /> android:value="true" />
<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
android:value="com.android.settings.display.NightDisplaySettings" />
<meta-data android:name="com.android.settings.dismiss"
android:value="30" />
<meta-data android:name="com.android.settings.title"
android:resource="@string/night_display_suggestion_title" />
<meta-data android:name="com.android.settings.summary"
android:resource="@string/night_display_suggestion_summary" />
</activity> </activity>
<activity android:name="Settings$DeviceInfoSettingsActivity" <activity android:name="Settings$DeviceInfoSettingsActivity"

View File

@@ -0,0 +1,100 @@
/*
* 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 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.SettingsRobolectricTestRunner;
import com.android.settings.TestConfig;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
import org.robolectric.manifest.ActivityData;
import org.robolectric.manifest.AndroidManifest;
import org.robolectric.manifest.IntentFilterData;
import org.robolectric.shadows.ShadowApplication;
@RunWith(SettingsRobolectricTestRunner.class)
@Config(manifest = MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class SettingsSuggestionsTest {
@Test
public void zenModeAutomationSuggestion_isValid() {
assertSuggestionEquals("Settings$ZenModeAutomationSuggestionActivity",
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",
R.string.wallpaper_suggestion_title, R.string.wallpaper_suggestion_summary);
}
@Test
public void nightDisplaySettings_isValid() {
assertSuggestionEquals("Settings$NightDisplaySettingsActivity",
R.string.night_display_suggestion_title, R.string.night_display_suggestion_summary);
}
@Test
public void fingerprintSuggestion_isValid() {
assertSuggestionEquals("com.android.settings.Settings$FingerprintSuggestionActivity",
R.string.suggestion_additional_fingerprints,
R.string.suggestion_additional_fingerprints_summary);
}
@Test
public void wifiCallingSuggestion_isValid() {
assertSuggestionEquals("Settings$WifiCallingSuggestionActivity",
R.string.wifi_calling_suggestion_title, R.string.wifi_calling_suggestion_summary);
}
private void assertSuggestionEquals(String activityName, @StringRes int title,
@StringRes int summary) {
final AndroidManifest androidManifest = ShadowApplication.getInstance().getAppManifest();
final ActivityData activityData = androidManifest.getActivityData(activityName);
final Map<String, Object> metaData = activityData.getMetaData().getValueMap();
final Context context = RuntimeEnvironment.application;
final String expectedTitle = context.getString(title);
final String expectedSummary = context.getString(summary);
final String pName= context.getPackageName();
final String actualTitle = context.getString(context.getResources().getIdentifier(
((String) metaData.get("com.android.settings.title")).substring(8), "string", pName));
final String actualSummary = context.getString(context.getResources().getIdentifier(
((String) metaData.get("com.android.settings.summary")).substring(8), "string", pName));
assertThat(actualTitle).isEqualTo(expectedTitle);
assertThat(actualSummary).isEqualTo(expectedSummary);
final List<IntentFilterData> intentFilters = activityData.getIntentFilters();
final List<String> categories = new ArrayList<>();
for (IntentFilterData intentFilter : intentFilters) {
categories.addAll(intentFilter.getCategories());
}
assertThat(categories).contains("com.android.settings.suggested.category.SETTINGS_ONLY");
}
}