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

Commit b5459c9b authored by Alina Zaidi's avatar Alina Zaidi Committed by Android (Google) Code Review
Browse files

Merge "Update bottom widget picker and pin widget dialog layout in landscape mode." into sc-dev

parents 4d61c562 dfa6aa82

res/layout/add_item_confirmation_activity.xml

+62 −59
Original line number Diff line number Diff line
@@ -26,23 +26,27 @@ 
    android:importantForAccessibility="no">



    <com.android.launcher3.widget.AddItemWidgetsBottomSheet

        xmlns:android="http://schemas.android.com/apk/res/android"

        android:id="@+id/add_item_bottom_sheet"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:background="@drawable/add_item_dialog_background"

        android:paddingTop="24dp"

        android:theme="?attr/widgetsTheme"

        android:layout_gravity="bottom"

        android:orientation="vertical">



        <LinearLayout

            android:id="@+id/add_item_bottom_sheet_content"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:padding="24dp"

            android:background="@drawable/add_item_dialog_background"

            android:orientation="vertical" >



            <TextView

                style="@style/TextHeadline"

                android:id="@+id/widget_appName"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:gravity="center_horizontal"

            android:paddingHorizontal="24dp"

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

                android:textSize="24sp"

                android:ellipsize="end"
@@ -54,7 +58,6 @@ 
                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:gravity="center_horizontal"

            android:paddingHorizontal="24dp"

                android:paddingTop="8dp"

                android:text="@string/add_item_request_drag_hint"

                android:textSize="14sp"
@@ -73,7 +76,6 @@ 
                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:gravity="center_vertical|end"

            android:paddingHorizontal="24dp"

                android:paddingVertical="8dp"

                android:orientation="horizontal">

                <Button
@@ -100,6 +102,7 @@ 
                    android:text="@string/add_to_home_screen"

                    android:onClick="onPlaceAutomaticallyClick"/>

            </LinearLayout>

        </LinearLayout>

    </com.android.launcher3.widget.AddItemWidgetsBottomSheet>



</com.android.launcher3.dragndrop.AddItemDragLayer>

res/layout/widgets_bottom_sheet.xml

+0 −2
Original line number Diff line number Diff line
@@ -19,8 +19,6 @@ 
    android:orientation="vertical"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:paddingTop="16dp"

    android:background="@drawable/widgets_bottom_sheet_background"

    android:layout_gravity="bottom"

    android:theme="?attr/widgetsTheme">

res/layout/widgets_bottom_sheet_content.xml

+31 −23
Original line number Diff line number Diff line
@@ -14,6 +14,13 @@ 
     limitations under the License.

-->

<merge xmlns:android="http://schemas.android.com/apk/res/android">

    <LinearLayout

        android:id="@+id/widgets_bottom_sheet"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:background="@drawable/widgets_bottom_sheet_background"

        android:paddingTop="16dp"

        android:orientation="vertical">

        <View

            android:id="@+id/collapse_handle"

            android:layout_width="48dp"
@@ -42,4 +49,5 @@ 
                android:layout_height="wrap_content"

                android:layout_gravity="center_horizontal" />

        </ScrollView>

    </LinearLayout>

</merge>

res/values-night/styles.xml

+1 −0
Original line number Diff line number Diff line
@@ -20,5 +20,6 @@ 
<resources>

    <style name="AddItemActivityTheme" parent="@android:style/Theme.Translucent.NoTitleBar">

        <item name="widgetsTheme">@style/WidgetContainerTheme.Dark</item>

        <item name="android:windowTranslucentStatus">true</item>

    </style>

</resources>

res/values/styles.xml

+1 −0
Original line number Diff line number Diff line
@@ -316,5 +316,6 @@ 
    <style name="AddItemActivityTheme" parent="@android:style/Theme.Translucent.NoTitleBar">

        <item name="widgetsTheme">@style/WidgetContainerTheme</item>

        <item name="android:windowLightStatusBar">true</item>

        <item name="android:windowTranslucentStatus">true</item>

    </style>

</resources>