forked from LawnchairLauncher/lawnchair
-
Notifications
You must be signed in to change notification settings - Fork 13
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'refs/remotes/origin/upstream' into trunk
# Conflicts: # build.gradle
- Loading branch information
Showing
65 changed files
with
2,665 additions
and
1,597 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
119 changes: 119 additions & 0 deletions
119
lawnchair/res/layout/widgets_two_pane_sheet_paged_view.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,119 @@ | ||
| <?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. | ||
| --> | ||
| <merge xmlns:android="http://schemas.android.com/apk/res/android" | ||
| xmlns:launcher="http://schemas.android.com/apk/res-auto"> | ||
|
|
||
| <FrameLayout | ||
| android:id="@+id/widgets_two_pane_sheet_paged_view" | ||
| android:layout_width="match_parent" | ||
| android:layout_height="match_parent" | ||
| android:gravity="start" | ||
| android:paddingHorizontal="@dimen/widget_list_horizontal_margin_two_pane" | ||
| android:layout_gravity="start" | ||
| android:layout_alignParentStart="true"> | ||
| <com.android.launcher3.widget.picker.WidgetPagedView | ||
| android:id="@+id/widgets_view_pager" | ||
| android:layout_width="match_parent" | ||
| android:layout_height="match_parent" | ||
| android:clipToPadding="false" | ||
| android:descendantFocusability="afterDescendants" | ||
| launcher:pageIndicator="@+id/tabs" > | ||
|
|
||
| <com.android.launcher3.widget.picker.WidgetsRecyclerView | ||
| android:id="@+id/primary_widgets_list_view" | ||
| android:layout_width="match_parent" | ||
| android:layout_height="match_parent" | ||
| android:clipToPadding="false" /> | ||
|
|
||
| <com.android.launcher3.widget.picker.WidgetsRecyclerView | ||
| android:id="@+id/work_widgets_list_view" | ||
| android:layout_width="match_parent" | ||
| android:layout_height="match_parent" | ||
| android:clipToPadding="false" /> | ||
|
|
||
| </com.android.launcher3.widget.picker.WidgetPagedView> | ||
|
|
||
| <!-- SearchAndRecommendationsView without the tab layout as well --> | ||
| <com.android.launcher3.views.StickyHeaderLayout | ||
| android:id="@+id/search_and_recommendations_container" | ||
| android:layout_width="match_parent" | ||
| android:layout_height="wrap_content" | ||
| android:clipToOutline="true" | ||
| android:orientation="vertical"> | ||
|
|
||
| <FrameLayout | ||
| android:id="@+id/search_bar_container" | ||
| android:layout_width="match_parent" | ||
| android:layout_height="wrap_content" | ||
| android:background="?attr/widgetPickerPrimarySurfaceColor" | ||
| android:clipToPadding="false" | ||
| android:elevation="0.1dp" | ||
| android:paddingBottom="8dp" | ||
| launcher:layout_sticky="true"> | ||
|
|
||
| <include layout="@layout/widgets_search_bar" /> | ||
| </FrameLayout> | ||
|
|
||
| <LinearLayout | ||
| android:layout_width="match_parent" | ||
| android:layout_height="match_parent" | ||
| android:id="@+id/suggestions_header" | ||
| android:layout_marginTop="8dp" | ||
| android:orientation="horizontal" | ||
| android:background="?attr/widgetPickerPrimarySurfaceColor" | ||
| launcher:layout_sticky="true"> | ||
| </LinearLayout> | ||
|
|
||
| <com.android.launcher3.workprofile.PersonalWorkSlidingTabStrip | ||
| android:id="@+id/tabs" | ||
| android:layout_width="match_parent" | ||
| android:layout_height="64dp" | ||
| android:gravity="center_horizontal" | ||
| android:orientation="horizontal" | ||
| android:paddingVertical="8dp" | ||
| android:background="?attr/widgetPickerPrimarySurfaceColor" | ||
| style="@style/TextHeadline" | ||
| launcher:layout_sticky="true"> | ||
|
|
||
| <Button | ||
| android:id="@+id/tab_personal" | ||
| android:layout_width="0dp" | ||
| android:layout_height="match_parent" | ||
| android:layout_marginEnd="@dimen/widget_tabs_button_horizontal_padding" | ||
| android:layout_marginVertical="@dimen/widget_apps_tabs_vertical_padding" | ||
| android:layout_weight="1" | ||
| android:background="@drawable/widget_picker_tabs_background" | ||
| android:text="@string/widgets_full_sheet_personal_tab" | ||
| android:textColor="@color/widget_picker_tab_text" | ||
| android:textSize="14sp" | ||
| style="?android:attr/borderlessButtonStyle" /> | ||
|
|
||
| <Button | ||
| android:id="@+id/tab_work" | ||
| android:layout_width="0dp" | ||
| android:layout_height="match_parent" | ||
| android:layout_marginEnd="@dimen/widget_tabs_button_horizontal_padding" | ||
| android:layout_marginVertical="@dimen/widget_apps_tabs_vertical_padding" | ||
| android:layout_weight="1" | ||
| android:background="@drawable/widget_picker_tabs_background" | ||
| android:text="@string/widgets_full_sheet_work_tab" | ||
| android:textColor="@color/widget_picker_tab_text" | ||
| android:textSize="14sp" | ||
| style="?android:attr/borderlessButtonStyle" /> | ||
|
|
||
| </com.android.launcher3.workprofile.PersonalWorkSlidingTabStrip> | ||
| </com.android.launcher3.views.StickyHeaderLayout> | ||
| </FrameLayout> | ||
| </merge> |
68 changes: 68 additions & 0 deletions
68
lawnchair/res/layout/widgets_two_pane_sheet_recyclerview.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,68 @@ | ||
| <?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. | ||
| --> | ||
| <merge xmlns:android="http://schemas.android.com/apk/res/android" | ||
| xmlns:launcher="http://schemas.android.com/apk/res-auto"> | ||
|
|
||
| <FrameLayout | ||
| android:id="@+id/widgets_two_pane_sheet_recyclerview" | ||
| android:layout_width="match_parent" | ||
| android:layout_height="match_parent" | ||
| android:gravity="start" | ||
| android:layout_gravity="start" | ||
| android:layout_alignParentStart="true"> | ||
|
|
||
| <com.android.launcher3.widget.picker.WidgetsRecyclerView | ||
| android:id="@+id/primary_widgets_list_view" | ||
| android:layout_width="match_parent" | ||
| android:layout_height="match_parent" | ||
| android:layout_marginHorizontal="@dimen/widget_list_horizontal_margin_two_pane" | ||
| android:clipToPadding="false" /> | ||
|
|
||
| <!-- SearchAndRecommendationsView without the tab layout as well --> | ||
| <com.android.launcher3.views.StickyHeaderLayout | ||
| android:id="@+id/search_and_recommendations_container" | ||
| android:layout_width="match_parent" | ||
| android:layout_height="wrap_content" | ||
| android:clipToOutline="true" | ||
| android:orientation="vertical"> | ||
|
|
||
| <FrameLayout | ||
| android:id="@+id/search_bar_container" | ||
| android:layout_width="match_parent" | ||
| android:layout_height="wrap_content" | ||
| android:background="?attr/widgetPickerPrimarySurfaceColor" | ||
| android:clipToPadding="false" | ||
| android:elevation="0.1dp" | ||
| android:paddingBottom="8dp" | ||
| android:paddingHorizontal="@dimen/widget_list_horizontal_margin_two_pane" | ||
| launcher:layout_sticky="true"> | ||
|
|
||
| <include layout="@layout/widgets_search_bar" /> | ||
| </FrameLayout> | ||
|
|
||
| <LinearLayout | ||
| android:layout_width="match_parent" | ||
| android:layout_height="match_parent" | ||
| android:id="@+id/suggestions_header" | ||
| android:layout_marginTop="8dp" | ||
| android:layout_marginHorizontal="@dimen/widget_list_horizontal_margin_two_pane" | ||
| android:paddingBottom="16dp" | ||
| android:orientation="horizontal" | ||
| android:background="?attr/widgetPickerPrimarySurfaceColor" | ||
| launcher:layout_sticky="true"> | ||
| </LinearLayout> | ||
| </com.android.launcher3.views.StickyHeaderLayout> | ||
| </FrameLayout> | ||
| </merge> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <!-- Copyright (C) 2008 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.CellLayout | ||
| xmlns:android="http://schemas.android.com/apk/res/android" | ||
| xmlns:launcher="http://schemas.android.com/apk/res-auto" | ||
| android:layout_width="wrap_content" | ||
| android:layout_height="wrap_content" | ||
| android:hapticFeedbackEnabled="false" | ||
| launcher:containerType="workspace" /> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| <?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.MultipageCellLayout | ||
| xmlns:android="http://schemas.android.com/apk/res/android" | ||
| xmlns:launcher="http://schemas.android.com/apk/res-auto" | ||
| android:layout_width="wrap_content" | ||
| android:layout_height="wrap_content" | ||
| android:hapticFeedbackEnabled="false" | ||
| launcher:containerType="workspace" /> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.