Merge "Remove hidden/deleted APIs." into mnc-dev (b1f12933) · Commits · e / os / android_frameworks_base

core/java/android/app/BackStackRecord.java

+0 −40

Original line number	Diff line number	Diff line
		@@ -577,46 +577,6 @@ final class BackStackRecord extends FragmentTransaction implements
		return this;
		}

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

		mSharedElementTargetNames = new ArrayList<String>(1);
		mSharedElementTargetNames.add(name);
		return this;
		}

		/** TODO: remove this */
		@Override
		public FragmentTransaction setSharedElements(Pair<View, String>... sharedElements) {
		if (sharedElements == null \|\| sharedElements.length == 0) {
		mSharedElementSourceNames = null;
		mSharedElementTargetNames = null;
		} else {
		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 transitionName = sharedElements[i].first.getTransitionName();
		if (transitionName == null) {
		throw new IllegalArgumentException("Unique transitionNames are required for all"
		+ " sharedElements");
		}
		sourceNames.add(transitionName);
		targetNames.add(sharedElements[i].second);
		}
		mSharedElementSourceNames = sourceNames;
		mSharedElementTargetNames = targetNames;
		}
		return this;
		}

		public FragmentTransaction setTransitionStyle(int styleRes) {
		mTransitionStyle = styleRes;
		return this;

core/java/android/app/EnterTransitionCoordinator.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -593,7 +593,7 @@ class EnterTransitionCoordinator extends ActivityTransitionCoordinator {
		}

		private boolean allowOverlappingTransitions() {
		return mIsReturning ? getWindow().getAllowExitTransitionOverlap()
		return mIsReturning ? getWindow().getAllowReturnTransitionOverlap()
		: getWindow().getAllowEnterTransitionOverlap();
		}

core/java/android/app/FragmentTransaction.java

+0 −20

Original line number	Diff line number	Diff line
		@@ -171,14 +171,6 @@ public abstract class FragmentTransaction {
		*/
		public abstract FragmentTransaction setTransition(int transit);

		/**
		* TODO: remove from API
		* @hide
		*/
		public FragmentTransaction setCustomTransition(int sceneRootId, int transitionId) {
		return this;
		}

		/**
		* Used with to map a View from a removed or hidden Fragment to a View from a shown
		* or added Fragment.
		@@ -189,18 +181,6 @@ public abstract class FragmentTransaction {
		*/
		public abstract FragmentTransaction addSharedElement(View sharedElement, String name);

		/**
		* TODO: remove from API
		* @hide
		*/
		public abstract FragmentTransaction setSharedElement(View sharedElement, String name);

		/**
		* TODO: remove from API
		* @hide
		*/
		public abstract FragmentTransaction setSharedElements(Pair<View, String>... sharedElements);

		/**
		* Set a custom style resource that will be used for resolving transit
		* animations.

core/java/android/view/Window.java

+0 −14

Original line number	Diff line number	Diff line
		@@ -1783,14 +1783,6 @@ public abstract class Window {
		*/
		public void setAllowReturnTransitionOverlap(boolean allow) {}

		/**
		* TODO: remove this.
		* @hide
		*/
		public void setAllowExitTransitionOverlap(boolean allow) {
		setAllowReturnTransitionOverlap(allow);
		}

		/**
		* Returns how the transition set in
		* {@link #setExitTransition(android.transition.Transition)} overlaps with the exit
		@@ -1804,12 +1796,6 @@ public abstract class Window {
		*/
		public boolean getAllowReturnTransitionOverlap() { return true; }

		/**
		* TODO: remove this.
		* @hide
		*/
		public boolean getAllowExitTransitionOverlap() { return getAllowReturnTransitionOverlap(); }

		/**
		* Returns the duration, in milliseconds, of the window background fade
		* when transitioning into or away from an Activity when called with an Activity Transition.