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

Commit 64ca18c5 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Tweak the UI display in the IPv6 address" into main

parents c31f3564 3233c71d

res/xml/wifi_network_details_fragment2.xml

+6 −10
Original line number Diff line number Diff line
@@ -169,15 +169,11 @@ 
                settings:enableCopying="true"/>

    </PreferenceCategory>



    <!-- IPv6 Details -->

    <PreferenceCategory

            android:key="ipv6_category"

            android:title="@string/wifi_details_ipv6_address_header"

            android:selectable="false">

    <!-- IPv6 address -->

    <Preference

        android:title="@string/wifi_details_ipv6_address_header"

        android:key="ipv6_addresses"

        android:selectable="false"

        settings:enableCopying="true"/>

    </PreferenceCategory>



</PreferenceScreen>

src/com/android/settings/wifi/details2/WifiDetailPreferenceController2.java

+3 −7
Original line number Diff line number Diff line
@@ -59,7 +59,6 @@ import android.widget.Toast; 
import androidx.annotation.VisibleForTesting;

import androidx.core.text.BidiFormatter;

import androidx.preference.Preference;

import androidx.preference.PreferenceCategory;

import androidx.preference.PreferenceFragmentCompat;

import androidx.preference.PreferenceScreen;

import androidx.recyclerview.widget.RecyclerView;
@@ -184,7 +183,6 @@ public class WifiDetailPreferenceController2 extends AbstractPreferenceControlle 
    private Preference mSubnetPref;

    private Preference mDnsPref;

    private Preference mTypePref;

    private PreferenceCategory mIpv6Category;

    private Preference mIpv6AddressPref;

    private final IconInjector mIconInjector;

    private final Clock mClock;
@@ -376,8 +374,6 @@ public class WifiDetailPreferenceController2 extends AbstractPreferenceControlle 
        mSubnetPref = screen.findPreference(KEY_SUBNET_MASK_PREF);

        mDnsPref = screen.findPreference(KEY_DNS_PREF);

        mTypePref = screen.findPreference(KEY_WIFI_TYPE_PREF);



        mIpv6Category = screen.findPreference(KEY_IPV6_CATEGORY);

        mIpv6AddressPref = screen.findPreference(KEY_IPV6_ADDRESSES_PREF);

    }
@@ -824,7 +820,7 @@ public class WifiDetailPreferenceController2 extends AbstractPreferenceControlle 
            mSubnetPref.setVisible(false);

            mGatewayPref.setVisible(false);

            mDnsPref.setVisible(false);

            mIpv6Category.setVisible(false);

            mIpv6AddressPref.setVisible(false);

            return;

        }
@@ -864,11 +860,11 @@ public class WifiDetailPreferenceController2 extends AbstractPreferenceControlle 
        updatePreference(mDnsPref, dnsServers);



        if (ipv6Addresses.length() > 0) {

            mIpv6AddressPref.setVisible(true);

            mIpv6AddressPref.setSummary(

                    BidiFormatter.getInstance().unicodeWrap(ipv6Addresses.toString()));

            mIpv6Category.setVisible(true);

        } else {

            mIpv6Category.setVisible(false);

            mIpv6AddressPref.setVisible(false);

        }

    }