Merge \"Use a round rect background drawable for \"clear all\"\" into nyc-mr1-dev (3deaaf5f) · Commits · e / os / android_frameworks_base

packages/SystemUI/res/drawable/recents_stack_action_background.xml

0 → 100644

+25 −0

Original line number	Diff line number	Diff line
		<!--
		Copyright (C) 2016 The Android Open Source Project

		Licensed under the Apache License, Version 2 (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.
		-->

		<ripple xmlns:android="http://schemas.android.com/apk/res/android"
		android:color="?android:attr/colorControlHighlight">
		<item android:id="@android:id/mask">
		<shape>
		<corners android:radius="@dimen/recents_task_view_rounded_corners_radius" />
		<solid android:color="@android:color/white" />
		</shape>
		</item>
		</ripple>
		No newline at end of file

+1 −1

Original line number	Diff line number	Diff line
		@@ -31,6 +31,6 @@
		android:shadowDy="2"
		android:shadowRadius="5"
		android:fontFamily="sans-serif-medium"
		android:background="?android:selectableItemBackground"
		android:background="@drawable/recents_stack_action_background"
		android:visibility="invisible"
		android:forceHasOverlappingRendering="false" />

+0 −9

Original line number	Diff line number	Diff line
		@@ -140,8 +140,6 @@ public class RecentsView extends FrameLayout {

		LayoutInflater inflater = LayoutInflater.from(context);
		if (RecentsDebugFlags.Static.EnableStackActionButton) {
		float cornerRadius = context.getResources().getDimensionPixelSize(
		R.dimen.recents_task_view_rounded_corners_radius);
		mStackActionButton = (TextView) inflater.inflate(R.layout.recents_stack_action_button,
		this, false);
		mStackActionButton.setOnClickListener(new View.OnClickListener() {
		@@ -151,13 +149,6 @@ public class RecentsView extends FrameLayout {
		}
		});
		addView(mStackActionButton);
		mStackActionButton.setClipToOutline(true);
		mStackActionButton.setOutlineProvider(new ViewOutlineProvider() {
		@Override
		public void getOutline(View view, Outline outline) {
		outline.setRoundRect(0, 0, view.getWidth(), view.getHeight(), cornerRadius);
		}
		});
		}
		mEmptyView = (TextView) inflater.inflate(R.layout.recents_empty, this, false);
		addView(mEmptyView);