Merge "Consider subId when loading Wfc string resources" (944689ab) · Commits · e / os / android_packages_apps_Settings

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

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -148,7 +148,8 @@ public class WifiCallingPreferenceController extends TelephonyBasePreferenceCont
	break;		break;
	}		}
	}		}
	preference.setSummary(resId);		preference.setSummary(
			SubscriptionManager.getResourcesForSubId(mContext, mSubId).getText(resId));
	}		}
	preference.setEnabled(mCallState == TelephonyManager.CALL_STATE_IDLE);		preference.setEnabled(mCallState == TelephonyManager.CALL_STATE_IDLE);
	}		}

src/com/android/settings/wifi/calling/WifiCallingSettingsForSub.java

+37 −11

Original line number	Original line	Diff line number	Diff line
	@@ -340,20 +340,46 @@ public class WifiCallingSettingsForSub extends SettingsPreferenceFragment
	}		}
	}		}

	if (!isWifiOnlySupported) {		Resources res = getResourcesForSubId();
	mButtonWfcMode.setEntries(R.array.wifi_calling_mode_choices_without_wifi_only);		mButtonWfcMode.setTitle(res.getString(R.string.wifi_calling_mode_title));
	mButtonWfcMode.setEntryValues(R.array.wifi_calling_mode_values_without_wifi_only);		mButtonWfcMode.setDialogTitle(res.getString(R.string.wifi_calling_mode_dialog_title));
	mButtonWfcMode.setEntrySummaries(R.array.wifi_calling_mode_summaries_without_wifi_only);		mButtonWfcRoamingMode.setTitle(res.getString(R.string.wifi_calling_roaming_mode_title));
			mButtonWfcRoamingMode.setDialogTitle(
			res.getString(R.string.wifi_calling_roaming_mode_dialog_title));

			if (isWifiOnlySupported) {
			// Set string resources WITH option wifi only in mButtonWfcMode.
			mButtonWfcMode.setEntries(
			res.getStringArray(R.array.wifi_calling_mode_choices));
			mButtonWfcMode.setEntryValues(res.getStringArray(R.array.wifi_calling_mode_values));
			mButtonWfcMode.setEntrySummaries(
			res.getStringArray(R.array.wifi_calling_mode_summaries));

			// Set string resources WITH option wifi only in mButtonWfcRoamingMode.
			mButtonWfcRoamingMode.setEntries(
			res.getStringArray(R.array.wifi_calling_mode_choices_v2));
			mButtonWfcRoamingMode.setEntryValues(
			res.getStringArray(R.array.wifi_calling_mode_values));
			mButtonWfcRoamingMode.setEntrySummaries(
			res.getStringArray(R.array.wifi_calling_mode_summaries));
			} else {
			// Set string resources WITHOUT option wifi only in mButtonWfcMode.
			mButtonWfcMode.setEntries(
			res.getStringArray(R.array.wifi_calling_mode_choices_without_wifi_only));
			mButtonWfcMode.setEntryValues(
			res.getStringArray(R.array.wifi_calling_mode_values_without_wifi_only));
			mButtonWfcMode.setEntrySummaries(
			res.getStringArray(R.array.wifi_calling_mode_summaries_without_wifi_only));

			// Set string resources WITHOUT option wifi only in mButtonWfcRoamingMode.
	mButtonWfcRoamingMode.setEntries(		mButtonWfcRoamingMode.setEntries(
	R.array.wifi_calling_mode_choices_v2_without_wifi_only);		res.getStringArray(R.array.wifi_calling_mode_choices_v2_without_wifi_only));
	mButtonWfcRoamingMode.setEntryValues(		mButtonWfcRoamingMode.setEntryValues(
	R.array.wifi_calling_mode_values_without_wifi_only);		res.getStringArray(R.array.wifi_calling_mode_values_without_wifi_only));
	mButtonWfcRoamingMode.setEntrySummaries(		mButtonWfcRoamingMode.setEntrySummaries(
	R.array.wifi_calling_mode_summaries_without_wifi_only);		res.getStringArray(R.array.wifi_calling_mode_summaries_without_wifi_only));
	}		}


	// NOTE: Buttons will be enabled/disabled in mPhoneStateListener		// NOTE: Buttons will be enabled/disabled in mPhoneStateListener
	final boolean wfcEnabled = mImsManager.isWfcEnabledByUser()		final boolean wfcEnabled = mImsManager.isWfcEnabledByUser()
	&& mImsManager.isNonTtyOrTtyOnVolteEnabled();		&& mImsManager.isNonTtyOrTtyOnVolteEnabled();
	@@ -589,7 +615,7 @@ public class WifiCallingSettingsForSub extends SettingsPreferenceFragment
	return true;		return true;
	}		}

	private int getWfcModeSummary(int wfcMode) {		private CharSequence getWfcModeSummary(int wfcMode) {
	int resId = com.android.internal.R.string.wifi_calling_off_summary;		int resId = com.android.internal.R.string.wifi_calling_off_summary;
	if (mImsManager.isWfcEnabledByUser()) {		if (mImsManager.isWfcEnabledByUser()) {
	switch (wfcMode) {		switch (wfcMode) {
	@@ -606,7 +632,7 @@ public class WifiCallingSettingsForSub extends SettingsPreferenceFragment
	Log.e(TAG, "Unexpected WFC mode value: " + wfcMode);		Log.e(TAG, "Unexpected WFC mode value: " + wfcMode);
	}		}
	}		}
	return resId;		return getResourcesForSubId().getString(resId);
	}		}

	@VisibleForTesting		@VisibleForTesting

