summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid van Tonder <david.vantonder@gmail.com>2013-06-05 05:41:46 -0700
committerGerrit Code Review <gerrit@cyanogenmod.org>2013-06-05 05:41:46 -0700
commita0f21df6ba8c58a3815dabc47f1a3a9e9a43beee (patch)
tree22340d18f6edf4ca02c22c97020fbbc59cdbf80f
parent46545ec744e6521b782319471f617321b52a6388 (diff)
parent585f0f3f28fcf9be3720db72fcd3a41b11dcfe1a (diff)
downloadpackages_apps_settings-a0f21df6ba8c58a3815dabc47f1a3a9e9a43beee.zip
packages_apps_settings-a0f21df6ba8c58a3815dabc47f1a3a9e9a43beee.tar.gz
packages_apps_settings-a0f21df6ba8c58a3815dabc47f1a3a9e9a43beee.tar.bz2
Merge "No back icon in action bar of APN Settings" into cm-10.1
-rw-r--r--AndroidManifest.xml3
1 files changed, 2 insertions, 1 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index f1a1bde..014f65d 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -336,7 +336,8 @@
<activity android:name="Settings$ApnSettingsActivity" android:label="@string/apn_settings"
android:uiOptions="none"
android:configChanges="orientation|keyboardHidden|screenSize"
- android:launchMode="singleTask" android:clearTaskOnLaunch="true">
+ android:launchMode="singleTask" android:clearTaskOnLaunch="true"
+ android:parentActivityName="Settings$WirelessSettingsActivity">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<action android:name="android.settings.APN_SETTINGS" />