resolved conflicts for merge of 1e8a87dd to master (4297409e) · Commits · e / os / android_frameworks_base

core/java/android/view/View.java

+11 −0

Original line number	Diff line number	Diff line
		@@ -9766,6 +9766,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		invalidateViewProperty(false, true);

		invalidateParentIfNeededAndWasQuickRejected();
		notifySubtreeAccessibilityStateChangedIfNeeded();
		}
		}

		@@ -9809,6 +9810,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		invalidateViewProperty(false, true);

		invalidateParentIfNeededAndWasQuickRejected();
		notifySubtreeAccessibilityStateChangedIfNeeded();
		}
		}

		@@ -9852,6 +9854,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		invalidateViewProperty(false, true);

		invalidateParentIfNeededAndWasQuickRejected();
		notifySubtreeAccessibilityStateChangedIfNeeded();
		}
		}

		@@ -9887,6 +9890,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		invalidateViewProperty(false, true);

		invalidateParentIfNeededAndWasQuickRejected();
		notifySubtreeAccessibilityStateChangedIfNeeded();
		}
		}

		@@ -9922,6 +9926,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		invalidateViewProperty(false, true);

		invalidateParentIfNeededAndWasQuickRejected();
		notifySubtreeAccessibilityStateChangedIfNeeded();
		}
		}

		@@ -10083,6 +10088,8 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		mPrivateFlags &= ~PFLAG_ALPHA_SET;
		invalidateViewProperty(true, false);
		mRenderNode.setAlpha(getFinalAlpha());
		notifyViewAccessibilityStateChangedIfNeeded(
		AccessibilityEvent.CONTENT_CHANGE_TYPE_UNDEFINED);
		}
		}
		}
		@@ -10513,6 +10520,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		invalidateViewProperty(false, true);

		invalidateParentIfNeededAndWasQuickRejected();
		notifySubtreeAccessibilityStateChangedIfNeeded();
		}
		}

		@@ -10661,6 +10669,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		} else {
		mRenderNode.setOutline(null);
		}
		notifySubtreeAccessibilityStateChangedIfNeeded();
		}
		}

		@@ -10815,6 +10824,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		}
		invalidateParentIfNeeded();
		}
		notifySubtreeAccessibilityStateChangedIfNeeded();
		}
		}

		@@ -10861,6 +10871,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		}
		invalidateParentIfNeeded();
		}
		notifySubtreeAccessibilityStateChangedIfNeeded();
		}
		}

core/java/android/view/ViewGroup.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -4638,6 +4638,7 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
		if (invalidate) {
		invalidateViewProperty(false, false);
		}
		notifySubtreeAccessibilityStateChangedIfNeeded();
		}

		/**