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

Fix TODO in javadoc for FEATURE_CONTENT_TRANSITIONS.

Browse Source 
Bug 19254085

Change-Id: I22d4c4e3d1d754ab96741eb0e0290d1ecfc05552
This commit is contained in:
George Mount
2015-02-04 14:37:04 -08:00
parent d7310bd149
commit c3a043cf0e
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -102,10 +102,12 @@ public abstract class Window {
*/ */
public static final int FEATURE_SWIPE_TO_DISMISS = 11; public static final int FEATURE_SWIPE_TO_DISMISS = 11;
/** /**
* Flag for requesting that window content changes should be represented * Flag for requesting that window content changes should be animated using a
* with scenes and transitions. * TransitionManager.
* *
* TODO Add docs * <p>The TransitionManager is set using
* {@link #setTransitionManager(android.transition.TransitionManager)}. If none is set,
* a default TransitionManager will be used.</p>
* *
* @see #setContentView * @see #setContentView
*/ */
@@ -1019,10 +1021,16 @@ public abstract class Window {
* <p>Note that calling this function "locks in" various characteristics * <p>Note that calling this function "locks in" various characteristics
* of the window that can not, from this point forward, be changed: the * of the window that can not, from this point forward, be changed: the
* features that have been requested with {@link #requestFeature(int)}, * features that have been requested with {@link #requestFeature(int)},
* and certain window flags as described in {@link #setFlags(int, int)}. * and certain window flags as described in {@link #setFlags(int, int)}.</p>
*
* <p>If {@link #FEATURE_CONTENT_TRANSITIONS} is set, the window's
* TransitionManager will be used to animate content from the current
* content View to view.</p>
* *
* @param view The desired content to display. * @param view The desired content to display.
* @param params Layout parameters for the view. * @param params Layout parameters for the view.
* @see #getTransitionManager()
* @see #setTransitionManager(android.transition.TransitionManager)
*/ */
public abstract void setContentView(View view, ViewGroup.LayoutParams params); public abstract void setContentView(View view, ViewGroup.LayoutParams params);
@@ -1467,6 +1475,7 @@ public abstract class Window {
* {@link #setContentView}) if {@link #FEATURE_CONTENT_TRANSITIONS} has been granted.</p> * {@link #setContentView}) if {@link #FEATURE_CONTENT_TRANSITIONS} has been granted.</p>
* *
* @return This window's content TransitionManager or null if none is set. * @return This window's content TransitionManager or null if none is set.
* @attr ref android.R.styleable#Window_windowContentTransitionManager
*/ */
public TransitionManager getTransitionManager() { public TransitionManager getTransitionManager() {
return null; return null;
@@ -1477,6 +1486,7 @@ public abstract class Window {
* Requires {@link #FEATURE_CONTENT_TRANSITIONS}. * Requires {@link #FEATURE_CONTENT_TRANSITIONS}.
* *
* @param tm The TransitionManager to use for scene changes. * @param tm The TransitionManager to use for scene changes.
* @attr ref android.R.styleable#Window_windowContentTransitionManager
*/ */
public void setTransitionManager(TransitionManager tm) { public void setTransitionManager(TransitionManager tm) {
throw new UnsupportedOperationException(); throw new UnsupportedOperationException();