Changeset 14830

Timestamp:

05/01/13 10:08:42 (12 years ago)

Author:

cnpetrie

Message:

updated setAlpha in ISSM.java, uses float for SDK 11+, uses int for sdk 10-

File:

• issm/trunk-jpl/src/mobile/android/ISSM_APP/src/gov/nasa/jpl/issm/ISSM.java (modified) (3 diffs)

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

@@ -241 +241 @@
                         {
                                 mapName= "greenland";
-                                colorBar.setVisibility(View.INVISIBLE);
+
                                 defaultMap.setImageResource(R.drawable.greenland_button);
                                 if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.ICE_CREAM_SANDWICH)
@@ -247 +247 @@
                                         defaultMap.setScaleX(1.12f);
                                         defaultMap.setScaleY(0.92f);
-                                }
+                                        defaultMap.setAlpha(1.0f);
+                                }
+                                else
+                                {
+                                        defaultMap.setAlpha(1);
+                                }
+                                colorBar.setVisibility(View.INVISIBLE);
                                 viewflipper.setInAnimation(inFromRightAnimation());
                         viewflipper.setOutAnimation(outToLeftAnimation());
                         viewflipper.showNext();
-                        defaultMap.setVisibility(View.VISIBLE);
-                        defaultMap.setAlpha(1.0f);
-                        onSimulationScreen = true;
-                        //create FemModel in native code and return the size of the model
-                        this.createModel();
-                        break;
-                        }
-                case R.id.antarctica:
-                        {
-                                mapName= "antarctica";
-                                colorBar.setVisibility(View.INVISIBLE);
-                                defaultMap.setImageResource(R.drawable.antarctica_button);
-                                viewflipper.setInAnimation(inFromRightAnimation());
-                        viewflipper.setOutAnimation(outToLeftAnimation());
-                        viewflipper.showNext();
-                        defaultMap.setAlpha(1.0f);
                         defaultMap.setVisibility(View.VISIBLE);
                         onSimulationScreen = true;
@@ -273 +263 @@
                         break;
                         }
+                case R.id.antarctica:
+                        {
+                                mapName= "antarctica";
+                                defaultMap.setImageResource(R.drawable.antarctica_button);
+                                if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.ICE_CREAM_SANDWICH)
+                                {
+                                defaultMap.setAlpha(1.0f);
+                                }
+                                else
+                                {
+                                        defaultMap.setAlpha(1);
+                                }
+                                colorBar.setVisibility(View.INVISIBLE);
+                                viewflipper.setInAnimation(inFromRightAnimation());
+                        viewflipper.setOutAnimation(outToLeftAnimation());
+                        viewflipper.showNext();
+                        defaultMap.setVisibility(View.VISIBLE);
+                        onSimulationScreen = true;
+                        //create FemModel in native code and return the size of the model
+                        this.createModel();
+                        break;
+                        }
+                        
                 /*case R.id.back:
                 {