Merge commit '87bb019e57eddcedd4aeca180ac36bdf1d42064a' into jb-mr1-dev

Author: Ed Heyl

api/17.txt

@@ -1145,7 +1145,6 @@ package android {
     field public static final int weekSeparatorLineColor = 16843590; // 0x1010346
     field public static final int weightSum = 16843048; // 0x1010128
     field public static final int widgetCategory = 16843716; // 0x10103c4
-    field public static final int widgetFeatures = 16843715; // 0x10103c3
     field public static final int widgetLayout = 16843243; // 0x10101eb
     field public static final int width = 16843097; // 0x1010159
     field public static final int windowActionBar = 16843469; // 0x10102cd
@@ -4497,8 +4496,6 @@ package android.appwidget {
     field public static final int RESIZE_VERTICAL = 2; // 0x2
     field public static final int WIDGET_CATEGORY_HOME_SCREEN = 1; // 0x1
     field public static final int WIDGET_CATEGORY_KEYGUARD = 2; // 0x2
-    field public static final int WIDGET_FEATURES_NONE = 0; // 0x0
-    field public static final int WIDGET_FEATURES_STATUS = 1; // 0x1
     field public int autoAdvanceViewId;
     field public android.content.ComponentName configure;
     field public int icon;
@@ -4514,7 +4511,6 @@ package android.appwidget {
     field public int resizeMode;
     field public int updatePeriodMillis;
     field public int widgetCategory;
-    field public int widgetFeatures;
   }
 
 }

api/current.txt

@@ -1145,7 +1145,6 @@ package android {
     field public static final int weekSeparatorLineColor = 16843590; // 0x1010346
     field public static final int weightSum = 16843048; // 0x1010128
     field public static final int widgetCategory = 16843716; // 0x10103c4
-    field public static final int widgetFeatures = 16843715; // 0x10103c3
     field public static final int widgetLayout = 16843243; // 0x10101eb
     field public static final int width = 16843097; // 0x1010159
     field public static final int windowActionBar = 16843469; // 0x10102cd
@@ -4497,8 +4496,6 @@ package android.appwidget {
     field public static final int RESIZE_VERTICAL = 2; // 0x2
     field public static final int WIDGET_CATEGORY_HOME_SCREEN = 1; // 0x1
     field public static final int WIDGET_CATEGORY_KEYGUARD = 2; // 0x2
-    field public static final int WIDGET_FEATURES_NONE = 0; // 0x0
-    field public static final int WIDGET_FEATURES_STATUS = 1; // 0x1
     field public int autoAdvanceViewId;
     field public android.content.ComponentName configure;
     field public int icon;
@@ -4514,7 +4511,6 @@ package android.appwidget {
     field public int resizeMode;
     field public int updatePeriodMillis;
     field public int widgetCategory;
-    field public int widgetFeatures;
   }
 
 }

core/java/android/appwidget/AppWidgetHostView.java

@@ -144,6 +144,7 @@ public void setAppWidget(int appWidgetId, AppWidgetProviderInfo info) {
             // We add padding to the AppWidgetHostView if necessary
             Rect padding = getDefaultPaddingForWidget(mContext, info.provider, null);
             setPadding(padding.left, padding.top, padding.right, padding.bottom);
+            setContentDescription(info.label);
         }
     }
 

core/java/android/appwidget/AppWidgetProviderInfo.java

@@ -53,18 +53,6 @@ public class AppWidgetProviderInfo implements Parcelable {
      */
     public static final int WIDGET_CATEGORY_KEYGUARD = 2;
 
-    /**
-     * Indicates that the widget supports no special features.
-     */
-    public static final int WIDGET_FEATURES_NONE = 0;
-
-    /**
-     * Indicates that the widget is output only, ie. has nothing clickable. This may be enforced by
-     * the host. Presently, this flag is used by the keyguard to indicate that it can be placed
-     * in the first position.
-     */
-    public static final int WIDGET_FEATURES_STATUS = 1;
-
     /**
      * Identity of this AppWidget component.  This component should be a {@link
      * android.content.BroadcastReceiver}, and it will be sent the AppWidget intents
@@ -207,15 +195,6 @@ public class AppWidgetProviderInfo implements Parcelable {
      */
     public int widgetCategory;
 
-    /**
-     * A field which specifies any special features that this widget supports. See
-     * {@link #WIDGET_FEATURES_NONE}, {@link #WIDGET_FEATURES_STATUS}.
-     *
-     * <p>This field corresponds to the <code>widgetFeatures</code> attribute in
-     * the AppWidget meta-data file.
-     */
-    public int widgetFeatures;
-
     public AppWidgetProviderInfo() {
     }
 
@@ -242,7 +221,6 @@ public AppWidgetProviderInfo(Parcel in) {
         this.autoAdvanceViewId = in.readInt();
         this.resizeMode = in.readInt();
         this.widgetCategory = in.readInt();
-        this.widgetFeatures = in.readInt();
     }
 
     public void writeToParcel(android.os.Parcel out, int flags) {
@@ -271,7 +249,6 @@ public void writeToParcel(android.os.Parcel out, int flags) {
         out.writeInt(this.autoAdvanceViewId);
         out.writeInt(this.resizeMode);
         out.writeInt(this.widgetCategory);
-        out.writeInt(this.widgetFeatures);
     }
 
     @Override
@@ -292,7 +269,6 @@ public AppWidgetProviderInfo clone() {
         that.autoAdvanceViewId = this.autoAdvanceViewId;
         that.resizeMode = this.resizeMode;
         that.widgetCategory  = this.widgetCategory;
-        that.widgetFeatures = this.widgetFeatures;
         return that;
     }
 

core/java/com/android/internal/policy/IFaceLockCallback.aidl

@@ -22,6 +22,5 @@ oneway interface IFaceLockCallback {
     void unlock();
     void cancel();
     void reportFailedAttempt();
-    void exposeFallback();
     void pokeWakelock(int millis);
 }

core/java/com/android/internal/widget/LockPatternView.java

@@ -18,7 +18,6 @@
 
 
 import android.content.Context;
-import android.content.res.Resources;
 import android.content.res.TypedArray;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
@@ -33,11 +32,9 @@
 import android.os.Parcelable;
 import android.os.SystemClock;
 import android.util.AttributeSet;
-import android.util.Log;
 import android.view.HapticFeedbackConstants;
 import android.view.MotionEvent;
 import android.view.View;
-import android.view.accessibility.AccessibilityEvent;
 import android.view.accessibility.AccessibilityManager;
 
 import com.android.internal.R;
@@ -657,9 +654,11 @@ public boolean onTouchEvent(MotionEvent event) {
                 handleActionMove(event);
                 return true;
             case MotionEvent.ACTION_CANCEL:
-                resetPattern();
-                mPatternInProgress = false;
-                notifyPatternCleared();
+                if (mPatternInProgress) {
+                    mPatternInProgress = false;
+                    resetPattern();
+                    notifyPatternCleared();
+                }
                 if (PROFILE_DRAWING) {
                     if (mDrawingProfilingStarted) {
                         Debug.stopMethodTracing();
@@ -826,7 +825,7 @@ private void handleActionDown(MotionEvent event) {
             mPatternInProgress = true;
             mPatternDisplayMode = DisplayMode.Correct;
             notifyPatternStarted();
-        } else {
+        } else if (mPatternInProgress) {
             mPatternInProgress = false;
             notifyPatternCleared();
         }