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

Commit 08ca3cc7 authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

Merge "Merge changes I768830f5,I665bde3a into oc-mr1-dev am: 7876b630" into oc-mr1-dev-plus-aosp

parents 22f95dbd 05deaf54

core/res/res/layout/autofill_save.xml

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

-->



<!-- NOTE: outer layout is required to provide proper shadow. -->

<LinearLayout

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

    android:layout_width="fill_parent"

    android:layout_height="wrap_content"

    android:orientation="vertical">



    <LinearLayout

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

        android:id="@+id/autofill_save"
@@ -47,17 +54,6 @@ 
                    android:layout_weight="1">

                </TextView>



            <ImageView

                android:id="@+id/autofill_save_close"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_marginLeft="16dp"

                android:src="@android:drawable/ic_close"

                android:alpha="0.54"

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

                android:contentDescription="@android:string/close_button_text">

            </ImageView>



            </LinearLayout>



            <com.android.server.autofill.ui.CustomScrollView
@@ -99,9 +95,10 @@ 
                android:layout_height="wrap_content"

                style="@style/Widget.Material.Button.Colored"

                android:text="@string/autofill_save_yes">

            <requestFocus />

            </Button>



        </com.android.internal.widget.ButtonBarLayout>



    </LinearLayout>



</LinearLayout>

core/res/res/values/symbols.xml

+0 −1
Original line number Diff line number Diff line
@@ -2900,7 +2900,6 @@ 
  <java-symbol type="id" name="autofill_save_title" />

  <java-symbol type="id" name="autofill_save_no" />

  <java-symbol type="id" name="autofill_save_yes" />

  <java-symbol type="id" name="autofill_save_close" />

  <java-symbol type="string" name="autofill_error_cannot_autofill" />

  <java-symbol type="string" name="autofill_picker_no_suggestions" />

  <java-symbol type="plurals" name="autofill_picker_some_suggestions" />

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

+0 −3
Original line number Diff line number Diff line
@@ -209,9 +209,6 @@ final class SaveUi { 
        final View yesButton = view.findViewById(R.id.autofill_save_yes);

        yesButton.setOnClickListener((v) -> mListener.onSave());



        final View closeButton = view.findViewById(R.id.autofill_save_close);

        closeButton.setOnClickListener(cancelListener);



        mDialog = new Dialog(context, R.style.Theme_DeviceDefault_Light_Panel);

        mDialog.setContentView(view);