[Wi-Fi] Add IMSI privacy protection warning summary

If a SIM based Wi-Fi network is not provided with IMSI
protection, Wi-Fi detail UI shows the warning summary if
the Wi-Fi network is connected.

Bug: 148283447
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WifiSecondSummaryController2Test
      make RunSettingsRoboTests ROBOTEST_FILTER=LinkifySummaryPreferenceTest

Change-Id: I689a75d2f0a2ae6196b2ed5985b8ff141fbac8b4
This commit is contained in:
Arc Wang
2020-04-17 11:13:34 +08:00
parent f11da4c787
commit c6c4d036da
8 changed files with 289 additions and 6 deletions

View File

@@ -446,10 +446,8 @@ public class WifiDetailPreferenceController2 extends AbstractPreferenceControlle
if (usingDataUsageHeader(mContext)) {
mSummaryHeaderController.updateState(mDataUsageSummaryPref);
} else {
String summary = mWifiEntry.getSummary();
mEntityHeaderController
.setSummary(summary)
.setSummary(mWifiEntry.getSummary())
.setSecondSummary(getExpiryTimeSummary())
.setRecyclerView(mFragment.getListView(), mLifecycle)
.done(mFragment.getActivity(), true /* rebind */);

View File

@@ -140,7 +140,7 @@ public class WifiNetworkDetailsFragment2 extends DashboardFragment implements
getContext().getSystemService(Context.DEVICE_POLICY_SERVICE);
final UserManager um = (UserManager)
getContext().getSystemService(Context.USER_SERVICE);
int profileOwnerUserId = Utils.getManagedProfileId(
final int profileOwnerUserId = Utils.getManagedProfileId(
um, UserHandle.myUserId());
admin = new EnforcedAdmin(dpm.getProfileOwnerAsUser(profileOwnerUserId),
null, UserHandle.of(profileOwnerUserId));
@@ -162,6 +162,11 @@ public class WifiNetworkDetailsFragment2 extends DashboardFragment implements
setupNetworksDetailTracker();
final WifiEntry wifiEntry = mNetworkDetailsTracker.getWifiEntry();
final WifiSecondSummaryController2 wifiSecondSummaryController2 =
new WifiSecondSummaryController2(context);
wifiSecondSummaryController2.setWifiEntry(wifiEntry);
mControllers.add(wifiSecondSummaryController2);
mWifiDetailPreferenceController2 = WifiDetailPreferenceController2.newInstance(
wifiEntry,
cm,

View File

@@ -0,0 +1,51 @@
/*
* Copyright (C) 2020 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.android.settings.wifi.details2;
import android.content.Context;
import android.text.TextUtils;
import com.android.settings.core.BasePreferenceController;
import com.android.wifitrackerlib.WifiEntry;
/**
* {@link BasePreferenceController} that display the second summary. If users click the preference,
* @link ClickableSpan#onClick} of the first {@link ClickableSpan} in the summary will be called.
*/
public class WifiSecondSummaryController2 extends BasePreferenceController {
private static final String KEY_WIFI_SECOND_SUMMARY = "second_summary";
private CharSequence mSecondSummary;
public WifiSecondSummaryController2(Context context) {
super(context, KEY_WIFI_SECOND_SUMMARY);
}
public void setWifiEntry(WifiEntry wifiEntry) {
mSecondSummary = wifiEntry.getSecondSummary();
}
@Override
public int getAvailabilityStatus() {
return TextUtils.isEmpty(mSecondSummary) ? CONDITIONALLY_UNAVAILABLE : AVAILABLE;
}
@Override
public CharSequence getSummary() {
return mSecondSummary;
}
}