Merge "CastTile: UX fixes for media projection."

This commit is contained in:
TreeHugger Robot
2019-03-12 11:35:48 +00:00
committed by Android (Google) Code Review

View File

@@ -88,7 +88,9 @@ public class CastTile extends QSTileImpl<BooleanState> {
@Override
public BooleanState newTileState() {
return new BooleanState();
BooleanState state = new BooleanState();
state.handlesLongClick = false;
return state;
}
@Override
@@ -115,21 +117,26 @@ public class CastTile extends QSTileImpl<BooleanState> {
handleClick();
}
@Override
protected void handleLongClick() {
handleClick();
}
@Override
protected void handleClick() {
if (getState().state == Tile.STATE_UNAVAILABLE) {
return;
}
if (mKeyguard.isSecure() && !mKeyguard.canSkipBouncer()) {
mActivityStarter.postQSRunnableDismissingKeyguard(() -> {
showDetail(true);
});
return;
}
CastDevice activeProjection = getActiveDeviceMediaProjection();
if (activeProjection == null) {
showDetail(true);
if (mKeyguard.isSecure() && !mKeyguard.canSkipBouncer()) {
mActivityStarter.postQSRunnableDismissingKeyguard(() -> {
showDetail(true);
});
} else {
showDetail(true);
}
} else {
mController.stopCasting(activeProjection);
}