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

Commit 7648de1e authored by Meng Wang's avatar Meng Wang Committed by Android (Google) Code Review
Browse files

Merge "Wi-Fi Calling settings UI update" into nyc-mr1-dev

parents 0fa8dc1b 0dc43113

res/values/strings.xml

+1 −0
Original line number Diff line number Diff line
@@ -1984,6 +1984,7 @@ 
    <!-- Wi-Fi Calling settings. Text displayed when Wi-Fi Calling is off -->

    <string name="wifi_calling_off_explanation">When Wi-Fi calling is on, your phone can route calls via Wi-Fi networks or your carrier\u2019s network, depending on your preference and which signal is stronger. Before turning on this feature, check with your carrier regarding fees and other details.</string>

    <string name="emergency_address_title">Update Emergency Address</string>

    <string name="emergency_address_summary">Address used by emergency services as your location if you make a 911 call using WiFi</string>





























    <!-- Sound and alerts settings -->

































res/xml/wifi_calling_settings.xml



+1
−1




























Original line number
Diff line number
Diff line








@@ -29,7 +29,7 @@













    <Preference















        android:key="emergency_address_key"















        android:title="@string/emergency_address_title"













        android:summary="@string/emergency_address_title">













        android:summary="@string/emergency_address_summary">















    </Preference>































</PreferenceScreen>
























src/com/android/settings/WifiCallingSettings.java



+11
−1




























Original line number
Diff line number
Diff line








@@ -60,10 +60,16 @@ public class WifiCallingSettings extends SettingsPreferenceFragment





























    private static final int REQUEST_CHECK_WFC_EMERGENCY_ADDRESS = 1;





























    public static final String EXTRA_LAUNCH_CARRIER_APP = "EXTRA_LAUNCH_CARRIER_APP";



























    public static final int LAUCH_APP_ACTIVATE = 0;













    public static final int LAUCH_APP_UPDATE = 1;





























    //UI objects















    private SwitchBar mSwitchBar;















    private Switch mSwitch;















    private ListPreference mButtonWfcMode;













    private Preference mUpdateAddress;















    private TextView mEmptyView;































    private boolean mValidListener = false;










@@ -106,6 +112,7 @@ public class WifiCallingSettings extends SettingsPreferenceFragment













                    final Context context = getActivity();















                    Intent carrierAppIntent = getCarrierActivityIntent(context);















                    if (carrierAppIntent != null) {













                        carrierAppIntent.putExtra(EXTRA_LAUNCH_CARRIER_APP, LAUCH_APP_UPDATE);















                        startActivity(carrierAppIntent);















                    }















                    return true;










@@ -185,7 +192,7 @@ public class WifiCallingSettings extends SettingsPreferenceFragment













        mButtonWfcMode = (ListPreference) findPreference(BUTTON_WFC_MODE);















        mButtonWfcMode.setOnPreferenceChangeListener(this);





























        Preference mUpdateAddress = (Preference) findPreference(PREFERENCE_EMERGENCY_ADDRESS);













        mUpdateAddress = (Preference) findPreference(PREFERENCE_EMERGENCY_ADDRESS);















        mUpdateAddress.setOnPreferenceClickListener(mUpdateAddressListener);































        mIntentFilter = new IntentFilter();










@@ -274,6 +281,7 @@ public class WifiCallingSettings extends SettingsPreferenceFragment













        // Call address management activity before turning on WFC















        Intent carrierAppIntent = getCarrierActivityIntent(context);















        if (carrierAppIntent != null) {













            carrierAppIntent.putExtra(EXTRA_LAUNCH_CARRIER_APP, LAUCH_APP_ACTIVATE);















            startActivityForResult(carrierAppIntent, REQUEST_CHECK_WFC_EMERGENCY_ADDRESS);















        } else {















            updateWfcMode(context, true);










@@ -343,8 +351,10 @@ public class WifiCallingSettings extends SettingsPreferenceFragment













        final PreferenceScreen preferenceScreen = getPreferenceScreen();















        if (wfcEnabled) {















            preferenceScreen.addPreference(mButtonWfcMode);













            preferenceScreen.addPreference(mUpdateAddress);















        } else {















            preferenceScreen.removePreference(mButtonWfcMode);













            preferenceScreen.removePreference(mUpdateAddress);















        }















        preferenceScreen.setEnabled(mEditableWfcMode);















    }