Merge "Hook up TaskDescription into set bar color calls (6/N)" (a232661f) · Commits · e / os / android_frameworks_base

core/java/android/app/Activity.java

+20 −0

Original line number	Diff line number	Diff line
		@@ -3930,6 +3930,26 @@ public class Activity extends ContextThemeWrapper
		ActivityTaskManager.getService().toggleFreeformWindowingMode(mToken);
		}

		/**
		* Update the forced status bar color.
		* @hide
		*/
		@Override
		public void updateStatusBarColor(int color) {
		mTaskDescription.setStatusBarColor(color);
		setTaskDescription(mTaskDescription);
		}

		/**
		* Update the forced navigation bar color.
		* @hide
		*/
		@Override
		public void updateNavigationBarColor(int color) {
		mTaskDescription.setNavigationBarColor(color);
		setTaskDescription(mTaskDescription);
		}

		/**
		* Puts the activity in picture-in-picture mode if the activity supports.
		* @see android.R.attr#supportsPictureInPicture

+10 −0

Original line number	Diff line number	Diff line
		@@ -636,6 +636,16 @@ public abstract class Window {

		/** Returns whether the window belongs to the task root. */
		boolean isTaskRoot();

		/**
		* Update the status bar color to a forced one.
		*/
		void updateStatusBarColor(int color);

		/**
		* Update the navigation bar color to a forced one.
		*/
		void updateNavigationBarColor(int color);
		}

		/**

+8 −0

Original line number	Diff line number	Diff line
		@@ -3829,6 +3829,10 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback {
		if (mDecor != null) {
		mDecor.updateColorViews(null, false /* animate */);
		}
		final WindowControllerCallback callback = getWindowControllerCallback();
		if (callback != null) {
		getWindowControllerCallback().updateStatusBarColor(color);
		}
		}

		@Override
		@@ -3843,6 +3847,10 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback {
		if (mDecor != null) {
		mDecor.updateColorViews(null, false /* animate */);
		}
		final WindowControllerCallback callback = getWindowControllerCallback();
		if (callback != null) {
		getWindowControllerCallback().updateNavigationBarColor(color);
		}
		}

		@Override