Fix up the UI demo for ICS

Author: bmeike

AndroidUIDemo/project.properties

@@ -8,4 +8,4 @@
 # project structure.
 
 # Project target.
-target=android-8
+target=android-14

AndroidViewDemo/res/layout/main.xml

@@ -1,51 +1,63 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<FrameLayout
+<LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/main"
-    android:orientation="horizontal"
+    android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
     <LinearLayout
         android:id="@+id/xform_v"
         android:orientation="horizontal"
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="wrap_content">
 
         <LinearLayout
             android:id="@+id/xform_v_left"
             android:orientation="vertical"
             android:background="@drawable/bg0"
-            android:layout_width="wrap_content"
+            android:layout_width="0dp"
+            android:layout_weight=".05"
             android:layout_height="wrap_content" />
 
         <LinearLayout
             android:id="@+id/xform_v_right"
             android:orientation="vertical"
             android:background="@drawable/bg0"
-            android:layout_width="wrap_content"
+            android:layout_width="0dp"
+            android:layout_weight=".05"
             android:layout_height="wrap_content" />
     </LinearLayout>
 
     <LinearLayout
         android:id="@+id/efx_v"
         android:orientation="horizontal"
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="wrap_content">
 
         <LinearLayout
             android:id="@+id/efx_v_left"
             android:orientation="vertical"
             android:background="@drawable/bg0"
-            android:layout_width="wrap_content"
+            android:layout_width="0dp"
+            android:layout_weight=".05"
             android:layout_height="wrap_content" />
 
         <LinearLayout
             android:id="@+id/efx_v_right"
             android:orientation="vertical"
             android:background="@drawable/bg0"
-            android:layout_width="wrap_content"
+            android:layout_width="0dp"
+            android:layout_weight=".05"
             android:layout_height="wrap_content" />
     </LinearLayout>
-</FrameLayout>
+
+    <com.oreilly.demo.android.pa.viewdemo.widget.GLDemoWidget
+            android:id="@+id/efx_gl"
+            android:layout_width="match_parent"
+            android:layout_weight=".03"
+            android:layout_height="0dp" />    
+    <!-- 
+    -->    
+</LinearLayout>

AndroidViewDemo/src/com/oreilly/demo/android/pa/viewdemo/TransformIt.java

@@ -153,11 +153,11 @@ private void buildEfxView(LinearLayout lv, LinearLayout rv) {
                         new LinearGradient(
                             0.0F,
                             0.0F,
-                            160.0F,
-                            80.0F,
+                            100.0F,
+                            10.0F,
                             new int[] {
                                 Color.BLACK, Color.RED, Color.YELLOW },
-                            new float[] { 0.2F, 0.3F, 0.2F },
+                            new float[] { 0.0F, 0.5F, 0.95F },
                             Shader.TileMode.REPEAT));
                 } }));
         lv.addView(new EffectsWidget(
@@ -169,10 +169,6 @@ private void buildEfxView(LinearLayout lv, LinearLayout rv) {
                         new BlurMaskFilter(2, BlurMaskFilter.Blur.NORMAL));
                 } }));
 
-        // the OpenGL widget
-        glWidget = new GLDemoWidget(this);
-        lv.addView(glWidget);
-
         rv.addView(new EffectsWidget(
             this,
             2,
@@ -204,7 +200,6 @@ private void buildEfxView(LinearLayout lv, LinearLayout rv) {
         rv.addView(w);
         w.setBackgroundResource(R.drawable.throbber);
 
-        //!!! Hack; should be fixed in Cupcake
         w.setOnClickListener(new OnClickListener() {
             @Override public void onClick(View v) {
                 AnimationDrawable animation

AndroidViewDemo/src/com/oreilly/demo/android/pa/viewdemo/widget/EffectsWidget.java

@@ -8,6 +8,7 @@
 import android.graphics.Color;
 import android.graphics.Paint;
 import android.view.View;
+import android.view.ViewGroup;
 
 import com.oreilly.demo.android.pa.viewdemo.R;
 
@@ -39,7 +40,7 @@ public EffectsWidget(Context context, int n, PaintEffect pe) {
         effect = pe;
 
         setMinimumWidth(160);
-        setMinimumHeight(80);
+        setMinimumHeight(135);
 
         setBackgroundResource(R.drawable.bg0);
     }
@@ -48,7 +49,7 @@ public EffectsWidget(Context context, int n, PaintEffect pe) {
     @Override
     protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
         setMeasuredDimension(
-            getSuggestedMinimumWidth(),
+            ViewGroup.LayoutParams.MATCH_PARENT,
             getSuggestedMinimumHeight());
     }
 

AndroidViewDemo/src/com/oreilly/demo/android/pa/viewdemo/widget/GLDemoWidget.java

@@ -17,6 +17,7 @@
 import android.opengl.GLU;
 import android.opengl.GLUtils;
 import android.os.SystemClock;
+import android.util.AttributeSet;
 
 import com.example.android.apis.graphics.GLSurfaceView;
 import com.oreilly.demo.android.pa.viewdemo.R;
@@ -37,14 +38,12 @@ public class GLDemoWidget extends GLSurfaceView
 
     /**
      * @param context the app context
+     * @param attrs the view attributes
      */
-    public GLDemoWidget(Context context) {
-        super(context);
+    public GLDemoWidget(Context context, AttributeSet attrs) {
+        super(context, attrs);
         this.context = context;
 
-        setMinimumWidth(160);
-        setMinimumHeight(80);
-
         setRenderer(this);
 
         float[] coords = {
@@ -86,14 +85,6 @@ public GLDemoWidget(Context context) {
         indexBuf.position(0);
      }
 
-    /** @see android.view.View#onMeasure(int, int) */
-    @Override
-    protected void onMeasure(int widthSpec, int heightSpec) {
-        setMeasuredDimension(
-            getSuggestedMinimumWidth(),
-            getSuggestedMinimumHeight());
-    }
-
     /**
      * We don't need a depth buffer and don't care about our color depth.
      */
@@ -131,7 +122,7 @@ public void surfaceCreated(GL10 gl) {
             GL10.GL_PERSPECTIVE_CORRECTION_HINT,
             GL10.GL_FASTEST);
 
-        gl.glClearColor(0.4f, 0.2f, 0.2f, 0.5f);
+        gl.glClearColor(0.2f, 0.1f, 0.8f, 0.1f);
         gl.glShadeModel(GL10.GL_SMOOTH);
         gl.glEnable(GL10.GL_DEPTH_TEST);
 

AndroidViewDemo/src/com/oreilly/demo/android/pa/viewdemo/widget/TransformedViewWidget.java

@@ -8,6 +8,7 @@
 import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
 import android.view.View;
+import android.view.ViewGroup;
 
 
 /**
@@ -53,7 +54,7 @@ public TransformedViewWidget(
     @Override
     protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
         setMeasuredDimension(
-            getSuggestedMinimumWidth(),
+            ViewGroup.LayoutParams.MATCH_PARENT,
             getSuggestedMinimumHeight());
     }