diff options
Diffstat (limited to 'quickstep/res')
| -rw-r--r-- | quickstep/res/drawable/task_thumbnail_background.xml | 18 | ||||
| -rw-r--r-- | quickstep/res/layout/task.xml | 18 | ||||
| -rw-r--r-- | quickstep/res/values/dimens.xml | 3 |
3 files changed, 10 insertions, 29 deletions
diff --git a/quickstep/res/drawable/task_thumbnail_background.xml b/quickstep/res/drawable/task_thumbnail_background.xml deleted file mode 100644 index f1f48ac11..000000000 --- a/quickstep/res/drawable/task_thumbnail_background.xml +++ /dev/null @@ -1,18 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2017 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. ---> -<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle"> - <corners android:radius="2dp" /> -</shape> diff --git a/quickstep/res/layout/task.xml b/quickstep/res/layout/task.xml index 839d93429..91b6aa336 100644 --- a/quickstep/res/layout/task.xml +++ b/quickstep/res/layout/task.xml @@ -1,5 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- +<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2017 The Android Open Source Project Licensed under the Apache License, Version 2.0 (the "License"); @@ -14,23 +13,20 @@ See the License for the specific language governing permissions and limitations under the License. --> -<com.android.quickstep.TaskView - xmlns:android="http://schemas.android.com/apk/res/android" +<com.android.quickstep.TaskView xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" - android:layout_height="match_parent"> + android:layout_height="match_parent" + android:elevation="4dp"> <com.android.quickstep.TaskThumbnailView android:id="@+id/snapshot" android:layout_width="match_parent" android:layout_height="match_parent" - android:layout_marginTop="@dimen/task_thumbnail_top_margin" - android:scaleType="matrix" - android:background="@drawable/task_thumbnail_background" - android:elevation="4dp" /> + android:layout_marginTop="@dimen/task_thumbnail_top_margin" /> + <ImageView android:id="@+id/icon" android:layout_width="@dimen/task_thumbnail_icon_size" android:layout_height="@dimen/task_thumbnail_icon_size" - android:layout_gravity="top|center_horizontal" - android:elevation="5dp"/> + android:layout_gravity="top|center_horizontal" /> </com.android.quickstep.TaskView>
\ No newline at end of file diff --git a/quickstep/res/values/dimens.xml b/quickstep/res/values/dimens.xml index 222a3f477..076f0a3c1 100644 --- a/quickstep/res/values/dimens.xml +++ b/quickstep/res/values/dimens.xml @@ -19,6 +19,9 @@ <dimen name="task_thumbnail_top_margin">24dp</dimen> <dimen name="task_thumbnail_icon_size">48dp</dimen> <dimen name="task_menu_background_radius">12dp</dimen> + <dimen name="task_corner_radius">2dp</dimen> + <dimen name="task_fade_length">20dp</dimen> + <dimen name="quickstep_fling_threshold_velocity">500dp</dimen> <dimen name="quickstep_fling_min_velocity">250dp</dimen> |