mirror of
https://github.com/LawnchairLauncher/lawnchair.git
synced 2026-02-19 02:38:20 +00:00
484ff0fe9c
Integrated the PersistentTaskbarStashController and the TransientTaskbarStashController into the launcher code. Made changes to the TaskbarInsetsController to set appropriate touchable zones. Updated the TaskbarUIController to not start the overview transition on clicks for the collapsed bubble bar. Bug: 346391377 Fixes: 350065038 Fixes: 355664783 Flag: com.android.wm.shell.enable_bubble_bar_in_persistent_task_bar Test: com.android.launcher3.taskbar package tests persistent taskbar and transient taskbar manual testing: - on launcher home screen expand bubble bar, switch between bubbles, remove bubble via bubble menu, add bubble, remove bubble with the drug gesture, add bubble, collapse bubble bar - repeat previous test on launcher overview screen and inside any application - after last test drag expanded bubble view to the opposite side of the screen Change-Id: I50f2c510854c4895fdfc9bd453a261c2103286fd
88 lines
3.6 KiB
XML
88 lines
3.6 KiB
XML
<?xml version="1.0" encoding="utf-8"?>
|
|
<!-- Copyright (C) 2021 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:forceHasOverlappingRendering="false"
|
|
android:layout_gravity="bottom"
|
|
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_marginHorizontal="@dimen/transient_taskbar_bottom_margin"
|
|
android:paddingTop="@dimen/bubblebar_pointer_visible_size"
|
|
android:visibility="gone"
|
|
android:gravity="center"
|
|
android:layout_gravity="bottom"
|
|
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: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: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="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:background="@color/taskbar_stashed_handle_dark_color"
|
|
android:clipToOutline="true"
|
|
android:layout_gravity="bottom"/>
|
|
|
|
</com.android.launcher3.taskbar.TaskbarDragLayer> |