summaryrefslogtreecommitdiffstats
path: root/AndroidManifest.xml
diff options
context:
space:
mode:
authorSteve Kondik <steve@cyngn.com>2015-10-17 23:40:33 -0700
committerSteve Kondik <steve@cyngn.com>2015-10-17 23:40:33 -0700
commitbcbf7c98a521b9ee4a7d03e00dcfc469c9b3a398 (patch)
tree85d07b2095695fe79235ab16e627f8b22c7bfd8d /AndroidManifest.xml
parenta3fcd50080c0546ebd5f0caf932eef02fabdd7ad (diff)
parent8de528917bf03cca93ac2a3dd19b7a5719d1a26e (diff)
downloadandroid_packages_apps_Gallery2-bcbf7c98a521b9ee4a7d03e00dcfc469c9b3a398.zip
android_packages_apps_Gallery2-bcbf7c98a521b9ee4a7d03e00dcfc469c9b3a398.tar.gz
android_packages_apps_Gallery2-bcbf7c98a521b9ee4a7d03e00dcfc469c9b3a398.tar.bz2
Merge branch 'cm-12.1' of git://github.com/CyanogenMod/android_packages_apps_Gallery2 into cm-13.0
Change-Id: Ib8caa024d2e6feca332e3645038f226fd5a910a2
Diffstat (limited to 'AndroidManifest.xml')
-rw-r--r--AndroidManifest.xml102
1 files changed, 97 insertions, 5 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 31a2495..be35585 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,4 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (c) 2010-2014, The Linux Foundation. All rights reserved.
+ Not a Contribution.
+
+ Copyright (C) 2007 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
<manifest android:versionCode="40030"
android:versionName="1.1.40030"
@@ -7,11 +24,14 @@
<original-package android:name="com.android.gallery3d" />
- <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="17" />
+ <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="21" />
<permission android:name="com.android.gallery3d.permission.GALLERY_PROVIDER"
android:protectionLevel="signatureOrSystem" />
+ <permission android:name="com.android.gallery3d.permission.STORAGE_CHANGE"
+ android:protectionLevel="signatureOrSystem" />
+
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
@@ -19,6 +39,7 @@
<uses-permission android:name="android.permission.GET_ACCOUNTS" />
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.MANAGE_ACCOUNTS" />
+ <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
<uses-permission android:name="android.permission.NFC" />
<uses-permission android:name="android.permission.READ_SYNC_SETTINGS" />
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
@@ -29,8 +50,11 @@
<uses-permission android:name="android.permission.WAKE_LOCK" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.WRITE_SETTINGS" />
+ <uses-permission android:name="android.permission.WRITE_APN_SETTINGS"/>
<uses-permission android:name="android.permission.WRITE_SYNC_SETTINGS" />
+ <uses-permission android:name="android.permission.WRITE_MEDIA_STORAGE"/>
<uses-permission android:name="com.android.gallery3d.permission.GALLERY_PROVIDER" />
+ <uses-permission android:name="android.permission.BLUETOOTH" />
<supports-screens android:smallScreens="false"
android:normalScreens="true" android:largeScreens="true"
@@ -64,6 +88,7 @@
<data android:scheme="https" />
<data android:scheme="content" />
<data android:scheme="file" />
+ <data android:scheme="rtsp" />
<data android:mimeType="video/mpeg4" />
<data android:mimeType="video/mp4" />
<data android:mimeType="video/3gp" />
@@ -72,6 +97,14 @@
<data android:mimeType="video/webm" />
<data android:mimeType="video/avi" />
<data android:mimeType="application/sdp" />
+ <data android:mimeType="video/mp2ts" />
+ <data android:mimeType="video/x-ms-asf" />
+ <data android:mimeType="video/x-ms-wmv" />
+ <data android:mimeType="video/x-matroska" />
+ <data android:mimeType="video/x-msvideo"/>
+ <data android:mimeType="video/divx" />
+ <data android:mimeType="video/mkv" />
+ <data android:mimeType="video/mpeg" />
</intent-filter>
<intent-filter>
<!-- HTTP live support -->
@@ -88,8 +121,9 @@
</intent-filter>
</activity>
- <activity android:name="com.android.gallery3d.app.GalleryActivity" android:label="@string/app_name"
- android:configChanges="keyboardHidden|orientation|screenSize">
+ <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" />
<category android:name="android.intent.category.DEFAULT" />
@@ -144,6 +178,7 @@
<data android:mimeType="image/png" />
<data android:mimeType="image/webp" />
<data android:mimeType="image/x-ms-bmp" />
+ <data android:mimeType="image/x-MS-bmp" />
<data android:mimeType="image/vnd.wap.wbmp" />
<data android:mimeType="application/vnd.google.panorama360+jpg" />
</intent-filter>
@@ -166,8 +201,7 @@
<!-- 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">
+ <activity android:name="com.android.gallery3d.app.Gallery">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.DEFAULT" />
@@ -299,6 +333,16 @@
android:theme="@style/Theme.Gallery"
android:configChanges="orientation|keyboardHidden|screenSize" />
+ <activity android:name="com.android.gallery3d.util.ViewGifImage"
+ android:theme="@android:style/Theme.Black.NoTitleBar.Fullscreen"
+ android:configChanges="orientation|keyboardHidden|screenSize|keyboard|navigation">
+ <intent-filter>
+ <action android:name="com.android.gallery3d.VIEW_GIF" />
+ <data android:mimeType="image/gif" />
+ <category android:name="android.intent.category.DEFAULT" />
+ </intent-filter>
+ </activity>
+
<provider android:name="com.android.gallery3d.provider.GalleryProvider"
android:syncable="false"
android:grantUriPermissions="true"
@@ -355,6 +399,54 @@
</intent-filter>
</receiver>
+ <!-- Receiver to keep the storage path for the camera in sync -->
+ <receiver android:name="com.android.gallery3d.app.StorageChangeReceiver"
+ android:permission="com.android.gallery3d.permission.STORAGE_CHANGE" >
+ <intent-filter>
+ <action android:name="com.android.gallery3d.STORAGE_CHANGE" />
+ </intent-filter>
+ </receiver>
+
<service android:name="com.android.camera.MediaSaveService" />
+
+ <activity android:name="org.codeaurora.gallery3d.video.SettingsActivity"
+ android:configChanges="keyboardHidden|orientation|screenSize"
+ android:label="@string/streaming_settings" >
+ <intent-filter>
+ <action android:name="org.codeaurora.settings.streaming" />
+ <action android:name="android.intent.action.MAIN" />
+ <category android:name="android.intent.category.DEFAULT" />
+ </intent-filter>
+ </activity>
+ <receiver android:name="org.codeaurora.gallery3d.video.DmReceiver" >
+ <intent-filter>
+ <action android:name="android.intent.action.BOOT_COMPLETED" />
+ <action android:name="streaming.action.WRITE_SETTINGS" />
+ </intent-filter>
+ </receiver>
+
+ <activity android:name="org.codeaurora.gallery3d.video.BookmarkActivity"
+ android:configChanges="keyboardHidden|orientation|screenSize"
+ android:icon="@drawable/ic_menu_display_bookmark"
+ android:label="@string/bookmark_list"
+ android:theme="@android:style/Theme.Holo" >
+ <intent-filter>
+ <action android:name="org.codeaurora.bookmark.VIEW" />
+ <category android:name="android.intent.category.DEFAULT" />
+ </intent-filter>
+ </activity>
+ <activity android:name="org.codeaurora.gallery3d.video.VideoSettingsActivity"
+ android:label="@string/movie_view_label"
+ android:configChanges="orientation|keyboardHidden|screenSize|mnc|mcc">
+ </activity>
+ <provider
+ android:name="android.support.v4.content.FileProvider"
+ android:authorities="com.android.gallery3d.fileprovider"
+ android:exported="false"
+ android:grantUriPermissions="true">
+ <meta-data
+ android:name="android.support.FILE_PROVIDER_PATHS"
+ android:resource="@xml/file_paths" />
+ </provider>
</application>
</manifest>