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

Merge "Bidi wrap ip address in Wifi config settings"

Browse Source
This commit is contained in:
TreeHugger Robot
2017-07-13 22:19:25 +00:00
committed by Android (Google) Code Review
parent 080950bed9 0d8ae943d2
commit b852f6de93
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
res/xml/wifi_network_details_fragment.xml
View File

@@ -14,9 +14,7 @@
limitations under the License.
-->
<PreferenceScreen
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:settings="http://schemas.android.com/apk/res/com.android.settings" >
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
<com.android.settings.applications.LayoutPreference
android:key="connection_header"

3
src/com/android/settings/wifi/WifiInfoPreferenceController.java
View File

@@ -22,6 +22,7 @@ import android.content.Intent;
import android.content.IntentFilter;
import android.net.wifi.WifiInfo;
import android.net.wifi.WifiManager;
import android.support.v4.text.BidiFormatter;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen;
import android.text.TextUtils;
@@ -104,7 +105,7 @@ public class WifiInfoPreferenceController extends AbstractPreferenceController
final String ipAddress = Utils.getWifiIpAddresses(mContext);
mWifiIpAddressPref.setSummary(ipAddress == null
? mContext.getString(R.string.status_unavailable)
: ipAddress);
: BidiFormatter.getInstance().unicodeWrap(ipAddress));
}
}

4
src/com/android/settings/wifi/details/WifiDetailPreferenceController.java
View File

@@ -40,6 +40,7 @@ import android.net.wifi.WifiConfiguration;
import android.net.wifi.WifiInfo;
import android.net.wifi.WifiManager;
import android.os.Handler;
import android.support.v4.text.BidiFormatter;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceCategory;
import android.support.v7.preference.PreferenceScreen;
@@ -443,7 +444,8 @@ public class WifiDetailPreferenceController extends AbstractPreferenceController
updatePreference(mDnsPref, dnsServers);
if (ipv6Addresses.length() > 0) {
mIpv6AddressPref.setSummary(ipv6Addresses.toString());
mIpv6AddressPref.setSummary(
BidiFormatter.getInstance().unicodeWrap(ipv6Addresses.toString()));
mIpv6Category.setVisible(true);
} else {
mIpv6Category.setVisible(false);