Merge "Make sure that changes to UI in SwipeDismissLayout are on UI thread." into cw-e-dev (3e96e06f) · Commits · e / os / android_frameworks_base

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

+13 −6

Original line number	Diff line number	Diff line
		@@ -89,8 +89,9 @@ public class SwipeDismissLayout extends FrameLayout {
		}
		};
		private BroadcastReceiver mScreenOffReceiver = new BroadcastReceiver() {
		private Runnable mRunnable = new Runnable() {
		@Override
		public void onReceive(Context context, Intent intent) {
		public void run() {
		if (mDismissed) {
		dismiss();
		} else {
		@@ -99,6 +100,12 @@ public class SwipeDismissLayout extends FrameLayout {
		resetMembers();
		}
		};

		@Override
		public void onReceive(Context context, Intent intent) {
		post(mRunnable);
		}
		};
		private IntentFilter mScreenOffFilter = new IntentFilter(Intent.ACTION_SCREEN_OFF);

		private float mLastX;