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

Commit 35a4ae02 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Updating the UI for Add-to-homescreen dialog" into ub-launcher3-dorval-polish

parents 037fd6d9 8b4342c9
Loading
Loading
Loading
Loading
+50 −34
Original line number Original line Diff line number Diff line
@@ -17,57 +17,73 @@
*/
*/
-->
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
    android:orientation="vertical"
    android:layout_width="match_parent"
    android:layout_width="match_parent"
    android:layout_height="match_parent">
    android:layout_height="match_parent"
    android:orientation="vertical">
    <ScrollView
        android:layout_width="match_parent"
        android:layout_height="0dp"
        android:layout_weight="1"
        android:clipToPadding="false">

        <LinearLayout
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:orientation="vertical">


            <TextView
            <TextView
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
                android:paddingBottom="20dp"
                android:paddingLeft="24dp"
                android:paddingLeft="24dp"
                android:paddingRight="24dp"
                android:paddingRight="24dp"
                android:paddingTop="4dp"
                android:paddingTop="4dp"
        android:paddingBottom="20dp"
                android:text="@string/add_item_request_drag_hint" />
        android:text="@string/add_item_request_drag_hint"
        android:layout_width="match_parent"
        android:layout_height="wrap_content" />


            <FrameLayout
            <FrameLayout
        android:theme="@style/WidgetContainerTheme"
                android:layout_width="match_parent"
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
                android:background="?android:attr/colorPrimaryDark"
                android:background="?android:attr/colorPrimaryDark"
        android:layout_height="wrap_content">
                android:theme="@style/WidgetContainerTheme">


                <com.android.launcher3.dragndrop.LivePreviewWidgetCell
                <com.android.launcher3.dragndrop.LivePreviewWidgetCell
                    android:id="@+id/widget_cell"
                    android:layout_width="wrap_content"
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
                    android:layout_height="wrap_content"
                    android:layout_gravity="center_horizontal"
                    android:layout_weight="1"
                    android:layout_weight="1"
            android:orientation="vertical"
            android:focusable="true"
                    android:background="?android:attr/colorPrimaryDark"
                    android:background="?android:attr/colorPrimaryDark"
                    android:focusable="true"
                    android:gravity="center_horizontal"
                    android:gravity="center_horizontal"
            android:id="@+id/widget_cell"
                    android:orientation="vertical" >
            android:layout_gravity="center_horizontal" >


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


                </com.android.launcher3.dragndrop.LivePreviewWidgetCell>
                </com.android.launcher3.dragndrop.LivePreviewWidgetCell>
            </FrameLayout>
            </FrameLayout>
        </LinearLayout>
    </ScrollView>


    <LinearLayout
    <LinearLayout
        style="?android:attr/buttonBarStyle"
        android:layout_width="match_parent"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:layout_height="wrap_content"
        style="?android:attr/buttonBarStyle"
        android:gravity="end"
        android:gravity="end" >
        android:paddingBottom="4dp"
        android:paddingEnd="12dp"
        android:paddingStart="12dp"
        android:paddingTop="4dp" >
        <Button
        <Button
            style="?android:attr/buttonBarButtonStyle"
            android:layout_width="wrap_content"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:layout_height="wrap_content"
            android:text="@android:string/cancel"
            android:onClick="onCancelClick"
            android:onClick="onCancelClick"
            style="?android:attr/buttonBarButtonStyle" />
            android:text="@android:string/cancel" />
        <Button
        <Button
            style="?android:attr/buttonBarButtonStyle"
            android:layout_width="wrap_content"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:layout_height="wrap_content"
            android:text="@string/place_automatically"
            android:onClick="onPlaceAutomaticallyClick"
            android:onClick="onPlaceAutomaticallyClick"
            style="?android:attr/buttonBarButtonStyle" />
            android:text="@string/place_automatically" />
    </LinearLayout>
    </LinearLayout>
</LinearLayout>
</LinearLayout>