Merge "[Wi-Fi] Add IMSI privacy protection warning summary" into rvc-dev am: 0a98937baf

Change-Id: I061f46e5d5c3f42d8265ad490858398469f0a6b6

src/com/android/settings/widget/EntityHeaderController.java

@@ -374,7 +374,6 @@ public class EntityHeaderController {
         }
     }
 
-
     private void setText(@IdRes int id, CharSequence text) {
         TextView textView = mHeader.findViewById(id);
         if (textView != null) {

src/com/android/settings/widget/LinkifySummaryPreference.java

@@ -0,0 +1,60 @@
+/*
+ * 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.widget;
+
+import android.content.Context;
+import android.text.SpannableString;
+import android.text.TextUtils;
+import android.text.method.LinkMovementMethod;
+import android.text.style.ClickableSpan;
+import android.util.AttributeSet;
+import android.view.View;
+import android.widget.TextView;
+
+import androidx.preference.Preference;
+import androidx.preference.PreferenceViewHolder;
+
+/** A preference which supports linkify text in the summary **/
+public class LinkifySummaryPreference extends Preference {
+
+    public LinkifySummaryPreference(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public LinkifySummaryPreference(Context context) {
+        super(context);
+    }
+
+    @Override
+    public void onBindViewHolder(PreferenceViewHolder holder) {
+        super.onBindViewHolder(holder);
+
+        final TextView summaryView = (TextView) holder.findViewById(android.R.id.summary);
+        if (summaryView == null || summaryView.getVisibility() != View.VISIBLE) {
+            return;
+        }
+
+        final CharSequence summary = getSummary();
+        if (!TextUtils.isEmpty(summary)) {
+            final SpannableString spannableSummary = new SpannableString(summary);
+            if (spannableSummary.getSpans(0, spannableSummary.length(), ClickableSpan.class)
+                    .length > 0) {
+                summaryView.setMovementMethod(LinkMovementMethod.getInstance());
+            }
+        }
+    }
+}

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

@@ -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 */);

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

@@ -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,

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

@@ -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;
+    }
+}