Gallery2: support live streaming and bookmarks

Users can input a URL for streaming display.
URL bookmarking is supported.

Change-Id: Ia69497cdcfee963ba2209119a5b9dc82b64497da

12 files changed, 271 insertions, 105 deletions

diff --git a/res/drawable-hdpi/ic_menu_display_bookmark.png b/res/drawable-hdpi/ic_menu_display_bookmark.png
index a5118ea85..a5118ea85 100755..100644
--- a/res/drawable-hdpi/ic_menu_display_bookmark.png
+++ b/res/drawable-hdpi/ic_menu_display_bookmark.png
diff --git a/res/drawable-mdpi/ic_menu_display_bookmark.png b/res/drawable-mdpi/ic_menu_display_bookmark.png
index a3acdd64b..a3acdd64b 100755..100644
--- a/res/drawable-mdpi/ic_menu_display_bookmark.png
+++ b/res/drawable-mdpi/ic_menu_display_bookmark.png
diff --git a/res/drawable-xhdpi/ic_menu_display_bookmark.png b/res/drawable-xhdpi/ic_menu_display_bookmark.png
index 4ad8414be..4ad8414be 100755..100644
--- a/res/drawable-xhdpi/ic_menu_display_bookmark.png
+++ b/res/drawable-xhdpi/ic_menu_display_bookmark.png
diff --git a/res/layout/bookmark.xml b/res/layout/bookmark.xml
index 9b765d4d9..ac4ac34a4 100755..100644
--- a/res/layout/bookmark.xml
+++ b/res/layout/bookmark.xml
@@ -1,22 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    >
+    android:layout_height="match_parent" >
+
     <ListView
         android:id="@android:id/list"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        />
+        android:layout_height="match_parent" />
+
     <TextView
         android:id="@android:id/empty"
-        android:layout_width="match_parent" 
+        android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_centerInParent="true"
+        android:gravity="center"
         android:paddingBottom="30dip"
-        android:gravity ="center"
-        android:textAppearance="?android:attr/textAppearanceLarge"
         android:text="@string/bookmark_empty"
-        android:visibility="gone"
-        />
+        android:textAppearance="?android:attr/textAppearanceLarge"
+        android:visibility="gone" />
 </FrameLayout>
diff --git a/res/layout/bookmark_edit_dialog.xml b/res/layout/bookmark_edit_dialog.xml
index fa1439cdb..8282d39af 100755..100644
--- a/res/layout/bookmark_edit_dialog.xml
+++ b/res/layout/bookmark_edit_dialog.xml
@@ -1,37 +1,43 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-         android:layout_width="wrap_content"
-         android:layout_height="wrap_content">
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content" >
+
     <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:padding="8dip"
-            android:orientation="vertical">
-    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:padding="8dip" >
+
+        <TextView
+            style="?android:attr/textAppearanceSmallInverse"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            style="?android:attr/textAppearanceSmallInverse"
             android:text="@string/bookmark_title" />
-    <EditText 
+
+        <EditText
             android:id="@+id/title"
-            android:layout_width="match_parent" 
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="2dip"
-            android:singleLine="true"
             android:inputType="text"
-            android:scrollHorizontally="true" />
-    <TextView
+            android:scrollHorizontally="true"
+            android:singleLine="true" />
+
+        <TextView
+            style="?android:attr/textAppearanceSmallInverse"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            style="?android:attr/textAppearanceSmallInverse"
             android:text="@string/bookmark_location" />
-    <EditText 
+
+        <EditText
             android:id="@+id/data"
-            android:layout_width="match_parent" 
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="2dip"
-            android:singleLine="true"
             android:inputType="textUri"
-            android:scrollHorizontally="true" />
- </LinearLayout>
-</ScrollView>
\ No newline at end of file
+            android:scrollHorizontally="true"
+            android:singleLine="true" />
+    </LinearLayout>
+
+</ScrollView>
diff --git a/res/layout/bookmark_item.xml b/res/layout/bookmark_item.xml
index a743e9e17..3fb2fab89 100755..100644
--- a/res/layout/bookmark_item.xml
+++ b/res/layout/bookmark_item.xml
@@ -3,19 +3,19 @@
     android:id="@+id/panel"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:padding="6dip"
     android:orientation="vertical"
-    >
+    android:padding="6dip" >
+
     <TextView
-        android:id="@+id/title" 
-        android:layout_width="wrap_content" 
+        android:id="@+id/title"
+        android:layout_width="wrap_content"
         android:layout_height="match_parent"
