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

Commit a28c027f authored by arunvoddu's avatar arunvoddu Committed by Android Build Coastguard Worker
Browse files

[Satellite] Satellite UX changes in SIM settings as per new UX design. 

 - This CL has some change to avoid code conflict and keep the bare minimum change.

Bug: 382707562
Flag: EXEMPT UX bug fix
Test: Verified UX on device
(cherry picked from commit 4da20d24)
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:2cf698d1f4478f5e6a2122f01c82fe78030f482e)
Merged-In: I9e600d8f1fd6c273329e05a74079f1e03c209c65
Change-Id: I9e600d8f1fd6c273329e05a74079f1e03c209c65
parent 3bbe5d3a

res/values/strings.xml

+2 −2
Original line number Diff line number Diff line
@@ -12334,9 +12334,9 @@ 
    <!-- Category name "About satellite messaging" [CHAR_LIMIT=NONE] -->

    <string name="category_name_about_satellite_messaging">About <xliff:g id="subject" example="satellite messaging">%1$s</xliff:g></string>

    <!-- Summary for category "About satellite messaging" [CHAR_LIMIT=NONE] -->

    <string name="title_about_satellite_setting">You can send and receive text messages by satellite as part of an eligible <xliff:g id="carrier_name" example="T-Mobile">%1$s</xliff:g> account</string>

    <string name="title_about_satellite_setting">You can send and receive text messages by satellite with an eligible <xliff:g id="carrier_name" example="T-Mobile">%1$s</xliff:g> account</string>

    <!-- Category title "Your mobile plan" [CHAR_LIMIT=NONE] -->

    <string name="category_title_your_satellite_plan">Your <xliff:g id="carrier_name" example="T-Mobile">%1$s</xliff:g> plan</string>

    <string name="category_title_your_satellite_plan">Your <xliff:g id="carrier_name" example="T-Mobile">%1$s</xliff:g> account</string>

    <!-- Title for category "Your mobile plan when satellite is included in plan" [CHAR_LIMIT=NONE] -->

    <string name="title_have_satellite_plan">Messaging is included with your account</string>

    <!-- Title for category "Your mobile plan when satellite is not included in plan" [CHAR_LIMIT=NONE] -->

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

+1 −5
Original line number Diff line number Diff line
@@ -79,6 +79,7 @@ public class SatelliteSettingsPreferenceCategoryController 
    public void displayPreference(PreferenceScreen screen) {

        super.displayPreference(screen);

        mPreferenceCategory = screen.findPreference(getPreferenceKey());

        mPreferenceCategory.setTitle(R.string.category_title_satellite_connectivity);

    }



    @Override
@@ -135,11 +136,6 @@ public class SatelliteSettingsPreferenceCategoryController 
                Log.d(TAG, "Satellite preference category is not initialized yet");

                return;

            }

            if (isDataAvailable) {

                mPreferenceCategory.setTitle(R.string.category_title_satellite_connectivity);

            } else if (isSmsAvailable) {

                mPreferenceCategory.setTitle(R.string.satellite_setting_title);

            }

        }



        @Override