Changeset 14823

Timestamp:

04/30/13 17:08:25 (12 years ago)

Author:

cnpetrie

Message:

changed the minSDKVersion to 10, wrapped SDK 11 code in an OS version check, search ISSM.java for setScaleX

Location:

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

Files:

• AndroidManifest.xml (modified) (1 diff)
• src/gov/nasa/jpl/issm/ISSM.java (modified) (7 diffs)
• src/gov/nasa/jpl/issm/MyGLSurfaceView.java (modified) (2 diffs)

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

@@ -5 +5 @@
     android:installLocation="preferExternal" >
     <uses-sdk
-        android:minSdkVersion="11"
+        android:minSdkVersion="10"
         android:targetSdkVersion="15" />
         <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />

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

@@ -11 +11 @@
 import android.graphics.Matrix;
 import android.util.DisplayMetrics;
+import android.view.GestureDetector;
 import android.view.Gravity;
 import android.view.KeyEvent;
@@ -17 +18 @@
 import android.view.View;
 import android.view.View.OnClickListener;
+import android.view.GestureDetector.OnDoubleTapListener;
+import android.view.GestureDetector.OnGestureListener;
+import android.view.MotionEvent;
 import android.view.animation.AccelerateInterpolator;
 import android.view.animation.Animation;
@@ -30 +34 @@
 import android.widget.Spinner;
 import android.widget.ViewFlipper;
-
-
-public class ISSM extends Activity implements OnClickListener
+import android.os.Build;
+
+public class ISSM extends Activity implements OnClickListener, OnGestureListener, OnDoubleTapListener
 {
         //private static final int INVISIBLE = 0;
@@ -54 +58 @@
         private SliderMenu sliders;
         private ImageView defaultMap;
+        private GestureDetector mDetector; 
         private Spinner spinner;
         private boolean onSimulationScreen = false;
@@ -62 +67 @@
         super.onCreate(savedInstanceState);
         setContentView(R.layout.main_issm);
+        
+        //Set up a listener for double tap.
+        mDetector = new GestureDetector(this,this);
+        mDetector.setOnDoubleTapListener(this);
+        
         this.initialize();         
     }
@@ -168 +178 @@
         return super.onKeyDown(keyCode, event);
     } 
+//---------------------------------------------------------------------------------       
+    @Override 
+    public boolean onTouchEvent(MotionEvent event){ 
+        this.mDetector.onTouchEvent(event);
+        // Be sure to call the superclass implementation
+        return super.onTouchEvent(event);
+    }
+//---------------------------------------------------------------------------------
+    @Override
+    public boolean onDoubleTap(MotionEvent event) {
+        ((MyGLSurfaceView) mGLView).resetZoom();
+        return true;
+    }
+    
+    @Override
+    public boolean onDoubleTapEvent(MotionEvent event) {
+        
+        return true;
+    }
+    @Override
+    public boolean onDown(MotionEvent event) {  
+        return true;
+    }
+    @Override
+    public boolean onFling(MotionEvent event1, MotionEvent event2, 
+            float velocityX, float velocityY) {
+        return true;
+    }
+
+    @Override
+    public void onLongPress(MotionEvent event) { 
+    }
+
+    @Override
+    public boolean onScroll(MotionEvent e1, MotionEvent e2, float distanceX,float distanceY) 
+    {
+        return true;
+    }
+
+    @Override
+    public void onShowPress(MotionEvent event) 
+    {
+    }
+
+    @Override
+    public boolean onSingleTapUp(MotionEvent event) 
+    {
+        return true;
+    }
+
+    @Override
+    public boolean onSingleTapConfirmed(MotionEvent event) 
+    {
+        return true;
+    }
 //---------------------------------------------------------------------------------   
     public void onClick(View view) 
@@ -178 +243 @@
                                 colorBar.setVisibility(View.INVISIBLE);
                                 defaultMap.setImageResource(R.drawable.greenland_button);
-                                defaultMap.setScaleX(1.12f);
-                                defaultMap.setScaleY(0.92f);
+                                if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.ICE_CREAM_SANDWICH)
+                                {
+                                        defaultMap.setScaleX(1.12f);
+                                        defaultMap.setScaleY(0.92f);
+                                }
                                 viewflipper.setInAnimation(inFromRightAnimation());
                         viewflipper.setOutAnimation(outToLeftAnimation());

issm/trunk-jpl/src/mobile/android/ISSM_APP/src/gov/nasa/jpl/issm/MyGLSurfaceView.java

@@ -159 +159 @@
                       mode = DRAG;
                       //mRend.eyeX = e.getX();
-                      //mRend.eyeY = e.getY;
+                      //mRend.eyeY = e.getY();
                       break;
                       
@@ -213 +213 @@
                 return FloatMath.sqrt(x * x + y * y);
         }
+        
+        public void resetZoom()
+        {
+                mRend.defaultScale();
+        }
+        
 }