am 39912f7f: Merge commit \'87bb019e57eddcedd4aeca180ac36bdf1d42064a\' into jb-mr1-dev

* commit '39912f7fcd5bfc4943bac1746c3ff2a9f1d93043':
  Keyguard sliding challenge - fix overeager touch interception
  Addressing comments in 74bdd21629681528dbe7f3ea363d99c8514e026b.
  Showing message when max attempts are hit in face unlock fixes b/7306168
  Keyguard tablet/portrait fix for HUGE security views
  Cancel camera launch on screen off.
  Fix launcher flash during secure camera transition.
  Updating isShowing during onResume()
  Suppressing FUL after going to backup fixes b/7449820
  Addressing comments for change c4842c11932ea4f60fe7ae09b0a59660207e1587
  Adding a button for expanding the clock screen challenge.
  Accessibility support for the lockscreen  - phone.
  Stripping dead API related to keyguard widgets
  FUL being unsuppressed when screen turns off fixes b/7453702
  Show the keyboard less aggressively.

2 files changed, 13 insertions, 4 deletions

diff --git a/services/java/com/android/server/AppWidgetServiceImpl.java b/services/java/com/android/server/AppWidgetServiceImpl.java
index 6a313a0..d0dd9cf 100644
--- a/services/java/com/android/server/AppWidgetServiceImpl.java
+++ b/services/java/com/android/server/AppWidgetServiceImpl.java
@@ -326,7 +326,6 @@ class AppWidgetServiceImpl {
                 pw.print(" resizeMode=");
                 pw.print(info.resizeMode);
                 pw.print(info.widgetCategory);
-                pw.print(info.widgetFeatures);
                 pw.print(" autoAdvanceViewId=");
                 pw.print(info.autoAdvanceViewId);
                 pw.print(" initialLayout=#");
@@ -1412,9 +1411,6 @@ class AppWidgetServiceImpl {
             info.widgetCategory = sa.getInt(
                     com.android.internal.R.styleable.AppWidgetProviderInfo_widgetCategory,
                     AppWidgetProviderInfo.WIDGET_CATEGORY_HOME_SCREEN);
-            info.widgetFeatures = sa.getInt(
-                    com.android.internal.R.styleable.AppWidgetProviderInfo_widgetFeatures,
-                    AppWidgetProviderInfo.WIDGET_FEATURES_NONE);
 
             sa.recycle();
         } catch (Exception e) {
diff --git a/services/java/com/android/server/accessibility/TouchExplorer.java b/services/java/com/android/server/accessibility/TouchExplorer.java
index dcf87350..18b46fb 100644
--- a/services/java/com/android/server/accessibility/TouchExplorer.java
+++ b/services/java/com/android/server/accessibility/TouchExplorer.java
@@ -584,6 +584,7 @@ class TouchExplorer implements EventStreamTransformation {
                             // a given distance perform a drag.
                             mCurrentState = STATE_DRAGGING;
                             mDraggingPointerId = pointerId;
+                            event.setEdgeFlags(receivedTracker.getLastReceivedDownEdgeFlags());
                             sendMotionEvent(event, MotionEvent.ACTION_DOWN, pointerIdBits,
                                     policyFlags);
                         } else {
@@ -1752,6 +1753,9 @@ class TouchExplorer implements EventStreamTransformation {
         // Which pointers are down.
         private int mReceivedPointersDown;
 
+        // The edge flags of the last received down event.
+        private int mLastReceivedDownEdgeFlags;
+
         // Which down pointers are active.
         private int mActivePointers;
 
@@ -1947,6 +1951,13 @@ class TouchExplorer implements EventStreamTransformation {
         }
 
         /**
+         * @return The edge flags of the last received down event.
+         */
+        public int getLastReceivedDownEdgeFlags() {
+            return mLastReceivedDownEdgeFlags;
+        }
+
+        /**
          * @return Whether the last received pointer that went up was active.
          */
         public boolean wasLastReceivedUpPointerActive() {
@@ -1995,6 +2006,8 @@ class TouchExplorer implements EventStreamTransformation {
             mLastReceivedUpPointerDownX = 0;
             mLastReceivedUpPointerDownX = 0;
 
+            mLastReceivedDownEdgeFlags = event.getEdgeFlags();
+
             mReceivedPointersDown |= pointerFlag;
             mReceivedPointerDownX[pointerId] = event.getX(pointerIndex);
             mReceivedPointerDownY[pointerId] = event.getY(pointerIndex);