mirror of
https://github.com/LawnchairLauncher/lawnchair.git
synced 2026-02-19 18:58:19 +00:00
4186cf1b96
Bubble bar pointer arrow was being drawn outside of BubbleBarView bounds. This caused issues when alpha was applied to the BubbleBarView. With alpha, BubbleBarView draw was clipped to its bounds and arrow was no longer visible. This led to the arrow flickering during move animations. Move animation updates alpha. Move the pointer arrow inside the bounds of the bar view. Update the bar height to include the arrow. Update callers who rely on bubble bar content height to take into account extra height for the arrow. Bug: 313661121 Flag: ACONFIG com.android.wm.shell.enable_bubble_bar DEVELOPMENT Test: move bubble bar left and right, observe arrow is visible Change-Id: I05866b5c944361b2f10437c3641527ed3c594047
108 lines
4.6 KiB
XML
108 lines
4.6 KiB
XML
<?xml version="1.0" encoding="utf-8"?>
|
|
<!-- Copyright (C) 2022 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.TaskbarDragLayer
|
|
xmlns:android="http://schemas.android.com/apk/res/android"
|
|
xmlns:tools="http://schemas.android.com/tools"
|
|
android:id="@+id/taskbar_container"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:clipChildren="false">
|
|
|
|
<com.android.launcher3.taskbar.TaskbarView
|
|
android:id="@+id/taskbar_view"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:gravity="center"
|
|
android:focusable="true"
|
|
android:importantForAccessibility="yes"
|
|
android:forceHasOverlappingRendering="false"
|
|
android:layout_gravity="bottom"
|
|
android:layout_marginBottom="@dimen/transient_taskbar_bottom_margin"
|
|
android:clipChildren="false" />
|
|
|
|
<com.android.launcher3.taskbar.TaskbarScrimView
|
|
android:id="@+id/taskbar_scrim"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="match_parent"/>
|
|
|
|
<com.android.launcher3.taskbar.bubbles.BubbleBarView
|
|
android:id="@+id/taskbar_bubbles"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="@dimen/bubblebar_size_with_pointer"
|
|
android:layout_gravity="bottom|end"
|
|
android:layout_marginHorizontal="@dimen/transient_taskbar_bottom_margin"
|
|
android:paddingTop="@dimen/bubblebar_pointer_size"
|
|
android:paddingEnd="@dimen/taskbar_icon_spacing"
|
|
android:paddingStart="@dimen/taskbar_icon_spacing"
|
|
android:visibility="gone"
|
|
android:gravity="center"
|
|
android:clipChildren="false"
|
|
android:elevation="@dimen/bubblebar_elevation"
|
|
/>
|
|
|
|
<com.android.launcher3.taskbar.navbutton.NearestTouchFrame
|
|
android:id="@+id/navbuttons_view"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:layout_gravity="bottom" >
|
|
|
|
<FrameLayout
|
|
android:id="@+id/start_contextual_buttons"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="match_parent"
|
|
android:paddingStart="@dimen/taskbar_contextual_button_padding"
|
|
android:paddingEnd="@dimen/taskbar_contextual_button_padding"
|
|
android:paddingTop="@dimen/taskbar_contextual_padding_top"
|
|
android:gravity="center_vertical"
|
|
android:layout_gravity="start"/>
|
|
|
|
<LinearLayout
|
|
android:id="@+id/end_nav_buttons"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="match_parent"
|
|
android:orientation="horizontal"
|
|
android:gravity="center_vertical"
|
|
android:layout_gravity="end"/>
|
|
|
|
<FrameLayout
|
|
android:id="@+id/end_contextual_buttons"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="match_parent"
|
|
android:paddingTop="@dimen/taskbar_contextual_padding_top"
|
|
android:gravity="center_vertical"
|
|
android:layout_gravity="end"/>
|
|
</com.android.launcher3.taskbar.navbutton.NearestTouchFrame>
|
|
|
|
<com.android.launcher3.taskbar.StashedHandleView
|
|
android:id="@+id/stashed_handle"
|
|
tools:comment1="The actual size and shape will be set as a ViewOutlineProvider at runtime"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:background="@color/taskbar_stashed_handle_dark_color"
|
|
android:clipToOutline="true"
|
|
android:layout_gravity="bottom"/>
|
|
|
|
<com.android.launcher3.taskbar.StashedHandleView
|
|
android:id="@+id/stashed_bubble_handle"
|
|
tools:comment1="The actual size and shape will be set as a ViewOutlineProvider at runtime"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:visibility="gone"
|
|
android:background="@color/taskbar_stashed_handle_dark_color"
|
|
android:clipToOutline="true"
|
|
android:layout_gravity="bottom"/>
|
|
|
|
</com.android.launcher3.taskbar.TaskbarDragLayer> |