Merge "Removing the info pane." (48dfae92) · Commits · e / os / android_frameworks_base

packages/SystemUI/res/layout/recents_task_view.xml

+0 −15

Original line number	Diff line number	Diff line
		@@ -22,21 +22,6 @@
		android:id="@+id/task_view_thumbnail"
		android:layout_width="match_parent"
		android:layout_height="match_parent" />
		<com.android.systemui.recents.views.TaskInfoView
		android:id="@+id/task_view_info_pane"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:visibility="invisible"
		android:background="@color/recents_task_bar_default_background_color">
		<Button
		android:id="@+id/task_view_app_info_button"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_marginStart="20dp"
		android:layout_marginEnd="20dp"
		android:layout_gravity="top\|center_horizontal"
		android:text="@string/recents_app_info_button_label" />
		</com.android.systemui.recents.views.TaskInfoView>
		<com.android.systemui.recents.views.TaskBarView
		android:id="@+id/task_view_bar"
		android:layout_width="match_parent"

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

+0 −2

Original line number	Diff line number	Diff line
		@@ -31,8 +31,6 @@ public class Constants {
		public static final boolean EnableTaskStackClipping = false;
		// Enables the use of theme colors as the task bar background
		public static final boolean EnableTaskBarThemeColors = true;
		// Enables the info pane on long-pressing the task
		public static final boolean EnableInfoPane = false;
		// Enables app-info pane on long-pressing the icon
		public static final boolean EnableDevAppInfoOnLongPress = true;
		// Enables the search bar layout

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

+3 −10

Original line number	Diff line number	Diff line
		@@ -394,18 +394,11 @@ public class RecentsActivity extends Activity implements RecentsView.RecentsView
		public void onBackPressed() {
		boolean interceptedByInfoPanelClose = false;

		// Try and return from any open info panes
		if (Constants.DebugFlags.App.EnableInfoPane) {
		interceptedByInfoPanelClose = mRecentsView.closeOpenInfoPanes();
		}

		// If we haven't been intercepted already, then unfilter any stacks
		if (!interceptedByInfoPanelClose) {
		// Unfilter any stacks
		if (!mRecentsView.unfilterFilteredStacks()) {
		super.onBackPressed();
		}
		}
		}

		@Override
		public void onTaskLaunching() {

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

+0 −21

Original line number	Diff line number	Diff line
		@@ -301,24 +301,6 @@ public class RecentsView extends FrameLayout implements TaskStackView.TaskStackV
		return insets.consumeSystemWindowInsets(false, false, false, true);
		}

		/** Closes any open info panes */
		public boolean closeOpenInfoPanes() {
		if (mBSP != null) {
		// Get the first stack view
		int childCount = getChildCount();
		for (int i = 0; i < childCount; i++) {
		View child = getChildAt(i);
		if (child instanceof TaskStackView) {
		TaskStackView stackView = (TaskStackView) child;
		if (stackView.closeOpenInfoPanes()) {
		return true;
		}
		}
		}
		}
		return false;
		}

		/** Unfilters any filtered stacks */
		public boolean unfilterFilteredStacks() {
		if (mBSP != null) {
		@@ -346,9 +328,6 @@ public class RecentsView extends FrameLayout implements TaskStackView.TaskStackV
		mCb.onTaskLaunching();
		}

		// Close any open info panes
		closeOpenInfoPanes();

		final Runnable launchRunnable = new Runnable() {
		@Override
		public void run() {

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

deleted100644 → 0

+0 −185

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2014 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.views;

		import android.animation.Animator;
		import android.animation.AnimatorListenerAdapter;
		import android.animation.ObjectAnimator;
		import android.content.Context;
		import android.content.res.ColorStateList;
		import android.graphics.Canvas;
		import android.graphics.Path;
		import android.graphics.Point;
		import android.graphics.Rect;
		import android.graphics.drawable.RippleDrawable;
		import android.util.AttributeSet;
		import android.widget.Button;
		import android.widget.FrameLayout;
		import com.android.systemui.R;
		import com.android.systemui.recents.Constants;
		import com.android.systemui.recents.RecentsConfiguration;
		import com.android.systemui.recents.Utilities;
		import com.android.systemui.recents.model.Task;


		/* The task info view */
		class TaskInfoView extends FrameLayout {

		Button mAppInfoButton;

		// Circular clip animation
		boolean mCircularClipEnabled;
		Path mClipPath = new Path();
		float mClipRadius;
		float mMaxClipRadius;
		Point mClipOrigin = new Point();
		ObjectAnimator mCircularClipAnimator;

		public TaskInfoView(Context context) {
		this(context, null);
		}

		public TaskInfoView(Context context, AttributeSet attrs) {
		this(context, attrs, 0);
		}

		public TaskInfoView(Context context, AttributeSet attrs, int defStyleAttr) {
		this(context, attrs, defStyleAttr, 0);
		}

		public TaskInfoView(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
		super(context, attrs, defStyleAttr, defStyleRes);
		}

		@Override
		protected void onFinishInflate() {
		// Initialize the buttons on the info panel
		mAppInfoButton = (Button) findViewById(R.id.task_view_app_info_button);
		}

		/** Updates the positions of each of the items to fit in the rect specified */
		void updateContents(Rect visibleRect) {
		// Offset the app info button
		mAppInfoButton.setTranslationY(visibleRect.top +
		(visibleRect.height() - mAppInfoButton.getMeasuredHeight()) / 2);
		}

		/** Sets the circular clip radius on this panel */
		public void setCircularClipRadius(float r) {
		mClipRadius = r;
		invalidate();
		}

		/** Gets the circular clip radius on this panel */
		public float getCircularClipRadius() {
		return mClipRadius;
		}

		/** Animates the circular clip radius on the icon */
		void animateCircularClip(Point o, float fromRadius, float toRadius,
		final Runnable postRunnable, boolean animateInContent) {
		if (mCircularClipAnimator != null) {
		mCircularClipAnimator.cancel();
		}

		// Calculate the max clip radius to each of the corners
		int w = getMeasuredWidth() - o.x;
		int h = getMeasuredHeight() - o.y;
		// origin to tl, tr, br, bl
		mMaxClipRadius = (int) Math.ceil(Math.sqrt(o.x * o.x + o.y * o.y));
		mMaxClipRadius = (int) Math.max(mMaxClipRadius, Math.ceil(Math.sqrt(w * w + o.y * o.y)));
		mMaxClipRadius = (int) Math.max(mMaxClipRadius, Math.ceil(Math.sqrt(w * w + h * h)));
		mMaxClipRadius = (int) Math.max(mMaxClipRadius, Math.ceil(Math.sqrt(o.x * o.x + h * h)));

		mClipOrigin.set(o.x, o.y);
		mClipRadius = fromRadius;
		int duration = Utilities.calculateTranslationAnimationDuration((int) mMaxClipRadius);
		mCircularClipAnimator = ObjectAnimator.ofFloat(this, "circularClipRadius", toRadius);
		mCircularClipAnimator.setDuration(duration);
		mCircularClipAnimator.setInterpolator(
		RecentsConfiguration.getInstance().defaultBezierInterpolator);
		mCircularClipAnimator.addListener(new AnimatorListenerAdapter() {
		@Override
		public void onAnimationEnd(Animator animation) {
		mCircularClipEnabled = false;
		if (postRunnable != null) {
		postRunnable.run();
		}
		}
		});
		mCircularClipAnimator.start();
		mCircularClipEnabled = true;

		if (animateInContent) {
		animateAppInfoButtonIn(duration);
		}
		}

		/** Cancels the circular clip animation. */
		void cancelCircularClipAnimation() {
		if (mCircularClipAnimator != null) {
		mCircularClipAnimator.cancel();
		}
		}

		void animateAppInfoButtonIn(int duration) {
		mAppInfoButton.setScaleX(0.75f);
		mAppInfoButton.setScaleY(0.75f);
		mAppInfoButton.animate()
		.scaleX(1f)
		.scaleY(1f)
		.setDuration(duration)
		.setInterpolator(RecentsConfiguration.getInstance().defaultBezierInterpolator)
		.withLayer()
		.start();
		}

		/** Binds the info view to the task */
		void rebindToTask(Task t, boolean animate) {
		RecentsConfiguration configuration = RecentsConfiguration.getInstance();
		if (Constants.DebugFlags.App.EnableTaskBarThemeColors && t.colorPrimary != 0) {
		setBackgroundColor(t.colorPrimary);
		// Workaround: The button currently doesn't support setting a custom background tint
		// not defined in the theme. Just lower the alpha on the button to make it blend more
		// into the background.
		if (mAppInfoButton.getBackground() instanceof RippleDrawable) {
		RippleDrawable d = (RippleDrawable) mAppInfoButton.getBackground();
		if (d != null) {
		d.setAlpha(96);
		}
		}
		} else {
		setBackgroundColor(configuration.taskBarViewDefaultBackgroundColor);
		}
		}

		@Override
		public void draw(Canvas canvas) {
		int saveCount = 0;
		if (mCircularClipEnabled) {
		saveCount = canvas.save(Canvas.CLIP_SAVE_FLAG);
		mClipPath.reset();
		mClipPath.addCircle(mClipOrigin.x, mClipOrigin.y, mClipRadius * mMaxClipRadius,
		Path.Direction.CW);
		canvas.clipPath(mClipPath);
		}
		super.draw(canvas);
		if (mCircularClipEnabled) {
		canvas.restoreToCount(saveCount);
		}
		}
		}