Merge "Send subtree changed AccessibilityEvent for all alpha changes." into qt-dev
This commit is contained in:
@@ -213,7 +213,7 @@ public class RenderNodeAnimator extends Animator {
|
||||
// it with the final value here.
|
||||
if (mRenderProperty == RenderNodeAnimator.ALPHA) {
|
||||
mViewTarget.ensureTransformationInfo();
|
||||
mViewTarget.mTransformationInfo.mAlpha = mFinalValue;
|
||||
mViewTarget.setAlphaInternal(mFinalValue);
|
||||
}
|
||||
|
||||
moveToRunningState();
|
||||
|
||||
@@ -4123,7 +4123,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
|
||||
* completely transparent and 1 means completely opaque.
|
||||
*/
|
||||
@ViewDebug.ExportedProperty
|
||||
float mAlpha = 1f;
|
||||
private float mAlpha = 1f;
|
||||
|
||||
/**
|
||||
* The opacity of the view as manipulated by the Fade transition. This is a
|
||||
@@ -16187,7 +16187,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
|
||||
return false;
|
||||
}
|
||||
|
||||
private void setAlphaInternal(float alpha) {
|
||||
void setAlphaInternal(float alpha) {
|
||||
float oldAlpha = mTransformationInfo.mAlpha;
|
||||
mTransformationInfo.mAlpha = alpha;
|
||||
// Report visibility changes, which can affect children, to accessibility
|
||||
|
||||
@@ -972,7 +972,6 @@ public class ViewPropertyAnimator {
|
||||
* @param value The value to set the property to
|
||||
*/
|
||||
private void setValue(int propertyConstant, float value) {
|
||||
final View.TransformationInfo info = mView.mTransformationInfo;
|
||||
final RenderNode renderNode = mView.mRenderNode;
|
||||
switch (propertyConstant) {
|
||||
case TRANSLATION_X:
|
||||
@@ -1009,7 +1008,7 @@ public class ViewPropertyAnimator {
|
||||
renderNode.setTranslationZ(value - renderNode.getElevation());
|
||||
break;
|
||||
case ALPHA:
|
||||
info.mAlpha = value;
|
||||
mView.setAlphaInternal(value);
|
||||
renderNode.setAlpha(value);
|
||||
break;
|
||||
}
|
||||
@@ -1047,7 +1046,7 @@ public class ViewPropertyAnimator {
|
||||
case Z:
|
||||
return node.getElevation() + node.getTranslationZ();
|
||||
case ALPHA:
|
||||
return mView.mTransformationInfo.mAlpha;
|
||||
return mView.getAlpha();
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user