Merge "Add intent action to support page" into oc-dr1-dev
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index cd505d6..e2907ea 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -3038,6 +3038,10 @@
<intent-filter android:priority="-2">
<action android:name="com.android.settings.action.SETTINGS"/>
</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"
android:value="com.android.settings.category.ia.homepage"/>
<meta-data android:name="com.android.settings.summary"
diff --git a/tests/robotests/src/com/android/settings/support/SupportDashboardActivityTest.java b/tests/robotests/src/com/android/settings/support/SupportDashboardActivityTest.java
index 0cea23e..2c59ba7 100644
--- a/tests/robotests/src/com/android/settings/support/SupportDashboardActivityTest.java
+++ b/tests/robotests/src/com/android/settings/support/SupportDashboardActivityTest.java
@@ -17,8 +17,12 @@
package com.android.settings.support;
+import static com.google.common.truth.Truth.assertThat;
+
import android.content.Context;
import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
import com.android.settings.R;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -33,8 +37,6 @@
import java.util.List;
-import static com.google.common.truth.Truth.assertThat;
-
@RunWith(SettingsRobolectricTestRunner.class)
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class SupportDashboardActivityTest {
@@ -62,4 +64,17 @@
assertThat(value.intentTargetClass).isEqualTo(SupportDashboardActivity.class.getName());
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());
+ }
}