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

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

Merge "Improve dialog and system dialog UI" into udc-dev

parents 486691ad 7a920258

src/com/android/settings/localepicker/LocaleDialogFragment.java

+4 −1
Original line number Diff line number Diff line
@@ -101,6 +101,7 @@ public class LocaleDialogFragment extends InstrumentedDialogFragment { 
                R.layout.locale_dialog, null);

        setDialogTitle(viewGroup, dialogContent.mTitle);

        setDialogMessage(viewGroup, dialogContent.mMessage);



        AlertDialog.Builder builder = new AlertDialog.Builder(getContext())

                .setView(viewGroup);

        if (!dialogContent.mPositiveButton.isEmpty()) {
@@ -109,7 +110,9 @@ public class LocaleDialogFragment extends InstrumentedDialogFragment { 
        if (!dialogContent.mNegativeButton.isEmpty()) {

            builder.setNegativeButton(dialogContent.mNegativeButton, controller);

        }

        return builder.create();

        AlertDialog alertDialog = builder.create();

        alertDialog.setCanceledOnTouchOutside(false);

        return alertDialog;

    }



    private static void setDialogTitle(View root, String content) {

src/com/android/settings/localepicker/LocaleDragAndDropAdapter.java

+1 −1
Original line number Diff line number Diff line
@@ -165,7 +165,7 @@ class LocaleDragAndDropAdapter 


        dragCell.setLabelAndDescription(label, description);

        dragCell.setLocalized(feedItem.isTranslated());

        dragCell.setCurrentDefault(feedItem.getLocale().equals(LocalePicker.getLocales().get(0)));

        dragCell.setCurrentDefault(feedItem.getLocale().equals(Locale.getDefault()));

        dragCell.setMiniLabel(mNumberFormatter.format(i + 1));

        dragCell.setShowCheckbox(mRemoveMode);

        dragCell.setShowMiniLabel(!mRemoveMode);