-        android:textAppearance="?android:attr/textAppearanceMedium"
         android:singleLine="true"
-        />
-    <TextView 
+        android:textAppearance="?android:attr/textAppearanceMedium" />
+
+    <TextView
         android:id="@+id/data"
-        android:layout_width="wrap_content" 
-        android:layout_height="match_parent"
-        />
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent" />
+
 </LinearLayout>
diff --git a/res/layout/movie_view.xml b/res/layout/movie_view.xml
index 75b8dfd4f..a08679280 100644
--- a/res/layout/movie_view.xml
+++ b/res/layout/movie_view.xml
@@ -19,7 +19,7 @@
         android:background="@android:color/black"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
-    <VideoView android:id="@+id/surface_view"
+    <org.codeaurora.gallery3d.video.CodeauroraVideoView android:id="@+id/surface_view"
             android:visibility="invisible"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
diff --git a/res/values-zh-rCN/codeaurora_strings.xml b/res/values-zh-rCN/codeaurora_strings.xml
index cdf3c7811..ad4aefc6a 100644
--- a/res/values-zh-rCN/codeaurora_strings.xml
+++ b/res/values-zh-rCN/codeaurora_strings.xml
@@ -1,7 +1,71 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright (c) 2013, The Linux Foundation. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above
+      copyright notice, this list of conditions and the following
+      disclaimer in the documentation and/or other materials provided
+      with the distribution.
+    * Neither the name of The Linux Foundation nor the names of its
+      contributors may be used to endorse or promote products derived
+      from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
+WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
+ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
+BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-->
+
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="loop">"循环"</string>
     <string name="single">"单次"</string>
     <string name="stereo">"立体声"</string>
     <string name="single_track">"单声道"</string>
+    <string name="media_detail">"媒体详情"</string>
+    <string name="input_url">"输入 URL"</string>
+    <string name="streaming_settings">"流媒体设置"</string>
+
+    <string name="rtp">RTP</string>
+    <string name="rtcp">RTCP</string>
+    <string name="min_port">最小端口:</string>
+    <string name="max_port">最大端口:</string>
+    <string name="buffer_size">缓存大小</string>
+    <string name="apn">优先接入点</string>
+    <string name="rtp_min_port">RTP最小端口</string>
+    <string name="rtp_max_port">RTP最大端口</string>
+    <string name="rtcp_min_port">RTCP最小端口</string>
+    <string name="rtcp_max_port">RTCP最大端口</string>
+    <string name="set_rtp_min_port">设置RTP最小端口</string>
+    <string name="set_rtp_max_port">设置RTP最大端口</string>
+    <string name="set_rtcp_min_port">设置RTCP最小端口</string>
+    <string name="set_rtcp_max_port">设置RTCP最大端口</string>
+    <string name="set_buffer_size">设置缓冲大小</string>
+    <string name="set_apn">选择接入优先点</string>
+    <string name="setting">设置</string>
+
+    <string name="server_timeout_title">"服务器超时"</string>
+    <string name="server_timeout_message">"是否重新连接服务器以播放该视频？"</string>
+
+    <string name="bookmark_add">"添加书签"</string>
+    <string name="bookmark_display">"显示书签"</string>
+    <string name="bookmark_empty">"无书签"</string>
+    <string name="bookmark_exist">"已存在相同书签"</string>
+    <string name="bookmark_add_success">"添加书签成功"</string>
+    <string name="bookmark_list">"书签列表"</string>
+    <string name="bookmark_title">"标题"</string>
+    <string name="bookmark_location">"地址"</string>
+    <string name="delete_all">"删除所有"</string>
+    <string name="default_title">"默认标题"</string>
 </resources>
diff --git a/res/values-zh-rTW/codeaurora_strings.xml b/res/values-zh-rTW/codeaurora_strings.xml
index 8af6493d4..d72a86ecb 100644
--- a/res/values-zh-rTW/codeaurora_strings.xml
+++ b/res/values-zh-rTW/codeaurora_strings.xml
@@ -1,7 +1,71 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright (c) 2013, The Linux Foundation. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above
+      copyright notice, this list of conditions and the following
+      disclaimer in the documentation and/or other materials provided
+      with the distribution.
+    * Neither the name of The Linux Foundation nor the names of its
+      contributors may be used to endorse or promote products derived
+      from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
+WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
+ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
+BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-->
+
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="loop">"循環"</string>
     <string name="single">"單次"</string>
     <string name="stereo">"立體聲"</string>
     <string name="single_track">"單聲道"</string>
