Loading res/values/strings.xml +2 −4 Original line number Diff line number Diff line Loading @@ -10638,7 +10638,7 @@ <string name="operator_warning">Carrier data accounting may differ from device accounting</string> <!-- A summary shown on data usage screens to indicate data tracking excluded from carrier networks [CHAR LIMIT=NONE] --> <string name="non_carrier_data_usage_warning">Excludes data that is used by carrier networks</string> <string name="non_carrier_data_usage_warning">Excludes data used by carrier networks</string> <!-- Format string describing how much data has been used [CHAR LIMIT=20] --> <string name="data_used_template"><xliff:g name="amount" example="1 GB">%1$s</xliff:g> used</string> Loading Loading @@ -12639,7 +12639,7 @@ <!-- Provider Model: No SIM status in summary for Calls & SMS --> <string name="calls_sms_no_sim">No SIM</string> <!-- Network & internet preferences title [CHAR LIMIT=NONE] --> <string name="network_and_internet_preferences_title">Preferences</string> <string name="network_and_internet_preferences_title">Network preferences</string> <!-- Network & internet preferences summary [CHAR LIMIT=NONE] --> <string name="network_and_internet_preferences_summary">Connect to public networks</string> <!-- Search keywords for "Internet" settings [CHAR_LIMIT=NONE] --> Loading @@ -12666,8 +12666,6 @@ <string name="airplane_mode_network_available">Airplane mode networks available</string> <!-- Summary for warning to disconnect ethernet first then switch to other networks. [CHAR LIMIT=60] --> <string name="to_switch_networks_disconnect_ethernet">To switch networks, disconnect ethernet</string> <!-- Summary for cannot switch networks to Wi-Fi nor mobile data networks while connected to an ethernet network. [CHAR LIMIT=60] --> <string name="cannot_switch_networks_while_connected">Cannot switch networks while connected</string> <!-- Title for airplane mode network panel. [CHAR LIMIT=60] --> <string name="airplane_mode_network_panel_title">Airplane mode networks</string> res/xml/network_provider_settings.xml +1 −1 Original line number Diff line number Diff line Loading @@ -39,7 +39,7 @@ <Preference android:key="connected_ethernet_network" android:title="@string/ethernet" android:summary="@string/cannot_switch_networks_while_connected" android:summary="@string/to_switch_networks_disconnect_ethernet" android:icon="@drawable/ic_settings_ethernet"/> <PreferenceCategory Loading src/com/android/settings/network/ProviderModelSlice.java +1 −1 Original line number Diff line number Diff line Loading @@ -257,7 +257,7 @@ public class ProviderModelSlice extends WifiSlice { } return rowBuilder .setTitle(mContext.getText(R.string.ethernet)) .setSubtitle(mContext.getText(R.string.cannot_switch_networks_while_connected)); .setSubtitle(mContext.getText(R.string.to_switch_networks_disconnect_ethernet)); } /** Loading Loading
res/values/strings.xml +2 −4 Original line number Diff line number Diff line Loading @@ -10638,7 +10638,7 @@ <string name="operator_warning">Carrier data accounting may differ from device accounting</string> <!-- A summary shown on data usage screens to indicate data tracking excluded from carrier networks [CHAR LIMIT=NONE] --> <string name="non_carrier_data_usage_warning">Excludes data that is used by carrier networks</string> <string name="non_carrier_data_usage_warning">Excludes data used by carrier networks</string> <!-- Format string describing how much data has been used [CHAR LIMIT=20] --> <string name="data_used_template"><xliff:g name="amount" example="1 GB">%1$s</xliff:g> used</string> Loading Loading @@ -12639,7 +12639,7 @@ <!-- Provider Model: No SIM status in summary for Calls & SMS --> <string name="calls_sms_no_sim">No SIM</string> <!-- Network & internet preferences title [CHAR LIMIT=NONE] --> <string name="network_and_internet_preferences_title">Preferences</string> <string name="network_and_internet_preferences_title">Network preferences</string> <!-- Network & internet preferences summary [CHAR LIMIT=NONE] --> <string name="network_and_internet_preferences_summary">Connect to public networks</string> <!-- Search keywords for "Internet" settings [CHAR_LIMIT=NONE] --> Loading @@ -12666,8 +12666,6 @@ <string name="airplane_mode_network_available">Airplane mode networks available</string> <!-- Summary for warning to disconnect ethernet first then switch to other networks. [CHAR LIMIT=60] --> <string name="to_switch_networks_disconnect_ethernet">To switch networks, disconnect ethernet</string> <!-- Summary for cannot switch networks to Wi-Fi nor mobile data networks while connected to an ethernet network. [CHAR LIMIT=60] --> <string name="cannot_switch_networks_while_connected">Cannot switch networks while connected</string> <!-- Title for airplane mode network panel. [CHAR LIMIT=60] --> <string name="airplane_mode_network_panel_title">Airplane mode networks</string>
res/xml/network_provider_settings.xml +1 −1 Original line number Diff line number Diff line Loading @@ -39,7 +39,7 @@ <Preference android:key="connected_ethernet_network" android:title="@string/ethernet" android:summary="@string/cannot_switch_networks_while_connected" android:summary="@string/to_switch_networks_disconnect_ethernet" android:icon="@drawable/ic_settings_ethernet"/> <PreferenceCategory Loading
src/com/android/settings/network/ProviderModelSlice.java +1 −1 Original line number Diff line number Diff line Loading @@ -257,7 +257,7 @@ public class ProviderModelSlice extends WifiSlice { } return rowBuilder .setTitle(mContext.getText(R.string.ethernet)) .setSubtitle(mContext.getText(R.string.cannot_switch_networks_while_connected)); .setSubtitle(mContext.getText(R.string.to_switch_networks_disconnect_ethernet)); } /** Loading