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

Commit 17d0097a authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix crash due to over limited length." into main am: 646fa2d5 

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



Change-Id: I25eafcb494be249eafda49e64e682dc3fbe77866
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f4b70bd0 646fa2d5

res/layout/dialog_mobile_network_rename.xml

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ 
                android:layout_height="wrap_content"

                android:inputType="text"

                android:paddingTop="@dimen/sim_label_padding"

                android:maxLength="50"

                android:maxLength="@integer/sim_label_max_length"

                android:singleLine="true"/>



            <TextView

res/values/integers.xml

+2 −0
Original line number Diff line number Diff line
@@ -42,4 +42,6 @@ 
    <integer name="pointer_scale_seek_bar_end">3</integer>



    <integer name="max_integer">2147483647</integer>



    <integer name="sim_label_max_length">50</integer>

</resources>

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

+7 −7
Original line number Diff line number Diff line
@@ -165,9 +165,9 @@ public class RenameMobileNetworkDialogFragment extends InstrumentedDialogFragmen 
        }

        final CharSequence displayName = SubscriptionUtil.getUniqueSubscriptionDisplayName(

                info, getContext());

        mNameView.setText(displayName);

        if (!TextUtils.isEmpty(displayName)) {

            mNameView.setSelection(displayName.length());

            mNameView.setSelection(Math.min(displayName.length(),

                    getResources().getInteger(R.integer.sim_label_max_length)));

        }



        mColorSpinner = view.findViewById(R.id.color_spinner);