am 255d1e15: Merge "Fix issue #6475693: OnSystemUiVisibilityChangeListener... (de888fec) · Commits · e / os / android_frameworks_base

api/current.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -23933,7 +23933,6 @@ package android.view {
		method public final android.view.View findViewWithTag(java.lang.Object);
		method public void findViewsWithText(java.util.ArrayList<android.view.View>, java.lang.CharSequence, int);
		method protected boolean fitSystemWindows(android.graphics.Rect);
		method public boolean fitsSystemWindows();
		method public android.view.View focusSearch(int);
		method public void forceLayout();
		method public android.view.accessibility.AccessibilityNodeProvider getAccessibilityNodeProvider();
		@@ -23958,6 +23957,7 @@ package android.view {
		method public void getDrawingRect(android.graphics.Rect);
		method public long getDrawingTime();
		method public boolean getFilterTouchesWhenObscured();
		method public boolean getFitsSystemWindows();
		method public java.util.ArrayList<android.view.View> getFocusables(int);
		method public void getFocusedRect(android.graphics.Rect);
		method public boolean getGlobalVisibleRect(android.graphics.Rect, android.graphics.Point);

core/java/android/view/View.java

+25 −9

Original line number	Diff line number	Diff line
		@@ -5209,6 +5209,13 @@ public class View implements Drawable.Callback, Drawable.Callback2, KeyEvent.Cal
		* call to continue to your children, you must be sure to call the super
		* implementation.
		*
		* <p>Here is a sample layout that makes use of fitting system windows
		* to have controls for a video view placed inside of the window decorations
		* that it hides and shows. This can be used with code like the second
		* sample (video player) shown in {@link #setSystemUiVisibility(int)}.
		*
		* {@sample development/samples/ApiDemos/res/layout/video_player.xml complete}
		*
		* @param insets Current content insets of the window. Prior to
		* {@link android.os.Build.VERSION_CODES#JELLY_BEAN} you must not modify
		* the insets or else you and Android will be unhappy.
		@@ -5251,7 +5258,8 @@ public class View implements Drawable.Callback, Drawable.Callback2, KeyEvent.Cal
		}

		/**
		* Check for the FITS_SYSTEM_WINDOWS flag. If this method returns true, this view
		* Check for state of {@link #setFitsSystemWindows(boolean). If this method
		* returns true, this view
		* will account for system screen decorations such as the status bar and inset its
		* content. This allows the view to be positioned in absolute screen coordinates
		* and remain visible to the user.
		@@ -5260,7 +5268,7 @@ public class View implements Drawable.Callback, Drawable.Callback2, KeyEvent.Cal
		*
		* @attr ref android.R.styleable#View_fitsSystemWindows
		*/
		public boolean fitsSystemWindows() {
		public boolean getFitsSystemWindows() {
		return (mViewFlags & FITS_SYSTEM_WINDOWS) == FITS_SYSTEM_WINDOWS;
		}

		@@ -15376,7 +15384,8 @@ public class View implements Drawable.Callback, Drawable.Callback2, KeyEvent.Cal
		* playing the application would like to go into a complete full-screen mode,
		* to use as much of the display as possible for the video. When in this state
		* the user can not interact with the application; the system intercepts
		* touching on the screen to pop the UI out of full screen mode.
		* touching on the screen to pop the UI out of full screen mode. See
		* {@link #fitSystemWindows(Rect)} for a sample layout that goes with this code.
		*
		* {@sample development/samples/ApiDemos/src/com/example/android/apis/view/VideoPlayerActivity.java
		* content}
		@@ -15458,11 +15467,13 @@ public class View implements Drawable.Callback, Drawable.Callback2, KeyEvent.Cal
		}
		}

		void updateLocalSystemUiVisibility(int localValue, int localChanges) {
		boolean updateLocalSystemUiVisibility(int localValue, int localChanges) {
		int val = (mSystemUiVisibility&~localChanges) \| (localValue&localChanges);
		if (val != mSystemUiVisibility) {
		setSystemUiVisibility(val);
		return true;
		}
		return false;
		}

		/** @hide */
		@@ -16861,7 +16872,7 @@ public class View implements Drawable.Callback, Drawable.Callback2, KeyEvent.Cal
		/**
		* Interface definition for a callback to be invoked when the status bar changes
		* visibility. This reports <strong>global</strong> changes to the system UI
		* state, not just what the application is requesting.
		* state, not what the application is requesting.
		*
		* @see View#setOnSystemUiVisibilityChangeListener(android.view.View.OnSystemUiVisibilityChangeListener)
		*/
		@@ -16870,10 +16881,10 @@ public class View implements Drawable.Callback, Drawable.Callback2, KeyEvent.Cal
		* Called when the status bar changes visibility because of a call to
		* {@link View#setSystemUiVisibility(int)}.
		*
		* @param visibility Bitwise-or of flags {@link #SYSTEM_UI_FLAG_LOW_PROFILE} or
		* {@link #SYSTEM_UI_FLAG_HIDE_NAVIGATION}. This tells you the
		* <strong>global</strong> state of the UI visibility flags, not what your
		* app is currently applying.
		* @param visibility Bitwise-or of flags {@link #SYSTEM_UI_FLAG_LOW_PROFILE},
		* {@link #SYSTEM_UI_FLAG_HIDE_NAVIGATION}, and {@link #SYSTEM_UI_FLAG_FULLSCREEN}.
		* This tells you the <strong>global</strong> state of these UI visibility
		* flags, not what your app is currently applying.
		*/
		public void onSystemUiVisibilityChange(int visibility);
		}
		@@ -17158,6 +17169,11 @@ public class View implements Drawable.Callback, Drawable.Callback2, KeyEvent.Cal
		*/
		int mDisabledSystemUiVisibility;

		/**
		* Last global system UI visibility reported by the window manager.
		*/
		int mGlobalSystemUiVisibility;

		/**
		* True if a view in this hierarchy has an OnSystemUiVisibilityChangeListener
		* attached.

core/java/android/view/ViewGroup.java

+4 −3

Original line number	Diff line number	Diff line
		@@ -1317,15 +1317,16 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
		}

		@Override
		void updateLocalSystemUiVisibility(int localValue, int localChanges) {
		super.updateLocalSystemUiVisibility(localValue, localChanges);
		boolean updateLocalSystemUiVisibility(int localValue, int localChanges) {
		boolean changed = super.updateLocalSystemUiVisibility(localValue, localChanges);

		final int count = mChildrenCount;
		final View[] children = mChildren;
		for (int i=0; i <count; i++) {
		final View child = children[i];
		child.updateLocalSystemUiVisibility(localValue, localChanges);
		changed \|= child.updateLocalSystemUiVisibility(localValue, localChanges);
		}
		return changed;
		}

		/**

core/java/android/view/ViewRootImpl.java

+7 −5

Original line number	Diff line number	Diff line
		@@ -3795,13 +3795,15 @@ public final class ViewRootImpl implements ViewParent,
		}
		if (mView == null) return;
		if (args.localChanges != 0) {
		mView.updateLocalSystemUiVisibility(args.localValue, args.localChanges);
		}
		if (mAttachInfo != null) {
		mAttachInfo.mRecomputeGlobalAttributes = true;
		int visibility = args.globalVisibility&View.SYSTEM_UI_CLEARABLE_FLAGS;
		if (visibility != mAttachInfo.mGlobalSystemUiVisibility) {
		mAttachInfo.mGlobalSystemUiVisibility = visibility;
		mView.dispatchSystemUiVisibilityChanged(visibility);
		}
		mView.updateLocalSystemUiVisibility(args.localValue, args.localChanges);
		scheduleTraversals();
		}
		mView.dispatchSystemUiVisibilityChanged(args.globalVisibility);
		}

		public void handleDispatchDoneAnimating() {