<?xml version="1.0" encoding="utf-8"?>
-<manifest android:versionCode="40001"
- android:versionName="1.1.40001"
+<manifest android:versionCode="40007"
+ android:versionName="1.1.40007"
xmlns:android="http://schemas.android.com/apk/res/android"
package="com.android.gallery3d">
<original-package android:name="com.android.gallery3d" />
- <uses-sdk android:minSdkVersion="10" android:targetSdkVersion="16" />
+ <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="17" />
<permission android:name="com.android.gallery3d.permission.GALLERY_PROVIDER"
android:protectionLevel="signatureOrSystem" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.WRITE_SETTINGS" />
<uses-permission android:name="android.permission.WRITE_SYNC_SETTINGS" />
+ <uses-permission android:name="com.android.gallery3d.permission.GALLERY_PROVIDER" />
<supports-screens android:smallScreens="false"
android:normalScreens="true" android:largeScreens="true"
</intent-filter>
</activity>
- <activity android:name="com.android.gallery3d.app.Gallery" android:label="@string/app_name"
- android:configChanges="keyboardHidden|orientation|screenSize">
+ <activity
+ android:name="com.android.photos.GalleryActivity"
+ android:label="@string/app_name"
+ android:configChanges="keyboardHidden|orientation|screenSize"
+ android:theme="@style/Theme.Photos.Gallery"
+ android:uiOptions="splitActionBarWhenNarrow">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.DEFAULT" />
<data android:mimeType="image/*" />
<data android:mimeType="video/*" />
</intent-filter>
+ <!-- We do NOT support the PICK intent, we add these intent-filter for
+ backward compatibility. Handle it as GET_CONTENT. -->
+ <intent-filter>
+ <action android:name="android.intent.action.PICK" />
+ <category android:name="android.intent.category.DEFAULT" />
+ <data android:mimeType="image/*" />
+ <data android:mimeType="video/*" />
+ </intent-filter>
+ <intent-filter>
+ <action android:name="android.intent.action.PICK" />
+ <category android:name="android.intent.category.DEFAULT" />
+ <data android:mimeType="vnd.android.cursor.dir/image" />
+ <data android:mimeType="vnd.android.cursor.dir/video" />
+ </intent-filter>
+ </activity>
+ <activity
+ android:name="com.android.photos.AlbumActivity"
+ android:configChanges="keyboardHidden|orientation|screenSize"
+ android:theme="@style/Theme.Photos.Gallery"
+ android:uiOptions="splitActionBarWhenNarrow"
+ android:exported="false">
+ </activity>
+ <activity
+ android:name="com.android.gallery3d.app.Gallery"
+ android:label="@string/app_name"
+ android:configChanges="keyboardHidden|orientation|screenSize">
<intent-filter>
<action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.DEFAULT" />
<data android:mimeType="video/3gpp2" />
<data android:mimeType="application/sdp" />
</intent-filter>
- <!-- We do NOT support the PICK intent, we add these intent-filter for
- backward compatibility. Handle it as GET_CONTENT. -->
- <intent-filter>
- <action android:name="android.intent.action.PICK" />
- <category android:name="android.intent.category.DEFAULT" />
- <data android:mimeType="image/*" />
- <data android:mimeType="video/*" />
- </intent-filter>
- <intent-filter>
- <action android:name="android.intent.action.PICK" />
- <category android:name="android.intent.category.DEFAULT" />
- <data android:mimeType="vnd.android.cursor.dir/image" />
- <data android:mimeType="vnd.android.cursor.dir/video" />
- </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"
+ <activity android:name="com.android.photos.FullscreenViewer"
+ android:label="@string/app_name"
android:configChanges="keyboardHidden|orientation|screenSize"
- android:label="@string/app_name">
- <intent-filter>
- <action android:name="android.intent.action.MAIN" />
- </intent-filter>
- </activity-alias>
+ android:theme="@style/Theme.Photos.Fullscreen"
+ android:parentActivityName="com.android.photos.GalleryActivity">
+ </activity>
<!-- This activity receives USB_DEVICE_ATTACHED intents and allows importing
media from attached MTP devices, like cameras and camera phones -->
<activity android:launchMode="singleInstance"
android:taskAffinity="" android:name="com.android.gallery3d.ingest.IngestActivity"
+ android:configChanges="orientation|screenSize"
android:label="@string/app_name">
<intent-filter>
<action android:name="android.hardware.usb.action.USB_DEVICE_ATTACHED" />
android:exported="true"
android:permission="com.android.gallery3d.permission.GALLERY_PROVIDER"
android:authorities="com.android.gallery3d.provider" />
+ <provider
+ android:name="com.android.photos.data.PhotoProvider"
+ android:authorities="com.android.gallery3d.photoprovider"
+ android:syncable="false"
+ android:exported="false"/>
<activity android:name="com.android.gallery3d.gadget.WidgetClickHandler" />
<activity android:name="com.android.gallery3d.app.DialogPicker"
android:configChanges="keyboardHidden|orientation|screenSize"
</activity>
<service android:name="com.android.gallery3d.app.BatchService" />
<service android:name="com.android.camera.MediaSaveService" />
-
- <!-- canvas -->
- <provider
- android:name="com.android.photos.canvas.CanvasProvider"
- android:authorities="com.android.gallery3d.provider.CanvasProvider"
- android:exported="true"
- android:label="@string/app_name"
- android:permission="android.permission.ACCESS_APP_BROWSE_DATA" />
- <activity android:name="com.android.photos.canvas.EnableSyncActivity"
- android:exported="true"
- android:theme="@style/Theme.ProxyLauncher">
- </activity>
- <activity android:name="com.android.photos.canvas.CanvasActivity"
- android:label="@string/app_name"
- android:exported="true"
- android:theme="@style/Theme.ProxyLauncher">
- <intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="com.google.android.canvas.category.BROWSE_LAUNCHER" />
- </intent-filter>
- <meta-data
- android:name="com.google.android.canvas.data.launcher_info"
- android:resource="@xml/canvas_info" />
- </activity>
</application>
</manifest>