Merge "[Wi-Fi] Add IMSI privacy protection warning summary" into rvc-dev (0a98937b) · Commits · e / os / android_packages_apps_Settings

res/xml/wifi_network_details_fragment2.xml

+9 −1

Original line number	Diff line number	Diff line
		@@ -31,10 +31,18 @@
		android:selectable="false"
		settings:isPreferenceVisible="false"/>

		<!-- The preference to display the second summary -->
		<com.android.settings.widget.LinkifySummaryPreference
		android:key="second_summary"
		android:icon="@drawable/ic_info_outline_24dp"
		android:selectable="false"
		settings:allowDividerAbove="false"/>

		<!-- Buttons -->
		<com.android.settingslib.widget.ActionButtonsPreference
		android:key="buttons"
		android:selectable="false" />
		android:selectable="false"
		settings:allowDividerAbove="true"/>

		<!-- General Details Preferences -->
		<Preference

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

+0 −1

Original line number	Diff line number	Diff line
		@@ -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 → 100644

+60 −0

Original line number	Diff line number	Diff line
		/*
		* 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

+1 −3

Original line number	Diff line number	Diff line
		@@ -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

+6 −1

Original line number	Diff line number	Diff line
		@@ -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,