diff options
| author | Owen Lin <owenlin@google.com> | 2011-09-01 14:11:19 +0800 |
|---|---|---|
| committer | Owen Lin <owenlin@google.com> | 2011-09-01 17:51:55 +0800 |
| commit | 4d888ed930b5898882b77f80239476b3205f7046 (patch) | |
| tree | 047d24ffbe6d236dc5decd807aec7bf1f67f511a | |
| parent | 7876805a21e522941dd6f8ec9683755229be6eff (diff) | |
| download | android_packages_apps_Snap-4d888ed930b5898882b77f80239476b3205f7046.tar.gz android_packages_apps_Snap-4d888ed930b5898882b77f80239476b3205f7046.tar.bz2 android_packages_apps_Snap-4d888ed930b5898882b77f80239476b3205f7046.zip | |
Fix alias not found issue.
Also remove note message in proguard.
Change-Id: I7e15a3b00d7caf32565d035f6c972d302e38d49f
| -rw-r--r-- | AndroidManifest.xml | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 7d9bc1ace..a5a64219d 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -67,16 +67,6 @@ </intent-filter> </activity> - <!-- we add the activity-alias for shortcut backward compatibility --> - <activity-alias android:name="com.cooliris.media.Gallery" - android:targetActivity="com.android.gallery3d.app.Gallery" - android:configChanges="keyboardHidden|orientation|screenSize" - android:label="string/app_name"> - <intent-filter> - <action android:name="android.intent.action.MAIN" /> - </intent-filter> - </activity-alias> - <activity android:name="com.android.gallery3d.app.Gallery" android:label="@string/app_name" android:configChanges="keyboardHidden|orientation|screenSize"> <intent-filter> @@ -149,6 +139,17 @@ </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:configChanges="keyboardHidden|orientation|screenSize" + android:label="string/app_name"> + <intent-filter> + <action android:name="android.intent.action.MAIN" /> + </intent-filter> + </activity-alias> + <!-- This activity receives USB_DEVICE_ATTACHED Intents and springboards to main Gallery activity. --> <activity android:name="com.android.gallery3d.app.UsbDeviceActivity" android:label="@string/app_name" android:taskAffinity="" |