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

Commit 968c868b authored by TYM Tsai's avatar TYM Tsai
Browse files

Adjust fill dialog UI 

1. Make rounded corners on the Fill dialog.
2. Fixed the position of the secondary button in the fill dialog
   and save UI.
3. Change the text of the secondary button in the fill dialog
   to "No thinks".
4. Reduce the size of the icon in the fill dialog.
5. Darken the outside of the fill dialog.

Bug: 213136422
Test: Manual
Change-Id: Ieecaa6b777ffd0600b88b29a18c1c48b1394a431
parent 038fd80c

core/res/res/layout/autofill_fill_dialog.xml

+5 −12
Original line number Original line Diff line number Diff line
@@ -22,8 +22,7 @@ 
    android:layout_height="wrap_content"

    android:layout_height="wrap_content"

    android:layout_marginTop="@dimen/autofill_save_outer_top_margin"

    android:layout_marginTop="@dimen/autofill_save_outer_top_margin"

    android:padding="@dimen/autofill_save_outer_top_padding"

    android:padding="@dimen/autofill_save_outer_top_padding"

    android:elevation="@dimen/autofill_elevation"

    android:background="@drawable/bottomsheet_background"

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

    android:orientation="vertical">

    android:orientation="vertical">





    <LinearLayout

    <LinearLayout
@@ -48,9 +47,7 @@ 
            android:gravity="center_horizontal"

            android:gravity="center_horizontal"

            android:paddingStart="@dimen/autofill_save_inner_padding"

            android:paddingStart="@dimen/autofill_save_inner_padding"

            android:paddingEnd="@dimen/autofill_save_inner_padding"

            android:paddingEnd="@dimen/autofill_save_inner_padding"

            android:visibility="gone"

            android:visibility="gone" />

            android:foreground="?attr/listChoiceBackgroundIndicator"

            style="@style/AutofillDatasetPicker" />

    </LinearLayout>

    </LinearLayout>





    <LinearLayout

    <LinearLayout
@@ -61,7 +58,6 @@ 
        android:paddingStart="@dimen/autofill_save_inner_padding"

        android:paddingStart="@dimen/autofill_save_inner_padding"

        android:paddingEnd="@dimen/autofill_save_inner_padding"

        android:paddingEnd="@dimen/autofill_save_inner_padding"

        android:visibility="gone"

        android:visibility="gone"

        android:foreground="?attr/listChoiceBackgroundIndicator"

        style="@style/AutofillDatasetPicker" />

        style="@style/AutofillDatasetPicker" />





    <ListView

    <ListView
@@ -71,15 +67,12 @@ 
        android:layout_height="0dp"

        android:layout_height="0dp"

        android:drawSelectorOnTop="true"

        android:drawSelectorOnTop="true"

        android:clickable="true"

        android:clickable="true"

        android:divider="@null"

        android:divider="?android:attr/listDivider"

        android:visibility="gone"

        android:visibility="gone"

        android:paddingStart="@dimen/autofill_save_inner_padding"

        android:paddingEnd="@dimen/autofill_save_inner_padding"

        android:foreground="?attr/listChoiceBackgroundIndicator"

        style="@style/AutofillDatasetPicker" />

        style="@style/AutofillDatasetPicker" />





    <com.android.internal.widget.ButtonBarLayout

    <com.android.internal.widget.ButtonBarLayout

        android:layout_width="wrap_content"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_height="wrap_content"

        android:layout_gravity="end"

        android:layout_gravity="end"

        android:padding="@dimen/autofill_save_button_bar_padding"

        android:padding="@dimen/autofill_save_button_bar_padding"
@@ -91,7 +84,7 @@ 
            android:layout_width="wrap_content"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_height="wrap_content"

            style="?android:attr/buttonBarButtonStyle"

            style="?android:attr/buttonBarButtonStyle"

            android:text="@string/dismiss_action">

            android:text="@string/autofill_save_no">

        </Button>

        </Button>





        <Space

        <Space

core/res/res/layout/autofill_save.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -72,7 +72,7 @@ 
        </LinearLayout>

        </LinearLayout>





        <com.android.internal.widget.ButtonBarLayout

        <com.android.internal.widget.ButtonBarLayout

            android:layout_width="wrap_content"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_height="wrap_content"

            android:layout_gravity="end"

            android:layout_gravity="end"

            android:padding="@dimen/autofill_save_button_bar_padding"

            android:padding="@dimen/autofill_save_button_bar_padding"

core/res/res/values/dimens.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -878,7 +878,7 @@ 
    <integer name="autofill_max_visible_datasets">3</integer>

    <integer name="autofill_max_visible_datasets">3</integer>





    <!-- Size of an icon in the Autolfill fill dialog -->

    <!-- Size of an icon in the Autolfill fill dialog -->

    <dimen name="autofill_dialog_icon_size">56dp</dimen>

    <dimen name="autofill_dialog_icon_size">24dp</dimen>





    <!-- Size of a slice shortcut view -->

    <!-- Size of a slice shortcut view -->

    <dimen name="slice_shortcut_size">56dp</dimen>

    <dimen name="slice_shortcut_size">56dp</dimen>

services/autofill/java/com/android/server/autofill/ui/DialogFillUi.java

+6 −1
Original line number Original line Diff line number Diff line
@@ -166,7 +166,9 @@ final class DialogFillUi { 
        window.setType(WindowManager.LayoutParams.TYPE_APPLICATION_OVERLAY);

        window.setType(WindowManager.LayoutParams.TYPE_APPLICATION_OVERLAY);

        window.addFlags(WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM

        window.addFlags(WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM

                | WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL

                | WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL

                | WindowManager.LayoutParams.FLAG_WATCH_OUTSIDE_TOUCH);

                | WindowManager.LayoutParams.FLAG_WATCH_OUTSIDE_TOUCH

                | WindowManager.LayoutParams.FLAG_DIM_BEHIND);

        window.setDimAmount(0.6f);

        window.addPrivateFlags(WindowManager.LayoutParams.SYSTEM_FLAG_SHOW_FOR_ALL_USERS);

        window.addPrivateFlags(WindowManager.LayoutParams.SYSTEM_FLAG_SHOW_FOR_ALL_USERS);

        window.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_PAN);

        window.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_PAN);

        window.setGravity(Gravity.BOTTOM | Gravity.CENTER);

        window.setGravity(Gravity.BOTTOM | Gravity.CENTER);
@@ -216,6 +218,8 @@ final class DialogFillUi { 




    private void setDismissButton(View decor) {

    private void setDismissButton(View decor) {

        final TextView noButton = decor.findViewById(R.id.autofill_dialog_no);

        final TextView noButton = decor.findViewById(R.id.autofill_dialog_no);

        // set "No thinks" by default

        noButton.setText(R.string.autofill_save_no);

        noButton.setOnClickListener((v) -> mCallback.onCanceled());

        noButton.setOnClickListener((v) -> mCallback.onCanceled());

    }

    }
@@ -224,6 +228,7 @@ final class DialogFillUi { 
        // set "Continue" by default

        // set "Continue" by default

        yesButton.setText(R.string.autofill_continue_yes);

        yesButton.setText(R.string.autofill_continue_yes);

        yesButton.setOnClickListener(listener);

        yesButton.setOnClickListener(listener);

        yesButton.setVisibility(View.VISIBLE);

    }

    }





    private void initialAuthenticationLayout(View decor, FillResponse response) {

    private void initialAuthenticationLayout(View decor, FillResponse response) {