diff options
Diffstat (limited to 'AndroidManifest.xml')
| -rw-r--r-- | AndroidManifest.xml | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 41eb461ba..8f48edf20 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> |