+    <string name="media_detail">"媒體詳情"</string>
+    <string name="input_url">"輸入 URL"</string>
+    <string name="streaming_settings">"串流設定"</string>
+
+    <string name="rtp">RTP</string>
+    <string name="rtcp">RTCP</string>
+    <string name="min_port">最小端口:</string>
+    <string name="max_port">最大端口:</string>
+    <string name="buffer_size">緩存大小</string>
+    <string name="apn">優先接入點</string>
+    <string name="rtp_min_port">RTP最小端口</string>
+    <string name="rtp_max_port">RTP最大端口</string>
+    <string name="rtcp_min_port">RTCP最小端口</string>
+    <string name="rtcp_max_port">RTCP最大端口</string>
+    <string name="set_rtp_min_port">設置RTP最小端口</string>
+    <string name="set_rtp_max_port">設置RTP最大端口</string>
+    <string name="set_rtcp_min_port">設置RTCP最小端口</string>
+    <string name="set_rtcp_max_port">設置RTCP最大端口</string>
+    <string name="set_buffer_size">設置緩衝大小</string>
+    <string name="set_apn">選擇接入優先點</string>
+    <string name="setting">設置</string>
+
+    <string name="server_timeout_title">"伺服器逾時"</string>
+    <string name="server_timeout_message">"是否重新連線伺服器並播放視訊？"</string>
+
+    <string name="bookmark_add">"添加書簽"</string>
+    <string name="bookmark_display">"顯示書簽"</string>
+    <string name="bookmark_empty">"無書簽"</string>
+    <string name="bookmark_exist">"已存在相同書簽"</string>
+    <string name="bookmark_add_success">"添加書簽成功"</string>
+    <string name="bookmark_list">"書簽列表"</string>
+    <string name="bookmark_title">"標題"</string>
+    <string name="bookmark_location">"位置"</string>
+    <string name="delete_all">"刪除所有"</string>
+    <string name="default_title">"默認標題"</string>
 </resources>
diff --git a/res/values/bool.xml b/res/values/bool.xml
index 802388e94..8d2a9f9bc 100755
--- a/res/values/bool.xml
+++ b/res/values/bool.xml
@@ -17,4 +17,5 @@
     <bool name="show_action_bar_title">false</bool>
     <bool name="loop">false</bool>
     <bool name="stereo">false</bool>
+    <bool name="streaming">false</bool>
 </resources>
\ No newline at end of file
diff --git a/res/values/codeaurora_strings.xml b/res/values/codeaurora_strings.xml
index 5d918b522..09de79cae 100644
--- a/res/values/codeaurora_strings.xml
+++ b/res/values/codeaurora_strings.xml
@@ -1,7 +1,71 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright (c) 2013, The Linux Foundation. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above
+      copyright notice, this list of conditions and the following
+      disclaimer in the documentation and/or other materials provided
+      with the distribution.
+    * Neither the name of The Linux Foundation nor the names of its
+      contributors may be used to endorse or promote products derived
+      from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
+WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
+ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
+BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-->
+
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="loop">"Loop"</string>
     <string name="single">"Single"</string>
     <string name="stereo">"Stereo"</string>
     <string name="single_track">"Single track"</string>
+    <string name="media_detail">"Media details"</string>
+    <string name="input_url">"Input URL"</string>
+    <string name="streaming_settings">"Streaming Settings"</string>
+
+    <string name="rtp">RTP</string>
+    <string name="rtcp">RTCP</string>
+    <string name="min_port">min port:</string>
+    <string name="max_port">max port:</string>
+    <string name="buffer_size">Buffer Size</string>
+    <string name="apn">Prefered APN</string>
+    <string name="rtp_min_port">Min port</string>
+    <string name="rtp_max_port">Max port</string>
+    <string name="rtcp_min_port">Min port</string>
+    <string name="rtcp_max_port">Max port</string>
+    <string name="set_rtp_min_port">Set min port</string>
+    <string name="set_rtp_max_port">Set max port</string>
+    <string name="set_rtcp_min_port">Set min port</string>
+    <string name="set_rtcp_max_port">Set max port</string>
+    <string name="set_buffer_size">Set buffer size</string>
+    <string name="set_apn">Select prefered apn</string>
+    <string name="setting">Settings</string>
+
+    <string name="server_timeout_title">"Server Timeout"</string>
+    <string name="server_timeout_message">"Reconnect the server to play the video or not?"</string>
+
+    <string name="bookmark_add">"Add bookmark"</string>
+    <string name="bookmark_display">"Show bookmarks"</string>
+    <string name="bookmark_empty">"No bookmarks"</string>
+    <string name="bookmark_exist">"Same bookmark in history"</string>
+    <string name="bookmark_add_success">"Add bookmark success"</string>
+    <string name="bookmark_list">"Bookmarks"</string>
+    <string name="bookmark_title">"Title"</string>
+    <string name="bookmark_location">"Location"</string>
+    <string name="delete_all">"Delete all"</string>
+    <string name="default_title">"Default title"</string>
 </resources>
