Revert the way Special app access is launched.

- change it back to launch the fragment instead of intent activity.
- update the test case to launch special app access from Apps &
notifications page instead of directly launching it.

Change-Id: I61289ba0fa6cc4585c87cf337aa2007fb578450f
Fixes: 68397751
Test: visual, make SettingsUnitTests

AndroidManifest.xml

@@ -2539,16 +2539,6 @@
             </intent-filter>
         </activity>
 
-        <activity android:name="Settings$SpecialAccessSettingsActivity"
-                  android:taskAffinity="">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                       android:value="com.android.settings.applications.SpecialAccessSettings" />
-        </activity>
-
         <activity android:name="Settings$NotificationAccessSettingsActivity"
                   android:label="@string/manage_notification_access_title"
                   android:taskAffinity="">

res/xml/app_and_notification.xml

@@ -72,12 +72,8 @@
 
     <Preference
         android:key="special_access"
+        android:fragment="com.android.settings.applications.SpecialAccessSettings"
         android:title="@string/special_access"
-        android:order="20" >
-        <intent
-            android:action="android.intent.action.MAIN"
-            android:targetPackage="com.android.settings"
-            android:targetClass="com.android.settings.Settings$SpecialAccessSettingsActivity" />
-    </Preference>
+        android:order="20" />
 
 </PreferenceScreen>

src/com/android/settings/Settings.java

@@ -107,7 +107,6 @@ public class Settings extends SettingsActivity {
     public static class DreamSettingsActivity extends SettingsActivity { /* empty */ }
     public static class NotificationStationActivity extends SettingsActivity { /* empty */ }
     public static class UserSettingsActivity extends SettingsActivity { /* empty */ }
-    public static class SpecialAccessSettingsActivity extends SettingsActivity { /* empty */ }
     public static class NotificationAccessSettingsActivity extends SettingsActivity { /* empty */ }
     public static class VrListenersSettingsActivity extends SettingsActivity { /* empty */ }
     public static class PictureInPictureSettingsActivity extends SettingsActivity { /* empty */ }

src/com/android/settings/core/gateway/SettingsGateway.java

@@ -52,7 +52,6 @@ import com.android.settings.applications.PictureInPictureDetails;
 import com.android.settings.applications.PictureInPictureSettings;
 import com.android.settings.applications.ProcessStatsSummary;
 import com.android.settings.applications.ProcessStatsUi;
-import com.android.settings.applications.SpecialAccessSettings;
 import com.android.settings.applications.UsageAccessDetails;
 import com.android.settings.applications.VrListenerSettings;
 import com.android.settings.applications.WriteSettingsDetails;
@@ -194,7 +193,6 @@ public class SettingsGateway {
             DataUsageSummary.class.getName(),
             DreamSettings.class.getName(),
             UserSettings.class.getName(),
-            SpecialAccessSettings.class.getName(),
             NotificationAccessSettings.class.getName(),
             ZenAccessSettings.class.getName(),
             ZenModeAutomationSettings.class.getName(),

tests/unit/src/com/android/settings/ManagedAccessSettingsLowRamTest.java

@@ -17,6 +17,7 @@
 package com.android.settings;
 
 import static android.support.test.espresso.Espresso.onView;
+import static android.support.test.espresso.action.ViewActions.click;
 import static android.support.test.espresso.assertion.ViewAssertions.doesNotExist;
 import static android.support.test.espresso.assertion.ViewAssertions.matches;
 import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed;
@@ -51,7 +52,9 @@ public class ManagedAccessSettingsLowRamTest {
     @Test
     public void testManagedAccessOptionsVisibility() throws Exception {
         mInstrumentation.startActivitySync(new Intent(mTargetContext,
-                com.android.settings.Settings.SpecialAccessSettingsActivity.class));
+                com.android.settings.Settings.AppAndNotificationDashboardActivity.class));
+        onView(withText(mTargetContext.getString(R.string.expand_button_title))).perform(click());
+        onView(withText(mTargetContext.getString(R.string.special_access))).perform(click());
 
         String[] managedServiceLabels = new String[] {"Do Not Disturb access",
                 "VR helper services", "Notification access", "Picture-in-picture"};