Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 73624af

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

Change-Id: I92dfafdc192139536dbedc365444a80a92db5028
This commit is contained in:
Felipe Leme
2016-04-25 19:13:00 +00:00
committed by android-build-merger
parent d61776e18e 73624af552
commit c837b17378
5 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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

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

@@ -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 */);
}
}

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

@@ -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);

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

@@ -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);
}
});
}

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

@@ -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 */);
}
}