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

[Wi-Fi] Apply new mock for supporting WiFi detail page for OpenRoaming feature.

Browse Source 
Issue: Openroaming detail page have new UI Mock.
Solution: Apply the mock design to rollback previous UI and add one Subcription preference.

Bug: 146669261
Test: manually push API and check.
Change-Id: Ie3243c9bcd371db1909834ef257c741454abec11
This commit is contained in:
govenliu
2020-02-24 15:31:34 +08:00
parent 34fdec2668
commit 7d8d8d3400
8 changed files with 24 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
res/values/strings.xml
View File

@@ -2029,8 +2029,10 @@
<string name="wifi_ip_settings">IP settings</string>
<!-- Label for the spinner to show Wifi MAC randomization [CHAR LIMIT=25] -->
<string name="wifi_privacy_settings">Privacy</string>
<!-- Label for the subscription detail preference. [CHAR LIMIT=32] -->
<string name="wifi_subscription_detail">Subscription details</string>
<!-- Label for the subscription preference. [CHAR LIMIT=32] -->
<string name="wifi_subscription">Subscription</string>
<!-- Summary text for the subscription preference. [CHAR LIMIT=NONE] -->
<string name="wifi_subscription_summary">View or change subscription</string>
<!-- Summary for Wifi MAC randomization option when it is ephemeral network [CHAR LIMIT=50] -->
<string name="wifi_privacy_settings_ephemeral_summary">Randomized MAC</string>
<!-- Title for the fragment to add a device into the wifi network [CHAR LIMIT=50] -->

11
res/xml/wifi_network_details_fragment2.xml
View File

@@ -69,6 +69,12 @@
android:entries="@array/wifi_privacy_entries"
android:entryValues="@array/wifi_privacy_values"/>
<Preference
android:key="subscription_detail"
android:title="@string/wifi_subscription"
android:summary="@string/wifi_subscription_summary"
settings:allowDividerAbove="true"/>
<SwitchPreference
android:key="auto_connect"
android:title="@string/wifi_auto_connect_title"
@@ -139,9 +145,4 @@
settings:enableCopying="true"/>
</PreferenceCategory>
<Preference
android:key="subscription_detail"
android:title="@string/wifi_subscription_detail"
settings:allowDividerAbove="true"/>
</PreferenceScreen>

7
src/com/android/settings/wifi/details2/AddDevicePreferenceController2.java
View File