diff --git a/res/xml/rtsp_settings_preferences.xml b/res/xml/rtsp_settings_preferences.xml
index b15080dfa..a5853808b 100755..100644
--- a/res/xml/rtsp_settings_preferences.xml
+++ b/res/xml/rtsp_settings_preferences.xml
@@ -1,89 +1,57 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- 
-write by lhy
--->
-
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <PreferenceCategory
-        android:title="@string/rtp">
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" >
 
+    <PreferenceCategory android:title="@string/rtp" >
         <EditTextPreference
-            android:order="1"
+            android:dialogTitle="@string/set_rtp_min_port"
+            android:inputType="number"
             android:key="rtp_min_port"
-            android:title="@string/rtp_min_port"
+            android:maxLength="5"
+            android:order="1"
             android:summary=""
-            android:inputType="number"
-        	android:maxLength="5"
-            android:dialogTitle="@string/set_rtp_min_port" />
-
+            android:title="@string/rtp_min_port" />
         <EditTextPreference
-            android:order="2"
+            android:dialogTitle="@string/rtp_max_port"
+            android:inputType="number"
             android:key="rtp_max_port"
-            android:title="@string/rtp_max_port"
+            android:maxLength="5"
+            android:order="2"
             android:summary=""
-            android:inputType="number"
-        	android:maxLength="5"
-            android:dialogTitle="@string/rtp_max_port" />
+            android:title="@string/rtp_max_port" />
     </PreferenceCategory>
-    
-    <PreferenceCategory
-        android:title="@string/rtcp">
-
+    <PreferenceCategory android:title="@string/rtcp" >
         <EditTextPreference
-            android:order="3"
+            android:dialogTitle="@string/set_rtcp_min_port"
+            android:inputType="number"
             android:key="rtcp_min_port"
-            android:title="@string/rtcp_min_port"
+            android:maxLength="5"
+            android:order="3"
             android:summary=""
-            android:inputType="number"
-        	android:maxLength="5"
-            android:dialogTitle="@string/set_rtcp_min_port" />
-
+            android:title="@string/rtcp_min_port" />
         <EditTextPreference
-            android:order="4"
+            android:dialogTitle="@string/rtcp_max_port"
+            android:inputType="number"
             android:key="rtcp_max_port"
-            android:title="@string/rtcp_max_port"
+            android:maxLength="5"
+            android:order="4"
             android:summary=""
-            android:inputType="number"
-        	android:maxLength="5"
-            android:dialogTitle="@string/rtcp_max_port" />
+            android:title="@string/rtcp_max_port" />
     </PreferenceCategory>
-    
-     <PreferenceCategory
-        android:title="@string/buffer_size">
-
+    <PreferenceCategory android:title="@string/buffer_size" >
         <EditTextPreference
-            android:order="5"
+            android:dialogTitle="@string/set_buffer_size"
+            android:inputType="number"
             android:key="buffer_size"
-            android:title="@string/buffer_size"
+            android:maxLength="5"
+            android:order="5"
             android:summary=""
-            android:inputType="number"
-        	android:maxLength="5"
-            android:dialogTitle="@string/set_buffer_size" />
-
+            android:title="@string/buffer_size" />
     </PreferenceCategory>
-	    
-    <PreferenceCategory android:title="@string/apn">
-    <PreferenceScreen
-            android:key="apn"
-            android:title="@string/apn">
-            <!--
-            <intent
-            android:action="android.intent.action.MAIN"
-            android:targetPackage="com.android.settings"
-            android:targetClass="com.android.settings.ApnSettings" />
-            -->
- </PreferenceScreen>
- <!--
-        <ListPreference
-            android:order="6"
+    <PreferenceCategory android:title="@string/apn" >
+        <PreferenceScreen
             android:key="apn"
-            android:title="@string/apn"
-            android:entries="@array/apn_entries"
-            android:entryValues="@array/apn_values"
-            android:dialogTitle="@string/set_apn" />
-            -->
+            android:title="@string/apn" >
+        </PreferenceScreen>
     </PreferenceCategory>
 
-
 </PreferenceScreen>