Merge branch 'froyo' into froyo-release

proguard.flags

@@ -6,3 +6,7 @@
 -keep class com.android.launcher2.AllApps3D$Defines {
   *;
 }
+
+-keep class com.android.launcher2.ClippedImageView {
+  *;
+}

res/layout-land/launcher.xml

@@ -41,7 +41,7 @@
 
     </com.android.launcher2.Workspace>
 
-    <ImageView
+    <com.android.launcher2.ClippedImageView
         android:id="@+id/previous_screen"
         android:layout_width="93dip"
         android:layout_height="@dimen/button_bar_height"
@@ -53,10 +53,12 @@
         
         android:onClick="previousScreen"
 
+        launcher:ignoreZone="56dip"
+
         android:focusable="true"
         android:clickable="true" />
 
-    <ImageView
+    <com.android.launcher2.ClippedImageView
         android:id="@+id/next_screen"
         android:layout_width="93dip"
         android:layout_height="@dimen/button_bar_height"
@@ -68,6 +70,8 @@
         
         android:onClick="nextScreen"
         
+        launcher:ignoreZone="-56dip"
+        
         android:focusable="true"
         android:clickable="true" />
 

res/values/attrs.xml

@@ -82,4 +82,8 @@
         <attr name="title" format="reference" />
         <attr name="uri" format="string" />
     </declare-styleable>
+
+    <declare-styleable name="ClippedImageView">
+        <attr name="ignoreZone" format="dimension" />
+    </declare-styleable>
 </resources>

src/com/android/launcher2/ClippedImageView.java

@@ -0,0 +1,50 @@
+/*
+ * Copyright (C) 2010 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.launcher2;
+
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.util.AttributeSet;
+import android.view.MotionEvent;
+import android.widget.ImageView;
+import com.android.launcher.R;
+
+public class ClippedImageView extends ImageView {
+    private final int mZone;
+
+    public ClippedImageView(Context context, AttributeSet attrs) {
+        this(context, attrs, 0);
+    }
+
+    public ClippedImageView(Context context, AttributeSet attrs, int defStyle) {
+        super(context, attrs, defStyle);
+        
+        TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.ClippedImageView, defStyle, 0);
+
+        mZone = a.getDimensionPixelSize(R.styleable.ClippedImageView_ignoreZone, 0);
+
+        a.recycle();
+    }
+
+    @Override
+    public boolean onTouchEvent(MotionEvent event) {
+        final int zone = mZone;
+        return !(zone != 0 && (zone > 0 && event.getX() >= zone) ||
+                (zone < 0 && event.getX() < getWidth() + zone)) && super.onTouchEvent(event);
+
+    }
+}