<original-package android:name="com.android.gallery3d" />
- <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="17" />
+ <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="24" />
<permission android:name="com.android.gallery3d.permission.GALLERY_PROVIDER"
android:protectionLevel="signatureOrSystem" />
android:logo="@mipmap/ic_launcher_gallery"
android:hardwareAccelerated="true"
android:largeHeap="true"
- android:restoreAnyVersion="true">
+ android:restoreAnyVersion="true"
+ android:supportsRtl="true"
+ usesCleartextHttp="true">
<uses-library android:name="com.google.android.media.effects" android:required="false" />
+ <uses-library android:name="org.apache.http.legacy" android:required="false" />
<activity android:name="com.android.gallery3d.app.MovieActivity"
android:label="@string/movie_view_label"
android:configChanges="orientation|keyboardHidden|screenSize">
</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" />
<data android:scheme="https" />
<data android:scheme="content" />
<data android:scheme="file" />
- <data android:mimeType="image/bmp" />
- <data android:mimeType="image/jpeg" />
- <data android:mimeType="image/gif" />
- <data android:mimeType="image/png" />
- <data android:mimeType="image/webp" />
- <data android:mimeType="image/x-ms-bmp" />
- <data android:mimeType="image/vnd.wap.wbmp" />
+ <data android:mimeType="image/*" />
<data android:mimeType="application/vnd.google.panorama360+jpg" />
</intent-filter>
<intent-filter>
</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: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>
<activity android:name="com.android.camera.CameraActivity"
android:icon="@mipmap/ic_launcher_camera"
android:label="@string/camera_label"
+ android:taskAffinity="com.android.camera.CameraActivity"
android:theme="@style/android:Theme.NoDisplay" />
<activity-alias android:name="com.android.camera.CameraLauncher"
+ android:label="@string/camera_label"
android:targetActivity="com.android.camera.CameraActivity">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
</intent-filter>
</activity>
- <permission android:name="com.android.gallery3d.filtershow.permission.READ"
- android:protectionLevel="signature" />
-
- <permission android:name="com.android.gallery3d.filtershow.permission.WRITE"
- android:protectionLevel="signature" />
-
<provider
android:name="com.android.gallery3d.filtershow.provider.SharedImageProvider"
android:authorities="com.android.gallery3d.filtershow.provider.SharedImageProvider"
<activity
android:name="com.android.gallery3d.filtershow.crop.CropActivity"
android:label="@string/crop"
- android:theme="@style/Theme.FilterShow"
+ android:theme="@style/Theme.Crop"
android:configChanges="keyboardHidden|orientation|screenSize">
<intent-filter android:label="@string/crop_label">
<action android:name="com.android.camera.action.CROP" />
- <data android:scheme="http" />
- <data android:scheme="https" />
<data android:scheme="content" />
<data android:scheme="file" />
- <data android:scheme="" />
<data android:mimeType="image/*" />
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.ALTERNATIVE" />
</intent-filter>
</activity>
<service android:name="com.android.gallery3d.app.BatchService" />
+
+ <receiver android:name="com.android.camera.DisableCameraReceiver">
+ <intent-filter>
+ <action android:name="android.intent.action.BOOT_COMPLETED" />
+ </intent-filter>
+ </receiver>
+
<service android:name="com.android.camera.MediaSaveService" />
</application>
</manifest>