diff options
| author | Likai Ding <likaid@codeaurora.org> | 2013-08-19 16:33:24 +0800 |
|---|---|---|
| committer | Xiaojing Zhang <zhangx@codeaurora.org> | 2014-11-04 20:38:02 -0800 |
| commit | d42e6dcbee24b917936c1d670ca659970c76d4d1 (patch) | |
| tree | 518ec0bbbd08a24abdb8e415d9de0f301fb4a095 /AndroidManifest.xml | |
| parent | 9bc105fca37faf4c868987b3a22992e39e4348f2 (diff) | |
| download | android_packages_apps_Gallery2-d42e6dcbee24b917936c1d670ca659970c76d4d1.tar.gz android_packages_apps_Gallery2-d42e6dcbee24b917936c1d670ca659970c76d4d1.tar.bz2 android_packages_apps_Gallery2-d42e6dcbee24b917936c1d670ca659970c76d4d1.zip | |
Gallery2: support live streaming and bookmarks
Users can input a URL for streaming display.
URL bookmarking is supported.
Change-Id: Ia69497cdcfee963ba2209119a5b9dc82b64497da
Diffstat (limited to 'AndroidManifest.xml')
| -rw-r--r-- | AndroidManifest.xml | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 52048895b..58b2a1a6f 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -29,6 +29,7 @@ <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="com.android.gallery3d.permission.GALLERY_PROVIDER" /> @@ -364,5 +365,33 @@ </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> + </application> </manifest> |