summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSanket Padawe <sanketpadawe@google.com>2015-02-03 18:14:03 +0000
committerandroid-build-merger <android-build-merger@google.com>2015-02-03 18:14:03 +0000
commitc1af278c9da7f355fd9da883efb88a3e4d0f3b19 (patch)
tree409a6b2f849821130c91ac9daf57188f502161ad
parent98d8a490d5930c9f6179c8aefe792012c542ddbb (diff)
parent4decadbc44b12cca8790b4d27ab9c29e34cb9909 (diff)
downloadpackages_apps_Settings-c1af278c9da7f355fd9da883efb88a3e4d0f3b19.zip
packages_apps_Settings-c1af278c9da7f355fd9da883efb88a3e4d0f3b19.tar.gz
packages_apps_Settings-c1af278c9da7f355fd9da883efb88a3e4d0f3b19.tar.bz2
Merge "Remove SimDialogActivity from recents app list." into lmp-mr1-dev
automerge: 4decadb * commit '4decadbc44b12cca8790b4d27ab9c29e34cb9909': Remove SimDialogActivity from recents app list.
-rw-r--r--AndroidManifest.xml3
1 files changed, 2 insertions, 1 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 99133a5..ad84ff9 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -2051,7 +2051,8 @@
<activity android:name=".sim.SimDialogActivity"
android:theme="@android:style/Theme.Material.Light.Dialog.NoActionBar"
- android:label="@string/sim_settings_title">
+ android:label="@string/sim_settings_title"
+ android:excludeFromRecents="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
</intent-filter>