summaryrefslogtreecommitdiffstats
path: root/AndroidManifest.xml
diff options
context:
space:
mode:
authorMangesh Ghiware <mghiware@google.com>2013-09-11 15:59:59 -0700
committerMangesh Ghiware <mghiware@google.com>2013-09-26 17:32:12 -0700
commit06c027675948259368a902fd6f8c2ecac5db5167 (patch)
treebcd3c500b5d3d470a8132f40cb704ffcaa2453af /AndroidManifest.xml
parent641be74bd9d3f96d8665b23121f40efb8df2ea83 (diff)
downloadandroid_packages_apps_Gallery2-06c027675948259368a902fd6f8c2ecac5db5167.zip
android_packages_apps_Gallery2-06c027675948259368a902fd6f8c2ecac5db5167.tar.gz
android_packages_apps_Gallery2-06c027675948259368a902fd6f8c2ecac5db5167.tar.bz2
Rename Gallery activity and add trampoline
Bug: 10807861 Change-Id: Iaaf17b579db2fe09900e9817f766f43dd66dea61
Diffstat (limited to 'AndroidManifest.xml')
-rw-r--r--AndroidManifest.xml15
1 files changed, 13 insertions, 2 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 41eb461..8f48edf 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -85,7 +85,7 @@
</intent-filter>
</activity>
- <activity android:name="com.android.gallery3d.app.Gallery" android:label="@string/app_name"
+ <activity android:name="com.android.gallery3d.app.GalleryActivity" android:label="@string/app_name"
android:configChanges="keyboardHidden|orientation|screenSize">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -161,10 +161,21 @@
</intent-filter>
</activity>
+ <!-- This activity acts as a trampoline to the new Gallery activity,
+ so that existing shortcuts are preserved. -->
+ <activity android:name="com.android.gallery3d.app.Gallery"
+ android:excludeFromRecents="true"
+ android:theme="@style/android:Theme.NoDisplay">
+ <intent-filter>
+ <action android:name="android.intent.action.MAIN" />
+ <category android:name="android.intent.category.DEFAULT" />
+ </intent-filter>
+ </activity>
+
<!-- we add this activity-alias for shortcut backward compatibility -->
<!-- Note: The alias must put after the target activity -->
<activity-alias android:name="com.cooliris.media.Gallery"
- android:targetActivity="com.android.gallery3d.app.Gallery"
+ android:targetActivity="com.android.gallery3d.app.GalleryActivity"
android:configChanges="keyboardHidden|orientation|screenSize"
android:label="@string/app_name">
<intent-filter>