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

Commit 8e86a05e authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Avoid string mismatch of menu name and dialog title" into main

parents a1046fc8 940fc8f3

res/values/strings.xml

+0 −5
Original line number Diff line number Diff line
@@ -12314,11 +12314,6 @@ 
    <!-- Summary for an item in the page listing multiple mobile service subscriptions, indicating

         that service is inactive and is tied to an eSIM profile [CHAR LIMIT=40] -->

    <string name="mobile_network_inactive_esim">Inactive / eSIM</string>

    <!-- Title of a dialog that lets a user modify the display name used for a mobile network

         subscription in various places in the Settings app. The default name is typically just the

         carrier name, but especially in multi-SIM configurations users may want to use a different

         name. [CHAR LIMIT=40] -->

    <string name="mobile_network_sim_name">SIM name &amp; color</string>

    <!-- Label for an item listing the name of the SIM that the user has specified. [CHAR LIMIT=40] -->

    <string name="mobile_network_sim_name_label">Name</string>

    <!-- Label for an item listing the color of the SIM that the user has specified. [CHAR LIMIT=40] -->

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

+1 −1
Original line number Diff line number Diff line
@@ -468,7 +468,7 @@ public class MobileNetworkSettings extends AbstractMobileNetworkSettings impleme 
    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {

        if (mSubId != SubscriptionManager.INVALID_SUBSCRIPTION_ID) {

            final MenuItem item = menu.add(Menu.NONE, R.id.edit_sim_name, Menu.NONE,

                    R.string.mobile_network_sim_name);

                    R.string.mobile_network_sim_label_color_title);

            item.setIcon(com.android.internal.R.drawable.ic_mode_edit);

            item.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);

        }