Index: /issm/trunk-jpl/src/mobile/android/ISSM/src/gov/nasa/jpl/issm/VideoActivity.java =================================================================== --- /issm/trunk-jpl/src/mobile/android/ISSM/src/gov/nasa/jpl/issm/VideoActivity.java (revision 14546) +++ /issm/trunk-jpl/src/mobile/android/ISSM/src/gov/nasa/jpl/issm/VideoActivity.java (revision 14547) @@ -11,5 +11,5 @@ public class VideoActivity extends Activity { - String SrcPath = "rtsp://v5.cache1.c.youtube.com/CjYLENy73wIaLQnNSFpiQoeuyBMYDSANFEIJbXYtZ29vZ2xlSARSBXdhdGNoYI-SyfPGoqqyUQw=/0/0/0/video.3gp"; + String SrcPath = "rtsp://v8.cache8.c.youtube.com/CjYLENy73wIaLQkL_ysv0M5QKhMYDSANFEIJbXYtZ29vZ2xlSARSBXdhdGNoYI-SyfPGoqqyUQw=/0/0/0/video.3gp"; /** Called when the activity is first created. */ Index: /issm/trunk-jpl/src/mobile/android/ISSM_APP/AndroidManifest.xml =================================================================== --- /issm/trunk-jpl/src/mobile/android/ISSM_APP/AndroidManifest.xml (revision 14546) +++ /issm/trunk-jpl/src/mobile/android/ISSM_APP/AndroidManifest.xml (revision 14547) @@ -32,4 +32,14 @@ android:name="gov.nasa.jpl.issm.VideoActivity" android:screenOrientation="portrait" + android:label="@string/title_video_issm" > + + + + Index: /issm/trunk-jpl/src/mobile/android/ISSM_APP/assets/about.html =================================================================== --- /issm/trunk-jpl/src/mobile/android/ISSM_APP/assets/about.html (revision 14547) +++ /issm/trunk-jpl/src/mobile/android/ISSM_APP/assets/about.html (revision 14547) @@ -0,0 +1,11 @@ + + +

About Ice Sheet System Software

+ISSM is the result of a collaboration between the Jet Propulsion Laboratory and University of California at Irvine.

+Its purpose is to tackle the challenge of modeling the evolution of the polar ice caps in Greenland and Antarctica.
+ISSM is funded by the NASA Cryosphere and MAP (Modeling Analysis and Prediction) programs, JPL R&TD(Research, Technology and Development) and the National Science Foundation.

+Our main collaborators are:MSSMat Laboratory of ƒcole Centrale Paris, Argonne National Laboratory and the Department of Geology of University of Buffalo, NY.
+As synthesized in the last Intergovernmental Panel on Climate Change (IPCC) Assessment Report AR4,future changes in the Greenland and Antarctic ice sheet mass, particularly due to changes in ice flow,are a major source of uncertainty that could increase sea level rise projections.
+To remedy this problem, large scale ice flow models are necessary that can accurately model the evolution of Greenland and Antarctica in a warming climate.
+In order to achieve this goal,and improve projections of future sea level rise, ISSM relies on state of the art technologies,developed in synergy with the Research and Technology Development (R&TD) at JPL. + Index: /issm/trunk-jpl/src/mobile/android/ISSM_APP/bin/AndroidManifest.xml =================================================================== --- /issm/trunk-jpl/src/mobile/android/ISSM_APP/bin/AndroidManifest.xml (revision 14546) +++ /issm/trunk-jpl/src/mobile/android/ISSM_APP/bin/AndroidManifest.xml (revision 14547) @@ -32,4 +32,14 @@ android:name="gov.nasa.jpl.issm.VideoActivity" android:screenOrientation="portrait" + android:label="@string/title_video_issm" > + + + + Index: /issm/trunk-jpl/src/mobile/android/ISSM_APP/project.properties =================================================================== --- /issm/trunk-jpl/src/mobile/android/ISSM_APP/project.properties (revision 14546) +++ /issm/trunk-jpl/src/mobile/android/ISSM_APP/project.properties (revision 14547) @@ -12,3 +12,3 @@ # Project target. -target=android-16 +target=android-15 Index: /issm/trunk-jpl/src/mobile/android/ISSM_APP/res/layout/aboutpage.xml =================================================================== --- /issm/trunk-jpl/src/mobile/android/ISSM_APP/res/layout/aboutpage.xml (revision 14547) +++ /issm/trunk-jpl/src/mobile/android/ISSM_APP/res/layout/aboutpage.xml (revision 14547) @@ -0,0 +1,11 @@ + + + + + + Index: /issm/trunk-jpl/src/mobile/android/ISSM_APP/res/layout/teampage.xml =================================================================== --- /issm/trunk-jpl/src/mobile/android/ISSM_APP/res/layout/teampage.xml (revision 14547) +++ /issm/trunk-jpl/src/mobile/android/ISSM_APP/res/layout/teampage.xml (revision 14547) @@ -0,0 +1,11 @@ + + + + + + Index: /issm/trunk-jpl/src/mobile/android/ISSM_APP/res/values/strings.xml =================================================================== --- /issm/trunk-jpl/src/mobile/android/ISSM_APP/res/values/strings.xml (revision 14546) +++ /issm/trunk-jpl/src/mobile/android/ISSM_APP/res/values/strings.xml (revision 14547) @@ -4,4 +4,6 @@ Hello world! Settings + ISSM Sample Video + ISSM is the result of a collaboration between the Jet Propulsion Laboratory and University of California at Irvine. Its purpose is to tackle the challenge of modeling the evolution of the polar ice caps in Greenland and Antarctica. \n\tISSM is funded by the NASA Cryosphere and MAP (Modeling Analysis and Prediction) programs, JPL R&TD(Research, Technology and Development) and the National Science Foundation. Our main collaborators are:MSSMat Laboratory of École Centrale Paris, Argonne National Laboratory and the Department of Geology of University of Buffalo, NY.\n\tAs synthesized in the last Intergovernmental Panel on Climate Change (IPCC) Assessment Report AR4,future changes in the Greenland and Antarctic ice sheet mass, particularly due to changes in ice flow,are a major source of uncertainty that could increase sea level rise projections.\n\tTo remedy this problem, large scale ice flow models are necessary that can accurately model the evolution of Greenland and Antarctica in a warming climate. In order to achieve this goal,and improve projections of future sea level rise, ISSM relies on state of the art technologies,developed in synergy with the Research and Technology Development (R&TD) at JPL. ISSM Pick a Color Map Index: /issm/trunk-jpl/src/mobile/android/ISSM_APP/src/gov/nasa/jpl/issm/AboutActivity.java =================================================================== --- /issm/trunk-jpl/src/mobile/android/ISSM_APP/src/gov/nasa/jpl/issm/AboutActivity.java (revision 14547) +++ /issm/trunk-jpl/src/mobile/android/ISSM_APP/src/gov/nasa/jpl/issm/AboutActivity.java (revision 14547) @@ -0,0 +1,30 @@ +package gov.nasa.jpl.issm; + +import android.app.Activity; +import android.os.Bundle; +import android.webkit.WebView; +import gov.nasa.jpl.issm.MyWebViewClient; + + +public class AboutActivity extends Activity { + + private WebView myWebView; + String SrcPath = "file:///android_asset/about.html"; + + /** Called when the activity is first created. */ + @Override + public void onCreate(Bundle savedInstanceState) { + //super.onCreate(savedInstanceState); + //setContentView(R.layout.aboutpage); + super.onCreate(savedInstanceState); + setContentView(R.layout.aboutpage); + + + + myWebView = (WebView) findViewById(R.id.aboutpage); + myWebView.setWebViewClient(new MyWebViewClient()); + //myWebView.getSettings().setJavaScriptEnabled(true); + myWebView.loadUrl(SrcPath); + } + +} Index: /issm/trunk-jpl/src/mobile/android/ISSM_APP/src/gov/nasa/jpl/issm/MenuPage.java =================================================================== --- /issm/trunk-jpl/src/mobile/android/ISSM_APP/src/gov/nasa/jpl/issm/MenuPage.java (revision 14546) +++ /issm/trunk-jpl/src/mobile/android/ISSM_APP/src/gov/nasa/jpl/issm/MenuPage.java (revision 14547) @@ -2,4 +2,5 @@ import android.app.Activity; +import android.app.AlertDialog; import android.net.Uri; import android.os.Bundle; @@ -9,5 +10,10 @@ import android.widget.Button; import android.widget.PopupWindow; +import android.content.DialogInterface; import android.content.Intent; +import android.widget.TabHost; +import android.widget.TextView; +import android.widget.TabHost.TabContentFactory; +import android.widget.TabHost.TabSpec; /////////////////////////////////////////////////////////////////////////// public class MenuPage extends Activity @@ -58,19 +64,21 @@ public void onClick(View v) { - LayoutInflater layoutInflater = (LayoutInflater)getBaseContext().getSystemService(LAYOUT_INFLATER_SERVICE); - View popupView = layoutInflater.inflate(R.layout.popuptext, null); - final PopupWindow popupWindow = new PopupWindow( popupView, 400,600, true); - popupWindow.showAtLocation(popupView, Gravity.CENTER, 0, 0); - Button dismiss = (Button)popupView.findViewById(R.id.dismiss); - dismiss.setOnClickListener(new Button.OnClickListener() - { - public void onClick(View v) - { - popupWindow.dismiss(); - } - }); + //LayoutInflater layoutInflater = (LayoutInflater)getBaseContext().getSystemService(LAYOUT_INFLATER_SERVICE); + //View popupView = layoutInflater.inflate(R.layout.popuptext, null); + //final PopupWindow popupWindow = new PopupWindow( popupView, 400,600, true); + //popupWindow.showAtLocation(popupView, Gravity.CENTER, 0, 0); + //Button dismiss = (Button)popupView.findViewById(R.id.dismiss); + //dismiss.setOnClickListener(new Button.OnClickListener() + //{ + //public void onClick(View v) + // { + //popupWindow.dismiss(); + //} + //}); + Intent i = new Intent(MenuPage.this, AboutActivity.class); + startActivity(i); } }); - //navigate to website + //Show Team Website Button visitus = (Button) findViewById(R.id.visitus); visitus.setOnClickListener(new View.OnClickListener() @@ -78,7 +86,10 @@ public void onClick(View v) { - String url = "http://issm.jpl.nasa.gov/"; - Intent i = new Intent(Intent.ACTION_VIEW); - i.setData(Uri.parse(url)); + //String url = "http://issm.jpl.nasa.gov/"; + //Intent i = new Intent(Intent.ACTION_VIEW); + //i.setData(Uri.parse(url)); + //startActivity(i); + + Intent i = new Intent(MenuPage.this, TeamActivity.class); startActivity(i); } @@ -95,5 +106,19 @@ }); } -//------------------------------------------------------------------------------------- +//------------------------------------------------------------------------------------- + + @Override + public void onBackPressed() { + new AlertDialog.Builder(this) + .setMessage("Are you sure you want to exit?") + .setCancelable(false) + .setPositiveButton("Yes", new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, int id) { + MenuPage.this.finish(); + } + }) + .setNegativeButton("No", null) + .show(); + } } ///////////////////////////////////////////////////////////////////////////////////////// Index: /issm/trunk-jpl/src/mobile/android/ISSM_APP/src/gov/nasa/jpl/issm/MyWebViewClient.java =================================================================== --- /issm/trunk-jpl/src/mobile/android/ISSM_APP/src/gov/nasa/jpl/issm/MyWebViewClient.java (revision 14547) +++ /issm/trunk-jpl/src/mobile/android/ISSM_APP/src/gov/nasa/jpl/issm/MyWebViewClient.java (revision 14547) @@ -0,0 +1,16 @@ +package gov.nasa.jpl.issm; + +import android.webkit.WebView; +import android.webkit.WebViewClient; + +public class MyWebViewClient extends WebViewClient { + + @Override + public boolean shouldOverrideUrlLoading(WebView view, String url) { + + // This is my web site, so do not override; let my WebView load the page + return false; + + } + +} Index: /issm/trunk-jpl/src/mobile/android/ISSM_APP/src/gov/nasa/jpl/issm/TeamActivity.java =================================================================== --- /issm/trunk-jpl/src/mobile/android/ISSM_APP/src/gov/nasa/jpl/issm/TeamActivity.java (revision 14547) +++ /issm/trunk-jpl/src/mobile/android/ISSM_APP/src/gov/nasa/jpl/issm/TeamActivity.java (revision 14547) @@ -0,0 +1,31 @@ +package gov.nasa.jpl.issm; + +import android.app.Activity; +//import android.net.Uri; +import android.os.Bundle; +import android.webkit.WebView; +import gov.nasa.jpl.issm.MyWebViewClient; + +public class TeamActivity extends Activity { + + String SrcPath = "http://issm.jpl.nasa.gov/about/"; + + private WebView myWebView; + + /** Called when the activity is first created. */ + @Override + public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.teampage); + + + + //webView = (WebView) findViewById(R.id.teampage); + myWebView = (WebView) findViewById(R.id.teampage); + myWebView.setWebViewClient(new MyWebViewClient()); + myWebView.getSettings().setJavaScriptEnabled(true); + myWebView.loadUrl(SrcPath); + } + +} +