Merge "Fixed issue where camera wouldn't launch" into qt-r1-dev
This commit is contained in:
@@ -3787,7 +3787,8 @@ public class StatusBar extends SystemUI implements DemoMode,
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (!mNotificationPanel.canCameraGestureBeLaunched(
|
if (!mNotificationPanel.canCameraGestureBeLaunched(
|
||||||
mStatusBarKeyguardViewManager.isShowing() && mExpandedVisible)) {
|
mStatusBarKeyguardViewManager.isShowing()
|
||||||
|
&& (mExpandedVisible || mBouncerShowing))) {
|
||||||
if (DEBUG_CAMERA_LIFT) Slog.d(TAG, "Can't launch camera right now, mExpandedVisible: " +
|
if (DEBUG_CAMERA_LIFT) Slog.d(TAG, "Can't launch camera right now, mExpandedVisible: " +
|
||||||
mExpandedVisible);
|
mExpandedVisible);
|
||||||
return;
|
return;
|
||||||
|
|||||||
Reference in New Issue
Block a user