Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 08e09f96 authored by Bryce Lee's avatar Bryce Lee Committed by Android Git Automerger
Browse files

am ef56bfb2: am 3e96e06f: Merge "Make sure that changes to UI in... 

am ef56bfb2: am 3e96e06f: Merge "Make sure that changes to UI in SwipeDismissLayout are on UI thread." into cw-e-dev

* commit 'ef56bfb2':
  Make sure that changes to UI in SwipeDismissLayout are on UI thread.
parents 4a10b66d ef56bfb2

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;