commit 61a1fec49fbfbe8bdd0137ddb06e5eacf4f8ec54
author Fabrice Di Meglio <fdimeglio@google.com> Wed Aug 13 16:22:38 2014 -0700
committer Fabrice Di Meglio <fdimeglio@google.com> Fri Aug 15 11:36:31 2014 -0700
tree fe8378adba969bd44b0a1315037b6dd306b00a02
parent 898671f14123695d74bd308450a462d11a341d1a

Fix bug #16703191 APN settings shows back button even when you intent into it

- change a bit the way we recognize a SubSetting. Now we can pass the new
":settings:show_fragment_as_subsetting" Intent extra for forcing it.
- convert ApnSettings to a SettingsPreferenceFragment

Change-Id: I22167ad317530c0a58c4d522a72826f9d34ad2d3

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 2d2f9b4..6cb227c 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -295,10 +295,11 @@
             </intent-filter>
         </activity-alias>
 
-        <activity android:name="ApnSettings"
+        <activity android:name="Settings$ApnSettingsActivity"
                 android:label="@string/apn_settings"
-                android:configChanges="orientation|keyboardHidden|screenSize"
                 android:launchMode="singleTask"
+                android:taskAffinity="com.android.settings"
+                android:configChanges="orientation|keyboardHidden|screenSize"
                 android:parentActivityName="Settings$WirelessSettingsActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -308,6 +309,8 @@
             </intent-filter>
             <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
                 android:value="true" />
+            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+                       android:value="com.android.settings.ApnSettings" />
         </activity>
 
         <activity android:name="Settings$BluetoothSettingsActivity"