@@ -51,11 +51,8 @@ public class AddDevicePreferenceController2 extends BasePreferenceController {
@Override
public int getAvailabilityStatus() {
if (!WifiDppUtils.isSupportConfiguratorQrCodeScanner(mContext, mWifiEntry)
|| mWifiEntry.canManageSubscription()) {
return CONDITIONALLY_UNAVAILABLE;
}
return AVAILABLE;
return WifiDppUtils.isSupportConfiguratorQrCodeScanner(mContext, mWifiEntry) ? AVAILABLE
: CONDITIONALLY_UNAVAILABLE;
}
@Override

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

@@ -145,7 +145,6 @@ public class WifiDetailPreferenceController2 extends AbstractPreferenceControlle
static final String KEY_IPV6_CATEGORY = "ipv6_category";
@VisibleForTesting
static final String KEY_IPV6_ADDRESSES_PREF = "ipv6_addresses";
static final String KEY_IP_DETAILS_CATEGORY = "ip_details_category";
private final WifiEntry mWifiEntry;
private final ConnectivityManager mConnectivityManager;
@@ -165,7 +164,6 @@ public class WifiDetailPreferenceController2 extends AbstractPreferenceControlle
private ActionButtonsPreference mButtonsPref;
private EntityHeaderController mEntityHeaderController;
private Preference mSignalStrengthPref;
private PreferenceCategory mIpDetailsCategory;
private Preference mTxLinkSpeedPref;
private Preference mRxLinkSpeedPref;
private Preference mFrequencyPref;
@@ -196,9 +194,7 @@ public class WifiDetailPreferenceController2 extends AbstractPreferenceControlle
mLinkProperties = lp;
refreshEntityHeader();
refreshButtons();
if (!mWifiEntry.canManageSubscription()) {
refreshIpLayerInfo();
}
refreshIpLayerInfo();
}
}
@@ -238,9 +234,7 @@ public class WifiDetailPreferenceController2 extends AbstractPreferenceControlle
}
mNetworkCapabilities = nc;
refreshButtons();
if (!mWifiEntry.canManageSubscription()) {
refreshIpLayerInfo();
}
refreshIpLayerInfo();
}
}
@@ -335,7 +329,6 @@ public class WifiDetailPreferenceController2 extends AbstractPreferenceControlle
updateCaptivePortalButton();
mSignalStrengthPref = screen.findPreference(KEY_SIGNAL_STRENGTH_PREF);
mIpDetailsCategory = screen.findPreference(KEY_IP_DETAILS_CATEGORY);
mTxLinkSpeedPref = screen.findPreference(KEY_TX_LINK_SPEED);
mRxLinkSpeedPref = screen.findPreference(KEY_RX_LINK_SPEED);
mFrequencyPref = screen.findPreference(KEY_FREQUENCY_PREF);
@@ -351,13 +344,6 @@ public class WifiDetailPreferenceController2 extends AbstractPreferenceControlle
mIpv6Category = screen.findPreference(KEY_IPV6_CATEGORY);
mIpv6AddressPref = screen.findPreference(KEY_IPV6_ADDRESSES_PREF);
if (mWifiEntry.canManageSubscription()) {
mIpDetailsCategory.setVisible(false);
mIpv6Category.setVisible(false);
mSignalStrengthPref.setVisible(false);
mFrequencyPref.setVisible(false);
mSecurityPref.setVisible(false);
}
mSecurityPref.setSummary(mWifiEntry.getSecurityString(false /* concise */));
}
@@ -505,16 +491,10 @@ public class WifiDetailPreferenceController2 extends AbstractPreferenceControlle
// refresh header
refreshEntityHeader();
refreshEntityHeaderIcon();
// refresh Buttons
refreshButtons();
// When support manage subscription, there won't have any detail information, so don't
// need to update those detail UIs.
if (mWifiEntry.canManageSubscription()) {
return;
}
// Update Connection Header icon and Signal Strength Preference
refreshRssiViews();
// Frequency Pref
@@ -531,11 +511,7 @@ public class WifiDetailPreferenceController2 extends AbstractPreferenceControlle
refreshMacAddress();
}
private void refreshEntityHeaderIcon() {
if (mEntityHeaderController == null) {
return;
}
private void refreshRssiViews() {
int signalLevel = mWifiEntry.getLevel();
// Disappears signal view if not in range. e.g. for saved networks.
@@ -550,23 +526,13 @@ public class WifiDetailPreferenceController2 extends AbstractPreferenceControlle
}
mRssiSignalLevel = signalLevel;
Drawable wifiIcon = mIconInjector.getIcon(mRssiSignalLevel);
mEntityHeaderController
.setIcon(redrawIconForHeader(wifiIcon)).done(mFragment.getActivity(),
true /* rebind */);
}
private void refreshRssiViews() {
int signalLevel = mWifiEntry.getLevel();
// Disappears signal view if not in range. e.g. for saved networks.
if (signalLevel == WifiEntry.WIFI_LEVEL_UNREACHABLE) {
mSignalStrengthPref.setVisible(false);
mRssiSignalLevel = -1;
return;
if (mEntityHeaderController != null) {
mEntityHeaderController
.setIcon(redrawIconForHeader(wifiIcon)).done(mFragment.getActivity(),
true /* rebind */);
}
mRssiSignalLevel = signalLevel;
Drawable wifiIcon = mIconInjector.getIcon(mRssiSignalLevel);
Drawable wifiIconDark = wifiIcon.getConstantState().newDrawable().mutate();
wifiIconDark.setTintList(Utils.getColorAttr(mContext, android.R.attr.colorControlNormal));
mSignalStrengthPref.setIcon(wifiIconDark);

2
src/com/android/settings/wifi/details2/WifiMeteredPreferenceController2.java
View File

@@ -55,7 +55,7 @@ public class WifiMeteredPreferenceController2 extends BasePreferenceController i
@Override
public int getAvailabilityStatus() {
return mWifiEntry.canManageSubscription() ? CONDITIONALLY_UNAVAILABLE : AVAILABLE;
return AVAILABLE;
}
@Override

4
src/com/android/settings/wifi/details2/WifiNetworkDetailsFragment2.java
View File

@@ -115,10 +115,6 @@ public class WifiNetworkDetailsFragment2 extends DashboardFragment implements
@Override
public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
if (mNetworkDetailsTracker.getWifiEntry().canManageSubscription()) {
return;
}
MenuItem item = menu.add(0, Menu.FIRST, 0, R.string.wifi_modify);
item.setIcon(com.android.internal.R.drawable.ic_mode_edit);
item.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);

7
src/com/android/settings/wifi/details2/WifiPrivacyPreferenceController2.java
View File

@@ -55,11 +55,8 @@ public class WifiPrivacyPreferenceController2 extends BasePreferenceController i
@Override
public int getAvailabilityStatus() {
if (!mWifiManager.isConnectedMacRandomizationSupported()
|| mWifiEntry.canManageSubscription()) {
return CONDITIONALLY_UNAVAILABLE;
}
return AVAILABLE;
return mWifiManager.isConnectedMacRandomizationSupported()
? AVAILABLE : CONDITIONALLY_UNAVAILABLE;
}
@Override

6
src/com/android/settings/wifi/details2/WifiSubscriptionDetailPreferenceController2.java
View File

@@ -41,11 +41,7 @@ public class WifiSubscriptionDetailPreferenceController2 extends BasePreferenceC
@Override
public int getAvailabilityStatus() {
if (mWifiEntry.canManageSubscription()) {
return AVAILABLE;
}
return CONDITIONALLY_UNAVAILABLE;
return mWifiEntry.canManageSubscription() ? AVAILABLE : CONDITIONALLY_UNAVAILABLE;
}
@Override