mirror of
https://github.com/LawnchairLauncher/lawnchair.git
synced 2026-02-19 18:58:19 +00:00
94db320a84
Updates border color to have more contrast to the background, and adds 2dp padding between the border and the task content view - done by updating BorderAnimator not to assume the border width and stroke are the same. Adding padding between the border and task view content exopsed an issue where the second thumbnail in a split task's borders were not clipped correctly when adding a border (it looked like the clip rect was not properly scaled down). This is addressed by moving the tack view background (and the outline) from the root KeyboardQuickSwitchTaskViews to the content views (i.e. moving the outline to the view that does not get scaled when adding a border, and having the second thumbnail end edge of the clip rectangle match the clip rectangle of the clipped ancestor view). Bug: 398770098 Test: Manual Flag: EXEMPT (a11y) bug fix Change-Id: Ie058c932411a6b47815b0abf756f739c55b8342f
91 lines
4.0 KiB
XML
91 lines
4.0 KiB
XML
<?xml version="1.0" encoding="utf-8"?>
|
|
<!-- Copyright (C) 2023 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.
|
|
-->
|
|
<com.android.launcher3.taskbar.KeyboardQuickSwitchTaskView
|
|
xmlns:android="http://schemas.android.com/apk/res/android"
|
|
xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
|
|
xmlns:app="http://schemas.android.com/apk/res-auto"
|
|
xmlns:launcher="http://schemas.android.com/apk/res-auto"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:importantForAccessibility="yes"
|
|
launcher:focusBorderColor="@color/materialColorSecondary">
|
|
|
|
<androidx.constraintlayout.widget.ConstraintLayout
|
|
android:id="@+id/content"
|
|
android:layout_width="0dp"
|
|
android:layout_height="@dimen/keyboard_quick_switch_taskview_height"
|
|
android:background="@drawable/keyboard_quick_switch_task_view_background"
|
|
android:clipToOutline="true"
|
|
|
|
app:layout_constraintDimensionRatio="1:1"
|
|
app:layout_constraintTop_toTopOf="parent"
|
|
app:layout_constraintBottom_toBottomOf="parent"
|
|
app:layout_constraintStart_toStartOf="parent"
|
|
app:layout_constraintEnd_toEndOf="parent">
|
|
|
|
<include
|
|
layout="@layout/keyboard_quick_switch_taskview_thumbnail"
|
|
android:id="@+id/thumbnail_1"
|
|
android:layout_width="0dp"
|
|
android:layout_height="match_parent"
|
|
|
|
app:layout_constraintTop_toTopOf="parent"
|
|
app:layout_constraintBottom_toBottomOf="parent"
|
|
app:layout_constraintStart_toStartOf="parent"
|
|
app:layout_constraintEnd_toStartOf="@id/thumbnail_2"/>
|
|
|
|
<include
|
|
layout="@layout/keyboard_quick_switch_taskview_thumbnail"
|
|
android:id="@+id/thumbnail_2"
|
|
android:layout_width="0dp"
|
|
android:layout_height="match_parent"
|
|
android:visibility="gone"
|
|
android:layout_marginStart="@dimen/keyboard_quick_switch_view_small_spacing"
|
|
|
|
app:layout_constraintTop_toTopOf="parent"
|
|
app:layout_constraintBottom_toBottomOf="parent"
|
|
app:layout_constraintStart_toEndOf="@id/thumbnail_1"
|
|
app:layout_constraintEnd_toEndOf="parent"/>
|
|
|
|
<ImageView
|
|
android:id="@+id/icon_1"
|
|
android:layout_width="@dimen/keyboard_quick_switch_taskview_icon_size"
|
|
android:layout_height="@dimen/keyboard_quick_switch_taskview_icon_size"
|
|
android:importantForAccessibility="no"
|
|
android:scaleType="centerCrop"
|
|
|
|
app:layout_constraintTop_toTopOf="@id/thumbnail_1"
|
|
app:layout_constraintBottom_toBottomOf="@id/thumbnail_1"
|
|
app:layout_constraintStart_toStartOf="@id/thumbnail_1"
|
|
app:layout_constraintEnd_toEndOf="@id/thumbnail_1"/>
|
|
|
|
<ImageView
|
|
android:id="@+id/icon_2"
|
|
android:layout_width="@dimen/keyboard_quick_switch_taskview_icon_size"
|
|
android:layout_height="@dimen/keyboard_quick_switch_taskview_icon_size"
|
|
android:importantForAccessibility="no"
|
|
android:visibility="gone"
|
|
android:scaleType="centerCrop"
|
|
|
|
app:layout_constraintTop_toTopOf="@id/thumbnail_2"
|
|
app:layout_constraintBottom_toBottomOf="@id/thumbnail_2"
|
|
app:layout_constraintStart_toStartOf="@id/thumbnail_2"
|
|
app:layout_constraintEnd_toEndOf="@id/thumbnail_2"/>
|
|
|
|
</androidx.constraintlayout.widget.ConstraintLayout>
|
|
|
|
</com.android.launcher3.taskbar.KeyboardQuickSwitchTaskView>
|