Changeset 14528

Timestamp:

04/10/13 12:54:09 (12 years ago)

Author:

cnpetrie

Message:

Commiting android video in videoplayer changes to ISSM_APP

Location:

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

Files:

• AndroidManifest.xml (modified) (2 diffs)
• bin/AndroidManifest.xml (modified) (2 diffs)
• project.properties (modified) (1 diff)
• res/layout/videopage.xml (added)
• 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_APP/AndroidManifest.xml

@@ -8 +8 @@
         android:targetSdkVersion="15" />
         <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+        <uses-permission android:name="android.permission.INTERNET" /> 
+        <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+            
     <application
         android:icon="@drawable/ic_launcher"
@@ -27 +30 @@
         </activity>
         <activity
+            android:name="gov.nasa.jpl.issm.VideoActivity"
+            android:screenOrientation="portrait"
+            android:label="@string/title_activity_issm" >
+        </activity>
+        <activity
             android:name="gov.nasa.jpl.issm.ISSM"
             android:screenOrientation="portrait"

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

@@ -8 +8 @@
         android:targetSdkVersion="15" />
         <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+        <uses-permission android:name="android.permission.INTERNET" /> 
+        <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+            
     <application
         android:icon="@drawable/ic_launcher"
@@ -27 +30 @@
         </activity>
         <activity
+            android:name="gov.nasa.jpl.issm.VideoActivity"
+            android:screenOrientation="portrait"
+            android:label="@string/title_activity_issm" >
+        </activity>
+        <activity
             android:name="gov.nasa.jpl.issm.ISSM"
             android:screenOrientation="portrait"

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

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

issm/trunk-jpl/src/mobile/android/ISSM_APP/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));
+                                //String url = "http://www.youtube.com/watch?v=KlDO0C8r_ws";
+                                //Intent i = new Intent(Intent.ACTION_VIEW);
+                                //i.setData(Uri.parse(url));
+                                Intent i = new Intent(MenuPage.this, VideoActivity.class);
                         startActivity(i);
                         }