diff options
| -rw-r--r-- | AndroidManifest.xml | 21 | ||||
| -rw-r--r-- | proguard.flags | 3 |
2 files changed, 14 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="" diff --git a/proguard.flags b/proguard.flags index 0df05e3dc..a8cb36369 100644 --- a/proguard.flags +++ b/proguard.flags @@ -1,3 +1,6 @@ +# Disable the warnings of using dynamic method call in common library. +-dontnote com.android.gallery3d.common.* + # Keep all classes extended from com.android.gallery3d.common.Entry # Since we annotate on the fields and use reflection to create SQL # according to those field. |