Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am b1f12933: Merge "Remove hidden/deleted APIs." into mnc-dev

Browse Source 
* commit 'b1f1293355a1837d95095d28891f9218bdcf2bdd':
  Remove hidden/deleted APIs.
This commit is contained in:
George Mount
2015-05-15 16:26:20 +00:00
committed by Android Git Automerger
parent 031339baea b1f1293355
commit e4ac47c69b
4 changed files with 1 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
core/java/android/app/BackStackRecord.java
View File

@@ -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;

2
core/java/android/app/EnterTransitionCoordinator.java
View File

@@ -593,7 +593,7 @@ class EnterTransitionCoordinator extends ActivityTransitionCoordinator {
}
private boolean allowOverlappingTransitions() {
return mIsReturning ? getWindow().getAllowExitTransitionOverlap()
return mIsReturning ? getWindow().getAllowReturnTransitionOverlap()
: getWindow().getAllowEnterTransitionOverlap();
}

20
core/java/android/app/FragmentTransaction.java
View File

@@ -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.

14
core/java/android/view/Window.java
View File

@@ -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.