Merge "Make sure that changes to UI in SwipeDismissLayout are on UI thread." into cw-e-dev

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

@@ -89,14 +89,21 @@ public class SwipeDismissLayout extends FrameLayout {
                 }
             };
     private BroadcastReceiver mScreenOffReceiver = new BroadcastReceiver() {
+        private Runnable mRunnable = new Runnable() {
+            @Override
+            public void run() {
+                if (mDismissed) {
+                    dismiss();
+                } else {
+                    cancel();
+                }
+                resetMembers();
+            }
+        };
+
         @Override
         public void onReceive(Context context, Intent intent) {
-            if (mDismissed) {
+            post(mRunnable);
-                dismiss();
-            } else {
-                cancel();
-            }
-            resetMembers();
         }
     };
     private IntentFilter mScreenOffFilter = new IntentFilter(Intent.ACTION_SCREEN_OFF);