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

Commit df0ea6c7 authored by Hakjun Choi's avatar Hakjun Choi Committed by Android (Google) Code Review
Browse files

Merge "Make satellite more info url carrier configurable" into 24D1-dev

parents 2244c629 3c54876d

res/values/strings.xml

+0 −2
Original line number Diff line number Diff line
@@ -11553,8 +11553,6 @@ 
    <string name="satellite_setting_summary_more_information">Satellite messaging may take longer and is available only in some areas. Weather and certain structures may affect your satellite connection. Calling by satellite isn\u2019t available. Emergency calls may still connect.\n\nIt may take some time for account changes to show in Settings. Contact your carrier for details.</string>

    <!-- more about satellite messaging [CHAR_LIMIT=NONE] -->

    <string name="more_about_satellite_messaging">More about satellite messaging</string>

    <!-- URL for more info about satellite messaging [CHAR LIMIT=60] -->

    <string name="more_info_satellite_messaging_link" translatable="false"></string>









    <!-- Title for Apn settings in mobile network settings [CHAR LIMIT=60] -->









    <string name="mobile_network_apn_title">Access Point Names</string>

























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



+21
−2






























Original line number
Diff line number
Diff line







@@ -16,6 +16,8 @@

















package com.android.settings.network.telephony;



















import static android.telephony.CarrierConfigManager.KEY_SATELLITE_INFORMATION_REDIRECT_URL_STRING;



















import android.app.Activity;









import android.app.settings.SettingsEnums;









import android.content.Intent;








@@ -23,7 +25,9 @@ import android.graphics.Typeface;







import android.graphics.drawable.Drawable;









import android.net.Uri;









import android.os.Bundle;









import android.os.PersistableBundle;









import android.os.UserManager;









import android.telephony.CarrierConfigManager;









import android.telephony.SubscriptionManager;









import android.telephony.TelephonyManager;









import android.telephony.satellite.SatelliteManager;








@@ -60,7 +64,9 @@ public class SatelliteSetting extends RestrictedDashboardFragment {

















    private Activity mActivity;









    private TelephonyManager mTelephonymanager;









    private CarrierConfigManager mCarrierConfigManager;









    private SatelliteManager mSatelliteManager;









    private PersistableBundle mConfigBundle;









    private int mSubId;



















    public SatelliteSetting() {








@@ -78,6 +84,7 @@ public class SatelliteSetting extends RestrictedDashboardFragment {

















        mActivity = getActivity();









        mTelephonymanager = mActivity.getSystemService(TelephonyManager.class);









        mCarrierConfigManager = mActivity.getSystemService(CarrierConfigManager.class);









        mSatelliteManager = mActivity.getSystemService(SatelliteManager.class);









        mSubId = mActivity.getIntent().getIntExtra(SUB_ID,









                SubscriptionManager.INVALID_SUBSCRIPTION_ID);








@@ -134,7 +141,7 @@ public class SatelliteSetting extends RestrictedDashboardFragment {







            preference.setSummary(spannable);









            /* The link will lead users to a guide page */









            preference.setOnPreferenceClickListener(pref -> {









                String url = getResources().getString(R.string.more_info_satellite_messaging_link);









                String url = readSatelliteMoreInfoString(mSubId);









                if (!url.isEmpty()) {









                    Uri uri = Uri.parse(url);









                    Intent intent = new Intent(Intent.ACTION_VIEW, uri);








@@ -163,7 +170,7 @@ public class SatelliteSetting extends RestrictedDashboardFragment {







                            operatorName));



















            final String[] link = new String[1];









            link[0] = getResources().getString(R.string.more_info_satellite_messaging_link);









            link[0] = readSatelliteMoreInfoString(mSubId);









            footerPreference.setLearnMoreAction(view -> {









                if (!link[0].isEmpty()) {









                    Intent helpIntent = HelpUtils.getHelpIntent(mActivity, link[0],








@@ -192,6 +199,18 @@ public class SatelliteSetting extends RestrictedDashboardFragment {







        }









    }



















    private String readSatelliteMoreInfoString(int subId) {









        if (mConfigBundle == null) {









            mConfigBundle = mCarrierConfigManager.getConfigForSubId(subId,









                    KEY_SATELLITE_INFORMATION_REDIRECT_URL_STRING);









            if (mConfigBundle.isEmpty()) {









                Log.d(TAG, "SatelliteSettings: getDefaultConfig");









                mConfigBundle = CarrierConfigManager.getDefaultConfig();









            }









        }









        return mConfigBundle.getString(KEY_SATELLITE_INFORMATION_REDIRECT_URL_STRING, "");









    }



















    private static void loge(String message) {









        Log.e(TAG, message);









    }