am f1187ac8: Merge "Added card elevation when card is clicked on the lockscreen" into lmp-preview-dev

* commit 'f1187ac8e8d2c8927caf322a12de8c32ee3f919f':
  Added card elevation when card is clicked on the lockscreen
This commit is contained in:
Selim Cinek
2014-06-10 21:41:46 +00:00
committed by Android Git Automerger

View File

@@ -228,11 +228,16 @@ public class StackScrollAlgorithm {
View child = algorithmState.visibleChildren.get(i);
StackScrollState.ViewState childViewState = resultState.getViewStateForView(child);
childViewState.dimmed = dimmed;
childViewState.scale = !dimmed || activatedChild == child
boolean isActivatedChild = activatedChild == child;
childViewState.scale = !dimmed || isActivatedChild
? 1.0f
: DIMMED_SCALE;
if (dimmed && activatedChild != null && child != activatedChild) {
childViewState.alpha *= ACTIVATED_INVERSE_ALPHA;
if (dimmed && activatedChild != null) {
if (!isActivatedChild) {
childViewState.alpha *= ACTIVATED_INVERSE_ALPHA;
} else {
childViewState.zTranslation += 2.0f * mZDistanceBetweenElements;
}
}
}
}