summaryrefslogtreecommitdiffstats
path: root/core/java/android/view/Window.java
diff options
context:
space:
mode:
authorGeorge Mount <mount@google.com>2015-05-15 14:08:17 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-05-15 14:08:19 +0000
commitb1f1293355a1837d95095d28891f9218bdcf2bdd (patch)
tree96dab6aad603d924e11e8f9696299c9bb10fa483 /core/java/android/view/Window.java
parentd63f9321e62064660d426efd5abbd885c4a24652 (diff)
parent5aec62eae12b35de8d5fe7cba29166048c167572 (diff)
downloadframeworks_base-b1f1293355a1837d95095d28891f9218bdcf2bdd.zip
frameworks_base-b1f1293355a1837d95095d28891f9218bdcf2bdd.tar.gz
frameworks_base-b1f1293355a1837d95095d28891f9218bdcf2bdd.tar.bz2
Merge "Remove hidden/deleted APIs." into mnc-dev
Diffstat (limited to 'core/java/android/view/Window.java')
-rw-r--r--core/java/android/view/Window.java14
1 files changed, 0 insertions, 14 deletions
diff --git a/core/java/android/view/Window.java b/core/java/android/view/Window.java
index 49a72ce..07984e9 100644
--- a/core/java/android/view/Window.java
+++ b/core/java/android/view/Window.java
@@ -1784,14 +1784,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
* transition of the called Activity when reentering after if finishes. When true,
@@ -1805,12 +1797,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.
* <p>When executing the enter transition, the background starts transparent