Merge "Revert "Revert "API Review: Change View viewName attribute to transitionName.""" (eeda22b4) · Commits · e / os / android_frameworks_base

api/current.txt

+7 −7

Original line number	Diff line number	Diff line
		@@ -510,7 +510,7 @@ package android {
		field public static final int excludeClass = 16843844; // 0x1010444
		field public static final int excludeFromRecents = 16842775; // 0x1010017
		field public static final int excludeId = 16843843; // 0x1010443
		field public static final int excludeViewName = 16843856; // 0x1010450
		field public static final int excludeName = 16843856; // 0x1010450
		field public static final int exitFadeDuration = 16843533; // 0x101030d
		field public static final int expandableListPreferredChildIndicatorLeft = 16842834; // 0x1010052
		field public static final int expandableListPreferredChildIndicatorRight = 16842835; // 0x1010053
		@@ -1154,9 +1154,9 @@ package android {
		field public static final int targetClass = 16842799; // 0x101002f
		field public static final int targetDescriptions = 16843680; // 0x10103a0
		field public static final int targetId = 16843740; // 0x10103dc
		field public static final int targetName = 16843855; // 0x101044f
		field public static final int targetPackage = 16842785; // 0x1010021
		field public static final int targetSdkVersion = 16843376; // 0x1010270
		field public static final int targetViewName = 16843855; // 0x101044f
		field public static final int taskAffinity = 16842770; // 0x1010012
		field public static final int taskCloseEnterAnimation = 16842942; // 0x10100be
		field public static final int taskCloseExitAnimation = 16842943; // 0x10100bf
		@@ -1266,6 +1266,7 @@ package android {
		field public static final int transformPivotY = 16843553; // 0x1010321
		field public static final int transition = 16843743; // 0x10103df
		field public static final int transitionGroup = 16843803; // 0x101041b
		field public static final int transitionName = 16843802; // 0x101041a
		field public static final int transitionOrdering = 16843744; // 0x10103e0
		field public static final int translateX = 16843868; // 0x101045c
		field public static final int translateY = 16843869; // 0x101045d
		@@ -1300,7 +1301,6 @@ package android {
		field public static final int verticalGap = 16843328; // 0x1010240
		field public static final int verticalScrollbarPosition = 16843572; // 0x1010334
		field public static final int verticalSpacing = 16843029; // 0x1010115
		field public static final int viewName = 16843802; // 0x101041a
		field public static final int viewportHeight = 16843805; // 0x101041d
		field public static final int viewportWidth = 16843804; // 0x101041c
		field public static final int visibility = 16842972; // 0x10100dc
		@@ -30535,8 +30535,8 @@ package android.transition {
		method public android.transition.TransitionPropagation getPropagation();
		method public long getStartDelay();
		method public java.util.List<java.lang.Integer> getTargetIds();
		method public java.util.List<java.lang.String> getTargetNames();
		method public java.util.List<java.lang.Class> getTargetTypes();
		method public java.util.List<java.lang.String> getTargetViewNames();
		method public java.util.List<android.view.View> getTargets();
		method public java.lang.String[] getTransitionProperties();
		method public android.transition.TransitionValues getTransitionValues(android.view.View, boolean);
		@@ -30554,7 +30554,7 @@ package android.transition {
		field public static final int MATCH_ID = 3; // 0x3
		field public static final int MATCH_INSTANCE = 1; // 0x1
		field public static final int MATCH_ITEM_ID = 4; // 0x4
		field public static final int MATCH_VIEW_NAME = 2; // 0x2
		field public static final int MATCH_NAME = 2; // 0x2
		}

		public static abstract class Transition.EpicenterCallback {
		@@ -32745,13 +32745,13 @@ package android.view {
		method protected int getTopPaddingOffset();
		method public android.view.TouchDelegate getTouchDelegate();
		method public java.util.ArrayList<android.view.View> getTouchables();
		method public java.lang.String getTransitionName();
		method public float getTranslationX();
		method public float getTranslationY();
		method public float getTranslationZ();
		method public int getVerticalFadingEdgeLength();
		method public int getVerticalScrollbarPosition();
		method public int getVerticalScrollbarWidth();
		method public java.lang.String getViewName();
		method public android.view.ViewTreeObserver getViewTreeObserver();
		method public int getVisibility();
		method public final int getWidth();
		@@ -33008,13 +33008,13 @@ package android.view {
		method public void setTextDirection(int);
		method public final void setTop(int);
		method public void setTouchDelegate(android.view.TouchDelegate);
		method public final void setTransitionName(java.lang.String);
		method public void setTranslationX(float);
		method public void setTranslationY(float);
		method public void setTranslationZ(float);
		method public void setVerticalFadingEdgeEnabled(boolean);
		method public void setVerticalScrollBarEnabled(boolean);
		method public void setVerticalScrollbarPosition(int);
		method public final void setViewName(java.lang.String);
		method public void setVisibility(int);
		method public void setWillNotCacheDrawing(boolean);
		method public void setWillNotDraw(boolean);

core/java/android/app/ActivityOptions.java

+4 −6

Original line number	Diff line number	Diff line
		@@ -29,8 +29,6 @@ import android.view.View;
		import android.view.Window;

		import java.util.ArrayList;
		import java.util.List;
		import java.util.Map;

		/**
		* Helper class for building an options Bundle that can be used with
		@@ -398,14 +396,14 @@ public class ActivityOptions {
		if (sharedElementName == null) {
		throw new IllegalArgumentException("Shared element name must not be null");
		}
		String viewName = sharedElement.first.getViewName();
		if (viewName == null) {
		String name = sharedElement.first.getTransitionName();
		if (name == null) {
		throw new IllegalArgumentException("Shared elements must have non-null " +
		"viewNames");
		"transitionNames");
		}

		names.add(sharedElementName);
		mappedNames.add(viewName);
		mappedNames.add(name);
		}
		}

core/java/android/app/ActivityTransitionCoordinator.java

+4 −4

Original line number	Diff line number	Diff line
		@@ -281,7 +281,7 @@ abstract class ActivityTransitionCoordinator extends ResultReceiver {
		public ArrayList<String> getMappedNames() {
		ArrayList<String> names = new ArrayList<String>(mSharedElements.size());
		for (int i = 0; i < mSharedElements.size(); i++) {
		names.add(mSharedElements.get(i).getViewName());
		names.add(mSharedElements.get(i).getTransitionName());
		}
		return names;
		}
		@@ -358,9 +358,9 @@ abstract class ActivityTransitionCoordinator extends ResultReceiver {
		String name = mAllSharedElementNames.get(i);
		View sharedElement = sharedElements.get(name);
		if (sharedElement != null) {
		if (sharedElement.getViewName() == null) {
		if (sharedElement.getTransitionName() == null) {
		throw new IllegalArgumentException("Shared elements must have " +
		"non-null viewNames");
		"non-null transitionNames");
		}
		mSharedElementNames.add(name);
		mSharedElements.add(sharedElement);
		@@ -494,7 +494,7 @@ abstract class ActivityTransitionCoordinator extends ResultReceiver {
		if (bitmap != null) {
		snapshot.setBackground(new BitmapDrawable(resources, bitmap));
		}
		snapshot.setViewName(name);
		snapshot.setTransitionName(name);
		setSharedElementState(snapshot, name, state, parentLoc);
		snapshots.add(snapshot);
		}

core/java/android/app/BackStackRecord.java

+9 −9

Original line number	Diff line number	Diff line
		@@ -581,13 +581,13 @@ final class BackStackRecord extends FragmentTransaction implements

		@Override
		public FragmentTransaction setSharedElement(View sharedElement, String name) {
		String viewName = sharedElement.getViewName();
		if (viewName == null) {
		throw new IllegalArgumentException("Unique viewNames are required for all" +
		String transitionName = sharedElement.getTransitionName();
		if (transitionName == null) {
		throw new IllegalArgumentException("Unique transitionNames are required for all" +
		" sharedElements");
		}
		mSharedElementSourceNames = new ArrayList<String>(1);
		mSharedElementSourceNames.add(viewName);
		mSharedElementSourceNames.add(transitionName);

		mSharedElementTargetNames = new ArrayList<String>(1);
		mSharedElementTargetNames.add(name);
		@@ -603,12 +603,12 @@ final class BackStackRecord extends FragmentTransaction implements
		ArrayList<String> sourceNames = new ArrayList<String>(sharedElements.length);
		ArrayList<String> targetNames = new ArrayList<String>(sharedElements.length);
		for (int i = 0; i < sharedElements.length; i++) {
		String viewName = sharedElements[i].first.getViewName();
		if (viewName == null) {
		throw new IllegalArgumentException("Unique viewNames are required for all" +
		" sharedElements");
		String transitionName = sharedElements[i].first.getTransitionName();
		if (transitionName == null) {
		throw new IllegalArgumentException("Unique transitionNames are required for all"
		+ " sharedElements");
		}
		sourceNames.add(viewName);
		sourceNames.add(transitionName);
		targetNames.add(sharedElements[i].second);
		}
		mSharedElementSourceNames = sourceNames;

core/java/android/app/FragmentTransaction.java

+4 −4

Original line number	Diff line number	Diff line
		@@ -184,10 +184,10 @@ public abstract class FragmentTransaction {
		/**
		* Used with {@link #setCustomTransition(int, int)} to map a View from a removed or hidden
		* Fragment to a View from a shown or added Fragment.
		* <var>sharedElement</var> must have a unique viewName in the View hierarchy.
		* <var>sharedElement</var> must have a unique transitionName in the View hierarchy.
		* @param sharedElement A View in a disappearing Fragment to match with a View in an
		* appearing Fragment.
		* @param name The viewName for a View in an appearing Fragment to match to the shared
		* @param name The transitionName for a View in an appearing Fragment to match to the shared
		* element.
		*/
		public abstract FragmentTransaction setSharedElement(View sharedElement, String name);
		@@ -195,8 +195,8 @@ public abstract class FragmentTransaction {
		/**
		* Used with {@link #setCustomTransition(int, int)} to map multiple Views from removed or hidden
		* Fragments to a Views from a shown or added Fragments. Views in
		* <var>sharedElements</var> must have unique viewNames in the View hierarchy.
		* @param sharedElements Pairs of Views in disappearing Fragments to viewNames in
		* <var>sharedElements</var> must have unique transitionNames in the View hierarchy.
		* @param sharedElements Pairs of Views in disappearing Fragments to transitionNames in
		* appearing Fragments.
		*/
		public abstract FragmentTransaction setSharedElements(Pair<View, String>... sharedElements);