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

Commit 2aa5a05a authored by Philip P. Moltmann's avatar Philip P. Moltmann Committed by android-build-merger
Browse files

Merge changes I1b2f0726,Iaed2c7e7 into oc-dev 

am: 183b4765

Change-Id: Iaf386fbcdbadf132a2ac45b8f0225bf2e890f95c
parents 3f9418bf 183b4765

core/res/res/layout/autofill_save.xml

+37 −27
Original line number Diff line number Diff line
@@ -25,11 +25,18 @@ 
        android:layout_width="fill_parent"

        android:layout_height="wrap_content"

        android:layout_marginTop="32dp"

        android:padding="16dp"

        android:paddingTop="16dp"

        android:elevation="32dp"

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

        android:orientation="vertical">



        <LinearLayout

            android:layout_width="fill_parent"

            android:layout_height="wrap_content"

            android:paddingLeft="16dp"

            android:paddingRight="16dp"

            android:orientation="vertical">



            <LinearLayout

                android:layout_width="fill_parent"

                android:layout_height="wrap_content"
@@ -65,11 +72,14 @@ 
                android:visibility="gone">

            </TextView>



        </LinearLayout>



        <com.android.internal.widget.ButtonBarLayout

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_gravity="end"

            android:layout_marginTop="16dp"

            android:padding="16dp"

            android:clipToPadding="false"

            android:layout_weight="1"

            android:orientation="horizontal">

services/autofill/java/com/android/server/autofill/AutofillManagerService.java

+2 −1
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ import static com.android.server.autofill.Helper.bundleToString; 
import android.annotation.NonNull;

import android.annotation.Nullable;

import android.app.ActivityManager;

import android.app.ActivityThread;

import android.content.BroadcastReceiver;

import android.content.ComponentName;

import android.content.ContentResolver;
@@ -125,7 +126,7 @@ public final class AutofillManagerService extends SystemService { 
    public AutofillManagerService(Context context) {

        super(context);

        mContext = context;

        mUi = new AutoFillUI(mContext);

        mUi = new AutoFillUI(ActivityThread.currentActivityThread().getSystemUiContext());



        final boolean debug = Build.IS_DEBUGGABLE;

        Slog.i(TAG, "Setting debug to " + debug);

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

+1 −1
Original line number Diff line number Diff line
@@ -175,7 +175,7 @@ final class SaveUi { 
        closeButton.setOnClickListener((v) -> mListener.onCancel(

                info.getNegativeActionListener()));



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

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

        mDialog.setContentView(view);



        final Window window = mDialog.getWindow();