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

Merge "Add intent action to support page" into oc-dr1-dev

Browse Source 
am: 128fd39a13

Change-Id: I50ef5d7f0a403389339b041c6064bfc188a7d4cd
This commit is contained in:
Maurice Lam
2017-06-09 16:55:29 +00:00
committed by android-build-merger
parent d745ed5972 128fd39a13
commit 73f137c74c
2 changed files with 21 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
AndroidManifest.xml
View File

@@ -3038,6 +3038,10 @@
<intent-filter android:priority="-2"> <intent-filter android:priority="-2">
<action android:name="com.android.settings.action.SETTINGS"/> <action android:name="com.android.settings.action.SETTINGS"/>
</intent-filter> </intent-filter>
<intent-filter>
<action android:name="com.android.settings.action.SUPPORT_SETTINGS" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
<meta-data android:name="com.android.settings.category" <meta-data android:name="com.android.settings.category"
android:value="com.android.settings.category.ia.homepage"/> android:value="com.android.settings.category.ia.homepage"/>
<meta-data android:name="com.android.settings.summary" <meta-data android:name="com.android.settings.summary"

19
tests/robotests/src/com/android/settings/support/SupportDashboardActivityTest.java
View File

@@ -17,8 +17,12 @@
package com.android.settings.support; package com.android.settings.support;
import static com.google.common.truth.Truth.assertThat;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.content.pm.PackageManager;
import android.content.pm.ResolveInfo;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -33,8 +37,6 @@ import org.robolectric.annotation.Config;
import java.util.List; import java.util.List;
import static com.google.common.truth.Truth.assertThat;
@RunWith(SettingsRobolectricTestRunner.class) @RunWith(SettingsRobolectricTestRunner.class)
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class SupportDashboardActivityTest { public class SupportDashboardActivityTest {
@@ -62,4 +64,17 @@ public class SupportDashboardActivityTest {
assertThat(value.intentTargetClass).isEqualTo(SupportDashboardActivity.class.getName()); assertThat(value.intentTargetClass).isEqualTo(SupportDashboardActivity.class.getName());
assertThat(value.intentAction).isEqualTo(Intent.ACTION_MAIN); assertThat(value.intentAction).isEqualTo(Intent.ACTION_MAIN);
} }
@Test
public void shouldHandleIntentAction() {
RuntimeEnvironment.getRobolectricPackageManager().setQueryIntentImplicitly(true);
// Intent action used by setup wizard to start support settings
Intent intent = new Intent("com.android.settings.action.SUPPORT_SETTINGS");
ResolveInfo resolveInfo = RuntimeEnvironment.getPackageManager().resolveActivity(
intent,
PackageManager.MATCH_DEFAULT_ONLY);
assertThat(resolveInfo).isNotNull();
assertThat(resolveInfo.activityInfo.targetActivity)
.isEqualTo(SupportDashboardActivity.class.getName());
}
} }