Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e4c0e954 authored by Steven Ng's avatar Steven Ng
Browse files

Exact common layout from widgets bottom sheet 

Test: open widgets bottom sheet and drag and drop widgets & shortcuts.

Bug: 182305634
Change-Id: I82e3e584edf64177ffa6e677f5b3f487823d3e1b
parent f3814eea

res/layout/widgets_bottom_sheet.xml

+1 −35
Original line number Diff line number Diff line
@@ -24,41 +24,7 @@ 
    android:elevation="@dimen/deep_shortcuts_elevation"

    android:layout_gravity="bottom"

    android:theme="?attr/widgetsTheme">

    <View

        android:layout_width="48dp"

        android:layout_height="2dp"

        android:layout_gravity="center_horizontal"

        android:layout_marginBottom="16dp"

        android:background="?android:attr/textColorSecondary"/>

    <TextView

        style="@style/TextHeadline"

        android:id="@+id/title"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:gravity="center_horizontal"

        android:textColor="?android:attr/textColorPrimary"

        android:textSize="24sp"/>



    <TextView

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:gravity="center_horizontal"

        android:paddingTop="4dp"

        android:fontFamily="sans-serif"

        android:textColor="?android:attr/textColorTertiary"

        android:textSize="14sp"

        android:text="@string/long_press_widget_to_add"/>



    <ScrollView

        android:id="@+id/widgets_table_scroll_view"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:fadeScrollbars="false"

        android:layout_marginVertical="16dp">

        <include layout="@layout/widgets_table_container"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_gravity="center_horizontal" />

    </ScrollView>

    <include layout="@layout/widgets_bottom_sheet_content" />



</com.android.launcher3.widget.WidgetsBottomSheet>
 
 No newline at end of file

res/layout/widgets_bottom_sheet_content.xml

0 → 100644
+53 −0
Original line number Diff line number Diff line 
<?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">

    <View

        android:layout_width="48dp"

        android:layout_height="2dp"

        android:layout_gravity="center_horizontal"

        android:layout_marginBottom="16dp"

        android:background="?android:attr/textColorSecondary"/>

    <TextView

        style="@style/TextHeadline"

        android:id="@+id/title"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:gravity="center_horizontal"

        android:textColor="?android:attr/textColorPrimary"

        android:textSize="24sp"/>



    <TextView

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:gravity="center_horizontal"

        android:paddingTop="4dp"

        android:fontFamily="sans-serif"

        android:textColor="?android:attr/textColorTertiary"

        android:textSize="14sp"

        android:text="@string/long_press_widget_to_add"/>



    <ScrollView

        android:id="@+id/widgets_table_scroll_view"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:fadeScrollbars="false"

        android:layout_marginVertical="16dp">

        <include layout="@layout/widgets_table_container"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_gravity="center_horizontal" />

    </ScrollView>

</merge>