Merge "Add description for Wi-Fi calling mode"
This commit is contained in:
@@ -81,8 +81,8 @@ public class WifiCallingSettingsForSub extends SettingsPreferenceFragment
|
||||
//UI objects
|
||||
private SwitchBar mSwitchBar;
|
||||
private Switch mSwitch;
|
||||
private ListPreference mButtonWfcMode;
|
||||
private ListPreference mButtonWfcRoamingMode;
|
||||
private ListWithEntrySummaryPreference mButtonWfcMode;
|
||||
private ListWithEntrySummaryPreference mButtonWfcRoamingMode;
|
||||
private Preference mUpdateAddress;
|
||||
private TextView mEmptyView;
|
||||
|
||||
@@ -260,10 +260,11 @@ public class WifiCallingSettingsForSub extends SettingsPreferenceFragment
|
||||
|
||||
mImsManager = getImsManager();
|
||||
|
||||
mButtonWfcMode = (ListPreference) findPreference(BUTTON_WFC_MODE);
|
||||
mButtonWfcMode = (ListWithEntrySummaryPreference) findPreference(BUTTON_WFC_MODE);
|
||||
mButtonWfcMode.setOnPreferenceChangeListener(this);
|
||||
|
||||
mButtonWfcRoamingMode = (ListPreference) findPreference(BUTTON_WFC_ROAMING_MODE);
|
||||
mButtonWfcRoamingMode = (ListWithEntrySummaryPreference) findPreference(
|
||||
BUTTON_WFC_ROAMING_MODE);
|
||||
mButtonWfcRoamingMode.setOnPreferenceChangeListener(this);
|
||||
|
||||
mUpdateAddress = (Preference) findPreference(PREFERENCE_EMERGENCY_ADDRESS);
|
||||
@@ -324,10 +325,14 @@ public class WifiCallingSettingsForSub extends SettingsPreferenceFragment
|
||||
if (!isWifiOnlySupported) {
|
||||
mButtonWfcMode.setEntries(R.array.wifi_calling_mode_choices_without_wifi_only);
|
||||
mButtonWfcMode.setEntryValues(R.array.wifi_calling_mode_values_without_wifi_only);
|
||||
mButtonWfcMode.setEntrySummaries(R.array.wifi_calling_mode_summaries_without_wifi_only);
|
||||
|
||||
mButtonWfcRoamingMode.setEntries(
|
||||
R.array.wifi_calling_mode_choices_v2_without_wifi_only);
|
||||
mButtonWfcRoamingMode.setEntryValues(
|
||||
R.array.wifi_calling_mode_values_without_wifi_only);
|
||||
mButtonWfcRoamingMode.setEntrySummaries(
|
||||
R.array.wifi_calling_mode_summaries_without_wifi_only);
|
||||
}
|
||||
|
||||
|
||||
|
Reference in New Issue
Block a user