src/com/android/settings/wifi/calling/WifiCallingSliceHelper.java

+37 −24

Original line number	Original line	Diff line number	Diff line
	@@ -25,6 +25,7 @@ import android.app.PendingIntent;
	import android.content.ComponentName;		import android.content.ComponentName;
	import android.content.Context;		import android.content.Context;
	import android.content.Intent;		import android.content.Intent;
			import android.content.res.Resources;
	import android.net.Uri;		import android.net.Uri;
	import android.os.PersistableBundle;		import android.os.PersistableBundle;
	import android.provider.Settings;		import android.provider.Settings;
	@@ -131,6 +132,7 @@ public class WifiCallingSliceHelper {
	*/		*/
	public Slice createWifiCallingSlice(Uri sliceUri) {		public Slice createWifiCallingSlice(Uri sliceUri) {
	final int subId = getDefaultVoiceSubId();		final int subId = getDefaultVoiceSubId();
			Resources res = getResourcesForSubId(subId);

	if (subId <= SubscriptionManager.INVALID_SUBSCRIPTION_ID) {		if (subId <= SubscriptionManager.INVALID_SUBSCRIPTION_ID) {
	Log.d(TAG, "Invalid subscription Id");		Log.d(TAG, "Invalid subscription Id");
	@@ -157,12 +159,11 @@ public class WifiCallingSliceHelper {
	// Activation needed for the next action of the user		// Activation needed for the next action of the user
	// Give instructions to go to settings app		// Give instructions to go to settings app
	return getNonActionableWifiCallingSlice(		return getNonActionableWifiCallingSlice(
	mContext.getText(R.string.wifi_calling_settings_title),		res.getText(R.string.wifi_calling_settings_title),
	mContext.getText(		res.getText(R.string.wifi_calling_settings_activation_instructions),
	R.string.wifi_calling_settings_activation_instructions),
	sliceUri, getActivityIntent(ACTION_WIFI_CALLING_SETTINGS_ACTIVITY));		sliceUri, getActivityIntent(ACTION_WIFI_CALLING_SETTINGS_ACTIVITY));
	}		}
	return getWifiCallingSlice(sliceUri, isWifiCallingEnabled);		return getWifiCallingSlice(sliceUri, isWifiCallingEnabled, subId);
	} catch (InterruptedException \| TimeoutException \| ExecutionException e) {		} catch (InterruptedException \| TimeoutException \| ExecutionException e) {
	Log.e(TAG, "Unable to read the current WiFi calling status", e);		Log.e(TAG, "Unable to read the current WiFi calling status", e);
	return null;		return null;
	@@ -188,13 +189,14 @@ public class WifiCallingSliceHelper {
	* Builds a toggle slice where the intent takes you to the wifi calling page and the toggle		* Builds a toggle slice where the intent takes you to the wifi calling page and the toggle
	* enables/disables wifi calling.		* enables/disables wifi calling.
	*/		*/
	private Slice getWifiCallingSlice(Uri sliceUri, boolean isWifiCallingEnabled) {		private Slice getWifiCallingSlice(Uri sliceUri, boolean isWifiCallingEnabled, int subId) {
	final IconCompat icon = IconCompat.createWithResource(mContext, R.drawable.wifi_signal);		final IconCompat icon = IconCompat.createWithResource(mContext, R.drawable.wifi_signal);
			Resources res = getResourcesForSubId(subId);

	return new ListBuilder(mContext, sliceUri, ListBuilder.INFINITY)		return new ListBuilder(mContext, sliceUri, ListBuilder.INFINITY)
	.setAccentColor(Utils.getColorAccentDefaultColor(mContext))		.setAccentColor(Utils.getColorAccentDefaultColor(mContext))
	.addRow(new RowBuilder()		.addRow(new RowBuilder()