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

Commit 6d97d893 authored by Alina Zaidi's avatar Alina Zaidi
Browse files

Update Pin widget dialog UI according to mocks. 

Test: Tested manually and RequestPinItemTest passed
Bug: 182982143
Bug: 182994819
Bug: 182929673
Change-Id: I905ea0c1860d28ee9fbb456ddf6abd728b65bac4
parent b4002575

AndroidManifest-common.xml

+1 −2
Original line number Diff line number Diff line
@@ -116,8 +116,7 @@ 
            android:theme="@style/AppItemActivityTheme"

            android:excludeFromRecents="true"

            android:autoRemoveFromRecents="true"

            android:exported="true"

            android:label="@string/action_add_to_workspace" >

            android:exported="true">

            <intent-filter>

                <action android:name="android.content.pm.action.CONFIRM_PIN_SHORTCUT" />

                <action android:name="android.content.pm.action.CONFIRM_PIN_APPWIDGET" />

res/drawable/add_item_dialog_background.xml

0 → 100644
+8 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

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

    android:shape="rectangle" >

    <solid android:color="?android:attr/colorBackground" />

    <corners

        android:topLeftRadius="?android:attr/dialogCornerRadius"

        android:topRightRadius="?android:attr/dialogCornerRadius" />

</shape>
 
 No newline at end of file

res/drawable/add_item_dialog_button_background.xml

0 → 100644
+22 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<inset

    android:insetLeft="@dimen/pin_widget_button_inset_horizontal"

    android:insetRight="@dimen/pin_widget_button_inset_horizontal"

    android:insetTop="@dimen/pin_widget_button_inset_vertical"

    android:insetBottom="@dimen/pin_widget_button_inset_vertical"

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

    <ripple

        android:color="?android:attr/colorControlHighlight">

        <item>

            <shape android:tint="?android:attr/colorAccent" android:shape="rectangle">

                <corners android:radius="18dp" />

                <solid android:color="#FFFFFF"  />

                <padding

                    android:left="@dimen/pin_widget_button_padding_horizontal"

                    android:top="@dimen/pin_widget_button_padding_vertical"

                    android:right="@dimen/pin_widget_button_padding_horizontal"

                    android:bottom="@dimen/pin_widget_button_padding_vertical" />

            </shape>

        </item>

    </ripple>

</inset>
 
 No newline at end of file

res/layout/add_item_confirmation_activity.xml

+28 −47
Original line number Diff line number Diff line
@@ -17,70 +17,51 @@ 
*/

-->

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

    android:id="@+id/add_item_confirmation"

    android:layout_width="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:padding="24dp"

    android:orientation="vertical">



    <TextView

        style="@style/TextHeadline"

        android:id="@+id/widget_appName"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

                android:paddingBottom="20dp"

                android:paddingLeft="24dp"

                android:paddingRight="24dp"

                android:paddingTop="4dp"

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



            <FrameLayout

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:background="?android:attr/colorPrimaryDark"

                android:theme="?attr/widgetsTheme">

        android:gravity="center_horizontal"

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

        android:textSize="24sp"

        android:ellipsize="end"

        android:fadingEdge="horizontal"

        android:singleLine="true"

        android:maxLines="1" />



                <com.android.launcher3.widget.WidgetCell

    <include layout="@layout/widget_cell"

        android:id="@+id/widget_cell"

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

                    android:layout_gravity="center_horizontal"

        android:layout_width="match_parent"

        android:layout_height="0dp"

        android:layout_weight="1"

                    android:background="?android:attr/colorPrimaryDark"

                    android:focusable="true"

                    android:gravity="center_horizontal"

                    android:orientation="vertical" >



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



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

            </FrameLayout>

        </LinearLayout>

    </ScrollView>

        android:layout_marginVertical="16dp" />



    <LinearLayout

        style="?android:attr/buttonBarStyle"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:gravity="end"

        android:paddingBottom="4dp"

        android:paddingEnd="12dp"

        android:paddingStart="12dp"

        android:paddingTop="4dp" >

        android:padding="8dp"

        android:orientation="horizontal">

        <Button

            style="?android:attr/buttonBarButtonStyle"

            style="@style/Widget.DeviceDefault.Button.Rounded.Colored"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:onClick="onCancelClick"

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



        <Space

            android:layout_width="4dp"

            android:layout_height="wrap_content" />



        <Button

            style="?android:attr/buttonBarButtonStyle"

            style="@style/Widget.DeviceDefault.Button.Rounded.Colored"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:onClick="onPlaceAutomaticallyClick"

res/layout/widget_cell_content.xml

+8 −8
Original line number Diff line number Diff line
@@ -18,8 +18,8 @@ 
    android:layout_height="wrap_content">



    <!-- The image of the widget. This view does not support padding. Any placement adjustment

         should be done using margins.

          width & height are set at runtime after scaling the preview image. -->

         should be done using margins. Width & height are set at runtime after scaling the preview

         image. -->

    <com.android.launcher3.widget.WidgetImageView

        android:id="@+id/widget_preview"

        android:layout_width="0dp"
@@ -41,16 +41,15 @@ 
        android:textColor="?android:attr/textColorPrimary"

        android:textSize="@dimen/widget_cell_font_size" />



    <!-- The original dimensions of the widget (can't be the same text as above due to different

         style. -->

    <!-- The original dimensions of the widget -->

    <TextView

        android:id="@+id/widget_dims"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:gravity="center_horizontal"

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

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

        android:textSize="@dimen/widget_cell_font_size"

        android:alpha="0.8" />

        android:alpha="0.7" />



    <TextView

        android:id="@+id/widget_description"
@@ -58,9 +57,10 @@ 
        android:layout_height="wrap_content"

        android:gravity="center_horizontal"

        android:textSize="@dimen/widget_cell_font_size"

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

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

        android:maxLines="2"

        android:ellipsize="end"

        android:fadingEdge="horizontal" />

        android:fadingEdge="horizontal"

        android:alpha="0.7" />



</merge>
 
 No newline at end of file