Moving the background to the window. (e8a4eff9) · Commits · e / os / android_frameworks_base

core/java/com/android/internal/policy/DecorView.java

+13 −0

Original line number	Diff line number	Diff line
		@@ -209,6 +209,7 @@ public class DecorView extends FrameLayout implements RootViewSurfaceTaker, Wind
		private Drawable mResizingBackgroundDrawable;
		private Drawable mCaptionBackgroundDrawable;
		private Drawable mUserCaptionBackgroundDrawable;
		private Drawable mOriginalBackgroundDrawable;

		private float mAvailableWidth;

		@@ -888,6 +889,11 @@ public class DecorView extends FrameLayout implements RootViewSurfaceTaker, Wind
		mBackgroundPadding.setEmpty();
		}
		drawableChanged();

		// Make sure we don't reset to the old drawable when finishing resizing.
		if (mResizeMode != RESIZE_MODE_INVALID) {
		mOriginalBackgroundDrawable = null;
		}
		}
		}

		@@ -1950,6 +1956,9 @@ public class DecorView extends FrameLayout implements RootViewSurfaceTaker, Wind
		updateElevation();

		updateColorViews(null /* insets */, false);

		mOriginalBackgroundDrawable = getBackground();
		setBackgroundDrawable(null);
		}
		mResizeMode = resizeMode;
		getViewRootImpl().requestInvalidateRootRenderNode();
		@@ -1961,6 +1970,10 @@ public class DecorView extends FrameLayout implements RootViewSurfaceTaker, Wind
		updateColorViews(null /* insets */, false);
		mResizeMode = RESIZE_MODE_INVALID;
		getViewRootImpl().requestInvalidateRootRenderNode();
		if (mOriginalBackgroundDrawable != null) {
		setBackgroundDrawable(mOriginalBackgroundDrawable);
		mOriginalBackgroundDrawable = null;
		}
		}

		@Override

packages/SystemUI/src/com/android/systemui/recents/RecentsActivity.java

+3 −0

Original line number	Diff line number	Diff line
		@@ -274,6 +274,9 @@ public class RecentsActivity extends Activity implements ViewTreeObserver.OnPreD
		}
		});

		// Set the window background
		getWindow().setBackgroundDrawable(mRecentsView.getBackgroundScrim());

		// Create the home intent runnable
		mHomeIntent = new Intent(Intent.ACTION_MAIN, null);
		mHomeIntent.addCategory(Intent.CATEGORY_HOME);

packages/SystemUI/src/com/android/systemui/recents/events/ui/ResetBackgroundScrimEvent.java

deleted100644 → 0

+0 −26

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2016 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package com.android.systemui.recents.events.ui;

		import com.android.systemui.recents.events.EventBus;

		/**
		* This is sent to reset the background scrim back to the initial state.
		*/
		public class ResetBackgroundScrimEvent extends EventBus.Event {
		// Simple event
		}

packages/SystemUI/src/com/android/systemui/recents/events/ui/UpdateBackgroundScrimEvent.java

deleted100644 → 0

+0 −31

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2016 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package com.android.systemui.recents.events.ui;

		import com.android.systemui.recents.events.EventBus;

		/**
		* This is sent to request an update to the background scrim.
		*/
		public class UpdateBackgroundScrimEvent extends EventBus.Event {

		public final float alpha;

		public UpdateBackgroundScrimEvent(float alpha) {
		this.alpha = alpha;
		}
		}

packages/SystemUI/src/com/android/systemui/recents/views/RecentsView.java

+12 −16

Original line number	Diff line number	Diff line
		@@ -63,8 +63,6 @@ import com.android.systemui.recents.events.ui.DeleteTaskDataEvent;
		import com.android.systemui.recents.events.ui.DismissAllTaskViewsEvent;
		import com.android.systemui.recents.events.ui.DraggingInRecentsEndedEvent;
		import com.android.systemui.recents.events.ui.DraggingInRecentsEvent;
		import com.android.systemui.recents.events.ui.ResetBackgroundScrimEvent;
		import com.android.systemui.recents.events.ui.UpdateBackgroundScrimEvent;
		import com.android.systemui.recents.events.ui.dragndrop.DragDropTargetChangedEvent;
		import com.android.systemui.recents.events.ui.dragndrop.DragEndEvent;
		import com.android.systemui.recents.events.ui.dragndrop.DragStartEvent;
		@@ -105,7 +103,8 @@ public class RecentsView extends FrameLayout {
		private Rect mSystemInsets = new Rect();
		private int mDividerSize;

		private ColorDrawable mBackgroundScrim = new ColorDrawable(Color.BLACK);
		private Drawable mBackgroundScrim = new ColorDrawable(
		Color.argb((int) (DEFAULT_SCRIM_ALPHA * 255), 0, 0, 0)).mutate();
		private Animator mBackgroundScrimAnimator;

		private RecentsTransitionHelper mTransitionHelper;
		@@ -159,8 +158,6 @@ public class RecentsView extends FrameLayout {
		}
		mEmptyView = (TextView) inflater.inflate(R.layout.recents_empty, this, false);
		addView(mEmptyView);

		setBackground(mBackgroundScrim);
		}

		/**
		@@ -186,14 +183,14 @@ public class RecentsView extends FrameLayout {

		if (isResumingFromVisible) {
		// If we are already visible, then restore the background scrim
		animateBackgroundScrim(DEFAULT_SCRIM_ALPHA, DEFAULT_UPDATE_SCRIM_DURATION);
		animateBackgroundScrim(1f, DEFAULT_UPDATE_SCRIM_DURATION);
		} else {
		// If we are already occluded by the app, then set the final background scrim alpha now.
		// Otherwise, defer until the enter animation completes to animate the scrim alpha with
		// the tasks for the home animation.
		if (launchState.launchedViaDockGesture \|\| launchState.launchedFromApp
		\|\| isTaskStackEmpty) {
		mBackgroundScrim.setAlpha((int) (DEFAULT_SCRIM_ALPHA * 255));
		mBackgroundScrim.setAlpha(255);
		} else {
		mBackgroundScrim.setAlpha(0);
		}
		@@ -222,6 +219,13 @@ public class RecentsView extends FrameLayout {
		return mStack;
		}

		/*
		* Returns the window background scrim.
		*/
		public Drawable getBackgroundScrim() {
		return mBackgroundScrim;
		}

		/**
		* Returns whether the last task launched was in the freeform stack or not.
		*/
		@@ -573,19 +577,11 @@ public class RecentsView extends FrameLayout {
		RecentsActivityLaunchState launchState = Recents.getConfiguration().getLaunchState();
		if (!launchState.launchedViaDockGesture && !launchState.launchedFromApp
		&& mStack.getTaskCount() > 0) {
		animateBackgroundScrim(DEFAULT_SCRIM_ALPHA,
		animateBackgroundScrim(1f,
		TaskStackAnimationHelper.ENTER_FROM_HOME_TRANSLATION_DURATION);
		}
		}

		public final void onBusEvent(UpdateBackgroundScrimEvent event) {
		animateBackgroundScrim(event.alpha, DEFAULT_UPDATE_SCRIM_DURATION);
		}

		public final void onBusEvent(ResetBackgroundScrimEvent event) {
		animateBackgroundScrim(DEFAULT_SCRIM_ALPHA, DEFAULT_UPDATE_SCRIM_DURATION);
		}

		public final void onBusEvent(AllTaskViewsDismissedEvent event) {
		hideStackActionButton(HIDE_STACK_ACTION_BUTTON_DURATION, true /* translate */);
		}