PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Revise strings as per string UX review" into rvc-dev

Browse Source
This commit is contained in:
Brad Ebinger
2020-04-23 15:38:39 +00:00
committed by Android (Google) Code Review
parent 6f9f91b67b b8e0cd7989
commit c3d052a48c
6 changed files with 85 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/com/android/settings/network/telephony/ContactDiscoveryDialogFragment.java
View File

@@ -23,6 +23,7 @@ import android.content.DialogInterface;
import android.os.Bundle;
import android.telephony.ims.ImsManager;
import android.telephony.ims.ImsRcsManager;
import android.text.TextUtils;
import androidx.annotation.VisibleForTesting;
import androidx.fragment.app.FragmentManager;
@@ -39,9 +40,11 @@ public class ContactDiscoveryDialogFragment extends InstrumentedDialogFragment
implements DialogInterface.OnClickListener {
private static final String SUB_ID_KEY = "sub_id_key";
private static final String CARRIER_NAME_KEY = "carrier_name_key";
private static final String DIALOG_TAG = "discovery_dialog:";
private int mSubId;
private CharSequence mCarrierName;
private ImsManager mImsManager;
/**
@@ -50,10 +53,11 @@ public class ContactDiscoveryDialogFragment extends InstrumentedDialogFragment
* @param subId The subscription ID to associate with this Dialog.
* @return a new instance of ContactDiscoveryDialogFragment.
*/
public static ContactDiscoveryDialogFragment newInstance(int subId) {
public static ContactDiscoveryDialogFragment newInstance(int subId, CharSequence carrierName) {
final ContactDiscoveryDialogFragment dialogFragment = new ContactDiscoveryDialogFragment();
final Bundle args = new Bundle();
args.putInt(SUB_ID_KEY, subId);
args.putCharSequence(CARRIER_NAME_KEY, carrierName);
dialogFragment.setArguments(args);
return dialogFragment;
@@ -64,18 +68,30 @@ public class ContactDiscoveryDialogFragment extends InstrumentedDialogFragment
super.onAttach(context);
final Bundle args = getArguments();
mSubId = args.getInt(SUB_ID_KEY);
mCarrierName = args.getCharSequence(CARRIER_NAME_KEY);
mImsManager = getImsManager(context);
}
@Override
public Dialog onCreateDialog(Bundle savedInstanceState) {
final AlertDialog.Builder builder = new AlertDialog.Builder(getContext());
final int title = R.string.contact_discovery_opt_in_dialog_title;
int message = R.string.contact_discovery_opt_in_dialog_message;
builder.setMessage(getResources().getString(message))
CharSequence title;
CharSequence message;
if (!TextUtils.isEmpty(mCarrierName)) {
title = getContext().getString(
R.string.contact_discovery_opt_in_dialog_title, mCarrierName);
message = getContext().getString(
R.string.contact_discovery_opt_in_dialog_message, mCarrierName);
} else {
title = getContext().getString(
R.string.contact_discovery_opt_in_dialog_title_no_carrier_defined);
message = getContext().getString(
R.string.contact_discovery_opt_in_dialog_message_no_carrier_defined);
}
builder.setMessage(message)
.setTitle(title)
.setIconAttribute(android.R.attr.alertDialogIcon)
.setPositiveButton(android.R.string.ok, this)
.setPositiveButton(R.string.confirmation_turn_on, this)
.setNegativeButton(android.R.string.cancel, this);
return builder.create();
}

17
src/com/android/settings/network/telephony/ContactDiscoveryPreferenceController.java
View File

@@ -22,6 +22,7 @@ import android.net.Uri;
import android.os.PersistableBundle;
import android.provider.Telephony;
import android.telephony.CarrierConfigManager;
import android.telephony.SubscriptionInfo;
import android.telephony.ims.ImsManager;
import android.util.Log;
@@ -34,6 +35,8 @@ import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import androidx.preference.SwitchPreference;
import com.android.settings.network.SubscriptionUtil;
/**
* Controller for the "Contact Discovery" option present in MobileNetworkSettings.
@@ -130,7 +133,19 @@ public class ContactDiscoveryPreferenceController extends TelephonyTogglePrefere
private void showContentDiscoveryDialog() {
ContactDiscoveryDialogFragment dialog = ContactDiscoveryDialogFragment.newInstance(
mSubId);
mSubId, getCarrierDisplayName(preference.getContext()));
dialog.show(mFragmentManager, ContactDiscoveryDialogFragment.getFragmentTag(mSubId));
}
private CharSequence getCarrierDisplayName(Context context) {
CharSequence result = "";
for (SubscriptionInfo info : SubscriptionUtil.getAvailableSubscriptions(context)) {
if (mSubId == info.getSubscriptionId()) {
result = info.getDisplayName();
break;
}
}
return result;
}
}

18
src/com/android/settings/network/telephony/MobileNetworkActivity.java
View File

@@ -22,6 +22,7 @@ import android.os.Bundle;
import android.os.UserManager;
import android.provider.Settings;
import android.telephony.SubscriptionInfo;
import android.telephony.SubscriptionManager;
import android.telephony.ims.ImsRcsManager;
import android.text.TextUtils;
import android.util.Log;
@@ -79,7 +80,8 @@ public class MobileNetworkActivity extends SettingsBaseActivity
int oldSubId = mCurSubscriptionId;
mCurSubscriptionId = updateSubscriptionIndex;
mFragmentForceReload = (mCurSubscriptionId == oldSubId);
updateSubscriptions(getSubscription());
final SubscriptionInfo info = getSubscription();
updateSubscriptions(info);
// If the subscription has changed or the new intent doesnt contain the opt in action,
// remove the old discovery dialog. If the activity is being recreated, we will see
@@ -91,7 +93,7 @@ public class MobileNetworkActivity extends SettingsBaseActivity
// evaluate showing the new discovery dialog if this intent contains an action to show the
// opt-in.
if (doesIntentContainOptInAction(intent)) {
maybeShowContactDiscoveryDialog(updateSubscriptionIndex);
maybeShowContactDiscoveryDialog(info);
}
}
@@ -125,7 +127,7 @@ public class MobileNetworkActivity extends SettingsBaseActivity
final SubscriptionInfo subscription = getSubscription();
updateTitleAndNavigation(subscription);
maybeShowContactDiscoveryDialog(mCurSubscriptionId);
maybeShowContactDiscoveryDialog(subscription);
// Since onChanged() will take place immediately when addActiveSubscriptionsListener(),
// perform registration after mCurSubscriptionId been configured.
@@ -276,7 +278,13 @@ public class MobileNetworkActivity extends SettingsBaseActivity
.findFragmentByTag(ContactDiscoveryDialogFragment.getFragmentTag(subId));
}
private void maybeShowContactDiscoveryDialog(int subId) {
private void maybeShowContactDiscoveryDialog(SubscriptionInfo info) {
int subId = SubscriptionManager.INVALID_SUBSCRIPTION_ID;
CharSequence carrierName = "";
if (info != null) {
subId = info.getSubscriptionId();
carrierName = info.getDisplayName();
}
// If this activity was launched using ACTION_SHOW_CAPABILITY_DISCOVERY_OPT_IN, show the
// associated dialog only if the opt-in has not been granted yet.
boolean showOptInDialog = doesIntentContainOptInAction(getIntent())
@@ -287,7 +295,7 @@ public class MobileNetworkActivity extends SettingsBaseActivity
ContactDiscoveryDialogFragment fragment = getContactDiscoveryFragment(subId);
if (showOptInDialog) {
if (fragment == null) {
fragment = ContactDiscoveryDialogFragment.newInstance(subId);
fragment = ContactDiscoveryDialogFragment.newInstance(subId, carrierName);
}
// Only try to show the dialog if it has not already been added, otherwise we may
// accidentally add it multiple times, causing multiple dialogs.