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

Commit b852f6de authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Bidi wrap ip address in Wifi config settings"

parents 080950be 0d8ae943

res/xml/wifi_network_details_fragment.xml

+1 −3
Original line number Diff line number Diff line
@@ -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"

src/com/android/settings/wifi/WifiInfoPreferenceController.java

+2 −1
Original line number Diff line number Diff line
@@ -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));

        }

    }

src/com/android/settings/wifi/details/WifiDetailPreferenceController.java

+3 −1
Original line number Diff line number Diff line
@@ -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);