Changeset 14524

Timestamp:

04/09/13 17:07:18 (12 years ago)

Author:

cnpetrie

Message:

Updated video to play in videovew rather than launch web frame

Location:

issm/trunk-jpl/src/mobile/android/ISSM

Files:

• AndroidManifest.xml (modified) (1 diff)
• bin/AndroidManifest.xml (modified) (1 diff)
• project.properties (modified) (1 diff)
• res/layout/videopage.xml (added)
• res/values/dimens.xml (modified) (2 diffs)
• res/values/strings.xml (modified) (2 diffs)
• src/gov/nasa/jpl/issm/MenuPage.java (modified) (1 diff)
• src/gov/nasa/jpl/issm/VideoActivity.java (added)

issm/trunk-jpl/src/mobile/android/ISSM/AndroidManifest.xml

@@ +1 @@
+<?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="gov.nasa.jpl.issm"
+    android:installLocation="auto"
     android:versionCode="1"
-    android:versionName="1.0"
-    android:installLocation="preferExternal" >
+    android:versionName="1.0" >
+
     <uses-sdk
         android:minSdkVersion="10"
         android:targetSdkVersion="15" />
-        <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+
     <application
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
         android:theme="@style/AppTheme" >
-        <activity android:name="gov.nasa.jpl.issm.ISSMAPP"
-                  android:label="@string/title_activity_issm" >
+        <activity
+            android:name="gov.nasa.jpl.issm.ISSMAPP"
+            android:label="@string/title_activity_issm" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-                                <category android:name="android.intent.category.LAUNCHER" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
-            </activity>
-            <activity
+        </activity>
+        <activity
             android:name="gov.nasa.jpl.issm.MenuPage"
             android:label="@string/title_activity_issm" >
         </activity>
-            <activity
+        <activity
             android:name="gov.nasa.jpl.issm.ISSM"
             android:label="@string/title_activity_issm" >
+        </activity>
+        <activity
+            android:name="gov.nasa.jpl.issm.VideoActivity"
+            android:label="@string/title_activity_video" >
         </activity>
     </application>

issm/trunk-jpl/src/mobile/android/ISSM/bin/AndroidManifest.xml

@@ +1 @@
+<?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="gov.nasa.jpl.issm"
+    android:installLocation="auto"
     android:versionCode="1"
-    android:versionName="1.0"
-    android:installLocation="preferExternal" >
+    android:versionName="1.0" >
+
     <uses-sdk
         android:minSdkVersion="10"
         android:targetSdkVersion="15" />
-        <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+
     <application
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
         android:theme="@style/AppTheme" >
-        <activity android:name="gov.nasa.jpl.issm.ISSMAPP"
-                  android:label="@string/title_activity_issm" >
+        <activity
+            android:name="gov.nasa.jpl.issm.ISSMAPP"
+            android:label="@string/title_activity_issm" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-                                <category android:name="android.intent.category.LAUNCHER" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
-            </activity>
-            <activity
+        </activity>
+        <activity
             android:name="gov.nasa.jpl.issm.MenuPage"
             android:label="@string/title_activity_issm" >
         </activity>
-            <activity
+        <activity
             android:name="gov.nasa.jpl.issm.ISSM"
             android:label="@string/title_activity_issm" >
+        </activity>
+        <activity
+            android:name="gov.nasa.jpl.issm.VideoActivity"
+            android:label="@string/title_activity_video" >
         </activity>
     </application>

issm/trunk-jpl/src/mobile/android/ISSM/project.properties

@@ -12 +12 @@
 
 # Project target.
-target=android-15
+target=android-17

issm/trunk-jpl/src/mobile/android/ISSM/res/values/dimens.xml

@@ +1 @@
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
 
@@ -4 +5 @@
     <dimen name="padding_medium">8dp</dimen>
     <dimen name="padding_large">16dp</dimen>
+    <dimen name="activity_horizontal_margin">16dp</dimen>
+    <dimen name="activity_vertical_margin">16dp</dimen>
 
 </resources>

issm/trunk-jpl/src/mobile/android/ISSM/res/values/strings.xml

@@ +1 @@
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
 
@@ -5 +6 @@
     <string name="menu_settings">Settings</string>
     <string name="title_activity_issm">ISSM</string>
+    <string name="video_text">ISSM Video</string>
+    <string name="title_activity_video">VideoActivity</string>
+    <string name="action_settings">Settings</string>
 
 </resources>

issm/trunk-jpl/src/mobile/android/ISSM/src/gov/nasa/jpl/issm/MenuPage.java

@@ -45 +45 @@
                         public void onClick(View v) 
                         {
-                                String url = "http://www.youtube.com/watch?v=KlDO0C8r_ws";
-                                Intent i = new Intent(Intent.ACTION_VIEW);
-                                i.setData(Uri.parse(url));
-                        startActivity(i);
+                                Intent i = new Intent(MenuPage.this, VideoActivity.class);
+                        startActivity(i);;
                         }
                 });