diff options
| author | Likai Ding <likaid@codeaurora.org> | 2013-08-19 16:33:24 +0800 |
|---|---|---|
| committer | emancebo <emancebo@cyngn.com> | 2014-09-04 10:40:18 -0700 |
| commit | 3a90696f1ed0609449ca9adc02c931970cefd988 (patch) | |
| tree | 553f245c2506b6c791a281dab865fb686be90759 /AndroidManifest.xml | |
| parent | 93a66b850bdb0a06ad7fda0549eb47b8123292bc (diff) | |
| download | android_packages_apps_Gallery2-3a90696f1ed0609449ca9adc02c931970cefd988.tar.gz android_packages_apps_Gallery2-3a90696f1ed0609449ca9adc02c931970cefd988.tar.bz2 android_packages_apps_Gallery2-3a90696f1ed0609449ca9adc02c931970cefd988.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 eedb7b893..5d44f902a 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -32,6 +32,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" /> @@ -384,5 +385,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> |