mirror of
https://github.com/LawnchairLauncher/lawnchair.git
synced 2026-02-20 11:18:21 +00:00
c06c7ff6fa
This is an initial change that positions the bubble bar aligning it with the center of the hotseat icons. We still need to center it with the taskbar when in overview. This change also fixes the touch issues where sometimes the hotseat icons don't respond to taps. The fix is twofold: 1. Make sure that taskbar insets are always updated when BubbleStashController#setBubblesShowingOnHome is called. 2. Update the touchable region in TaskbarInsetsController to account for the Y translation of the bubble bar bounds when the bubble bar is visible. Demo: https://screenshot.googleplex.com/6NRyu2CR7Bjs32x Bug: 286247080 Test: Manual on a physical device Change-Id: I00daff8341e4d8f5d141b5e0220726f6c03b437c
106 lines
4.4 KiB
XML
106 lines
4.4 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"
|
|
android:layout_gravity="bottom|end"
|
|
android:layout_marginEnd="@dimen/transient_taskbar_bottom_margin"
|
|
android:paddingEnd="@dimen/taskbar_icon_spacing"
|
|
android:paddingStart="@dimen/taskbar_icon_spacing"
|
|
android:visibility="gone"
|
|
android:gravity="center"
|
|
android:clipChildren="false"
|
|
/>
|
|
|
|
<FrameLayout
|
|
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"/>
|
|
</FrameLayout>
|
|
|
|
<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> |