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

Tweak the UI display in the IPv6 address

Browse Source 
- Replace the PreferenceCategory with Preference.

Fixes: 246489166
Test: SettingsRoboTests:com.android.settings.wifi
Change-Id: Ide4d36e7ad5c0850cd53010c811e01714c1c1f76
This commit is contained in:
Sunny Shao
2023-11-13 15:38:30 +08:00
parent 05104fc8ff
commit 3233c71d6e
2 changed files with 9 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
res/xml/wifi_network_details_fragment2.xml
View File

@@ -169,15 +169,11 @@
settings:enableCopying="true"/> settings:enableCopying="true"/>
</PreferenceCategory> </PreferenceCategory>
<!-- IPv6 Details --> <!-- IPv6 address -->
<PreferenceCategory
android:key="ipv6_category"
android:title="@string/wifi_details_ipv6_address_header"
android:selectable="false">
<Preference <Preference
android:title="@string/wifi_details_ipv6_address_header"
android:key="ipv6_addresses" android:key="ipv6_addresses"
android:selectable="false" android:selectable="false"
settings:enableCopying="true"/> settings:enableCopying="true"/>
</PreferenceCategory>
</PreferenceScreen> </PreferenceScreen>

10
src/com/android/settings/wifi/details2/WifiDetailPreferenceController2.java
View File

@@ -59,7 +59,6 @@ import android.widget.Toast;
import androidx.annotation.VisibleForTesting; import androidx.annotation.VisibleForTesting;
import androidx.core.text.BidiFormatter; import androidx.core.text.BidiFormatter;
import androidx.preference.Preference; import androidx.preference.Preference;
import androidx.preference.PreferenceCategory;
import androidx.preference.PreferenceFragmentCompat; import androidx.preference.PreferenceFragmentCompat;
import androidx.preference.PreferenceScreen; import androidx.preference.PreferenceScreen;
import androidx.recyclerview.widget.RecyclerView; import androidx.recyclerview.widget.RecyclerView;
@@ -184,7 +183,6 @@ public class WifiDetailPreferenceController2 extends AbstractPreferenceControlle
private Preference mSubnetPref; private Preference mSubnetPref;
private Preference mDnsPref; private Preference mDnsPref;
private Preference mTypePref; private Preference mTypePref;
private PreferenceCategory mIpv6Category;
private Preference mIpv6AddressPref; private Preference mIpv6AddressPref;
private final IconInjector mIconInjector; private final IconInjector mIconInjector;
private final Clock mClock; private final Clock mClock;
@@ -376,8 +374,6 @@ public class WifiDetailPreferenceController2 extends AbstractPreferenceControlle
mSubnetPref = screen.findPreference(KEY_SUBNET_MASK_PREF); mSubnetPref = screen.findPreference(KEY_SUBNET_MASK_PREF);
mDnsPref = screen.findPreference(KEY_DNS_PREF); mDnsPref = screen.findPreference(KEY_DNS_PREF);
mTypePref = screen.findPreference(KEY_WIFI_TYPE_PREF); mTypePref = screen.findPreference(KEY_WIFI_TYPE_PREF);
mIpv6Category = screen.findPreference(KEY_IPV6_CATEGORY);
mIpv6AddressPref = screen.findPreference(KEY_IPV6_ADDRESSES_PREF); mIpv6AddressPref = screen.findPreference(KEY_IPV6_ADDRESSES_PREF);
} }
@@ -824,7 +820,7 @@ public class WifiDetailPreferenceController2 extends AbstractPreferenceControlle
mSubnetPref.setVisible(false); mSubnetPref.setVisible(false);
mGatewayPref.setVisible(false); mGatewayPref.setVisible(false);
mDnsPref.setVisible(false); mDnsPref.setVisible(false);
mIpv6Category.setVisible(false); mIpv6AddressPref.setVisible(false);
return; return;
} }
@@ -864,11 +860,11 @@ public class WifiDetailPreferenceController2 extends AbstractPreferenceControlle
updatePreference(mDnsPref, dnsServers); updatePreference(mDnsPref, dnsServers);
if (ipv6Addresses.length() > 0) { if (ipv6Addresses.length() > 0) {
mIpv6AddressPref.setVisible(true);
mIpv6AddressPref.setSummary( mIpv6AddressPref.setSummary(
BidiFormatter.getInstance().unicodeWrap(ipv6Addresses.toString())); BidiFormatter.getInstance().unicodeWrap(ipv6Addresses.toString()));
mIpv6Category.setVisible(true);
} else { } else {
mIpv6Category.setVisible(false); mIpv6AddressPref.setVisible(false);
} }
} }