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

Commit c837b173 authored by Felipe Leme's avatar Felipe Leme Committed by android-build-merger
Browse files

Merge "Added a \'deferred\' parameter on executeRunnableDismissingKeyguard()." into nyc-dev 

am: 73624af5

* commit '73624af5':
  Added a 'deferred' parameter on executeRunnableDismissingKeyguard().

Change-Id: I92dfafdc192139536dbedc365444a80a92db5028
parents d61776e1 73624af5

packages/SystemUI/src/com/android/systemui/statusbar/car/UserGridView.java

+1 −1
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ public class UserGridView extends GridView { 


    private void showOfflineAuthUi() {

        // TODO: Show keyguard UI in-place.

        mStatusBar.executeRunnableDismissingKeyguard(null, null, true, true);

        mStatusBar.executeRunnableDismissingKeyguard(null, null, true, true, true);

    }



    @Override

packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaView.java

+1 −1
Original line number Diff line number Diff line
@@ -490,7 +490,7 @@ public class KeyguardBottomAreaView extends FrameLayout implements View.OnClickL 
            AsyncTask.execute(runnable);

        } else {

            mPhoneStatusBar.executeRunnableDismissingKeyguard(runnable, null /* cancelAction */,

                    false /* dismissShade */, false /* afterKeyguardGone */);

                    false /* dismissShade */, false /* afterKeyguardGone */, true /* deferred */);

        }

    }

packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java

+5 −3
Original line number Diff line number Diff line
@@ -1199,7 +1199,7 @@ public class NotificationPanelView extends PanelView implements 
        }

        if (mQsFullyExpanded && mFalsingManager.shouldEnforceBouncer()) {

            mStatusBar.executeRunnableDismissingKeyguard(null, null /* cancelAction */,

                    false /* dismissShade */, true /* afterKeyguardGone */);

                    false /* dismissShade */, true /* afterKeyguardGone */, false /* deferred */);

        }

        if (DEBUG) {

            invalidate();
@@ -1794,7 +1794,8 @@ public class NotificationPanelView extends PanelView implements 
                    public void run() {

                        mKeyguardBottomArea.launchLeftAffordance();

                    }

                }, null, true /* dismissShade */, false /* afterKeyguardGone */);

                }, null, true /* dismissShade */, false /* afterKeyguardGone */,

                        true /* deferred */);

            }

            else {

                mKeyguardBottomArea.launchLeftAffordance();
@@ -1813,7 +1814,8 @@ public class NotificationPanelView extends PanelView implements 
                    public void run() {

                        mKeyguardBottomArea.launchCamera(mLastCameraLaunchSource);

                    }

                }, null, true /* dismissShade */, false /* afterKeyguardGone */);

                }, null, true /* dismissShade */, false /* afterKeyguardGone */,

                    true /* deferred */);

            }

            else {

                mKeyguardBottomArea.launchCamera(mLastCameraLaunchSource);

packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java

+5 −4
Original line number Diff line number Diff line
@@ -3177,13 +3177,14 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, 
            }

        };

        executeRunnableDismissingKeyguard(runnable, cancelRunnable, dismissShade,

                afterKeyguardGone);

                afterKeyguardGone, true /* deferred */);

    }



    public void executeRunnableDismissingKeyguard(final Runnable runnable,

            final Runnable cancelAction,

            final boolean dismissShade,

            final boolean afterKeyguardGone) {

            final boolean afterKeyguardGone,

            final boolean deferred) {

        final boolean keyguardShowing = mStatusBarKeyguardViewManager.isShowing();

        dismissKeyguardThenExecute(new OnDismissAction() {

            @Override
@@ -3206,7 +3207,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, 
                    animateCollapsePanels(CommandQueue.FLAG_EXCLUDE_RECENTS_PANEL, true /* force */,

                            true /* delayed*/);

                }

                return true;

                return deferred;

            }

        }, cancelAction, afterKeyguardGone);

    }
@@ -3525,7 +3526,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, 
            @Override

            public void run() {

                mLeaveOpenOnKeyguardHide = true;

                executeRunnableDismissingKeyguard(runnable, null, false, false);

                executeRunnableDismissingKeyguard(runnable, null, false, false, false);

            }

        });

    }

packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java

+1 −1
Original line number Diff line number Diff line
@@ -701,7 +701,7 @@ public class NotificationStackScrollLayout extends ViewGroup 
        mFalsingManager.onNotificationDismissed();

        if (mFalsingManager.shouldEnforceBouncer()) {

            mPhoneStatusBar.executeRunnableDismissingKeyguard(null, null /* cancelAction */,

                    false /* dismissShade */, true /* afterKeyguardGone */);

                    false /* dismissShade */, true /* afterKeyguardGone */, false /* deferred */);

        }

    }