diff options
3 files changed, 26 insertions, 10 deletions
diff --git a/packages/SystemUI/res/drawable/recents_stack_action_background.xml b/packages/SystemUI/res/drawable/recents_stack_action_background.xml new file mode 100644 index 000000000000..2a40dd0ec613 --- /dev/null +++ b/packages/SystemUI/res/drawable/recents_stack_action_background.xml @@ -0,0 +1,25 @@ +<!-- +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 diff --git a/packages/SystemUI/res/layout/recents_stack_action_button.xml b/packages/SystemUI/res/layout/recents_stack_action_button.xml index 43b3de1a0244..541000b78f8b 100644 --- a/packages/SystemUI/res/layout/recents_stack_action_button.xml +++ b/packages/SystemUI/res/layout/recents_stack_action_button.xml @@ -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" /> diff --git a/packages/SystemUI/src/com/android/systemui/recents/views/RecentsView.java b/packages/SystemUI/src/com/android/systemui/recents/views/RecentsView.java index a8939100f66d..43d0cf6db854 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/views/RecentsView.java +++ b/packages/SystemUI/src/com/android/systemui/recents/views/RecentsView.java @@ -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); |