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

Commit a6794dcc authored by SongFerngWang's avatar SongFerngWang Committed by Automerger Merge Worker
Browse files

The list does not follow the UX dialog design doc in alert dialog. am: f88ffb09 

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2063558



Change-Id: I117ed9f34fdf3758525dec30b1364db0a7645bf7
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c70bde09 f88ffb09

res/layout/select_account_list_item.xml

+0 −1
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ 
    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:minHeight="?attr/listPreferredItemHeightSmall"

    android:background="@drawable/sim_confirm_dialog_rounded_bg"

    android:gravity="center">

    <TextView android:id="@+id/title"

        android:textAppearance="@style/TextAppearance.SimConfirmDialogList"

res/layout/sim_confirm_dialog_item_multiple_enabled_profiles_supported.xml

+0 −1
Original line number Diff line number Diff line
@@ -25,6 +25,5 @@ 
    android:paddingBottom="?attr/listPreferredItemPaddingEnd"

    android:paddingLeft="?attr/listPreferredItemPaddingLeft"

    android:paddingRight="?attr/listPreferredItemPaddingRight"

    android:background="@drawable/sim_confirm_dialog_rounded_bg"

    android:textAppearance="@style/TextAppearance.SimConfirmDialogList"

    />

res/layout/sim_confirm_dialog_multiple_enabled_profiles_supported.xml

+10 −5
Original line number Diff line number Diff line
@@ -26,15 +26,19 @@ 
            android:paddingEnd="24dp"

            android:paddingTop="16dp"

            android:paddingStart="24dp"

            android:paddingBottom="32dp"

            android:gravity="center"

            android:textAppearance="@style/TextAppearance.DialogMessage"/>

            android:textAppearance="@style/TextAppearance.DialogMessage"

            android:visibility="gone"/>

        <ListView

            android:id="@+id/carrier_list"

            android:layout_gravity="center"

            android:paddingTop="16dp"

            android:dividerHeight="1dp"

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

            android:dividerHeight="4dp"

            android:background="@drawable/sim_confirm_dialog_rounded_bg"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"/>

            android:layout_height="wrap_content"

            android:visibility="gone"/>



        <LinearLayout

            android:id="@+id/info_outline_layout"
@@ -46,7 +50,8 @@ 
            android:paddingTop="16dp"

            android:paddingStart="24dp"

            android:layout_marginBottom="16dp"

            android:baselineAligned="true">

            android:baselineAligned="true"

            android:visibility="gone">

                <ImageView

                    android:src="@drawable/ic_info_outline_24dp"

                    android:layout_width="wrap_content"

res/values-night/themes.xml

+0 −6
Original line number Diff line number Diff line
@@ -34,12 +34,6 @@ 
        <item name="android:colorBackground">@*android:color/surface_dark</item>

    </style>



    <style name="Theme.AlertDialog.Base.Material3" parent="Theme.MaterialComponents.DayNight.Dialog.Alert">

        <item name="colorPrimary">@*android:color/primary_device_default_settings</item>

        <item name="colorAccent">@*android:color/accent_device_default_dark</item>

        <item name="android:colorBackground">@*android:color/surface_dark</item>

    </style>



    <!-- Material theme for the pages containing TabLayout and ViewPager -->

    <style name="Theme.TabTheme" parent="@style/Theme.MaterialComponents.DayNight">

        <item name="colorPrimary">@*android:color/edge_effect_device_default_dark</item>

src/com/android/settings/network/telephony/ConfirmDialogFragment.java

+10 −5
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ import android.view.LayoutInflater; 
import android.view.View;

import android.widget.AdapterView;

import android.widget.ArrayAdapter;

import android.widget.LinearLayout;

import android.widget.ListView;

import android.widget.TextView;
@@ -115,13 +116,12 @@ public class ConfirmDialogFragment extends BaseDialogFragment 
        AlertDialog.Builder builder = new AlertDialog.Builder(getContext())

                .setPositiveButton(posBtnString, this)

                .setNegativeButton(negBtnString, this);



        if (list != null && !list.isEmpty()) {

            Log.i(TAG, "list =" + list.toString());



        View content = LayoutInflater.from(getContext()).inflate(

                R.layout.sim_confirm_dialog_multiple_enabled_profiles_supported, null);



        if (list != null && !list.isEmpty() && content != null) {

            Log.i(TAG, "list =" + list.toString());



            if (!TextUtils.isEmpty(title)) {

                View titleView = LayoutInflater.from(getContext()).inflate(

                        R.layout.sim_confirm_dialog_title_multiple_enabled_profiles_supported,
@@ -133,6 +133,7 @@ public class ConfirmDialogFragment extends BaseDialogFragment 
            TextView dialogMessage = content.findViewById(R.id.msg);

            if (!TextUtils.isEmpty(message) && dialogMessage != null) {

                dialogMessage.setText(message);

                dialogMessage.setVisibility(View.VISIBLE);

            }



            final ArrayAdapter<String> arrayAdapterItems = new ArrayAdapter<String>(
@@ -140,8 +141,8 @@ public class ConfirmDialogFragment extends BaseDialogFragment 
                    R.layout.sim_confirm_dialog_item_multiple_enabled_profiles_supported, list);

            final ListView lvItems = content.findViewById(R.id.carrier_list);

            if (lvItems != null) {

                lvItems.setVisibility(View.VISIBLE);

                lvItems.setAdapter(arrayAdapterItems);

                lvItems.setChoiceMode(ListView.CHOICE_MODE_NONE);

                lvItems.setOnItemClickListener(new AdapterView.OnItemClickListener() {

                    @Override

                    public void onItemClick(AdapterView<?> parent, View view, int position,
@@ -158,6 +159,10 @@ public class ConfirmDialogFragment extends BaseDialogFragment 
                    }

                });

            }

            final LinearLayout infoOutline = content.findViewById(R.id.info_outline_layout);

            if (infoOutline != null) {

                infoOutline.setVisibility(View.VISIBLE);

            }

            builder.setView(content);

        } else {

            if (!TextUtils.isEmpty(title)) {