Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge \\"Use a round rect background drawable for \\"clear all\\"\\" into nyc-mr1-dev am: b8292a6401

Browse Source 
am: 3deaaf5f3f

Change-Id: I7650d235ba9b9f80f5b04943df19ed2ed42e3b1c
This commit is contained in:
Tenghui Zhu
2016-07-19 23:09:54 +00:00
committed by android-build-merger
parent 232ac757fb 3deaaf5f3f
commit da2332276a
3 changed files with 26 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
packages/SystemUI/res/drawable/recents_stack_action_background.xml Normal file
View File

@@ -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>

2
packages/SystemUI/res/layout/recents_stack_action_button.xml
View File

@@ -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" />

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

@@ -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);