Merge "[Settings] Avoid rendering hidden preferences" am: b4b612a8e3 (ad9b5c3b) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/SettingsPreferenceFragment.java

+12 −0

Original line number	Diff line number	Diff line
		@@ -264,6 +264,18 @@ public abstract class SettingsPreferenceFragment extends InstrumentedPreferenceF
		return 0;
		}

		/**
		* Whether preference is allowing to be displayed to the user.
		*
		* @param preference to check if it can be displayed to the user (not hidding in expand area).
		* @return {@code true} when preference is allowing to be displayed to the user.
		* {@code false} when preference is hidden in expand area and not been displayed to the user.
		*/
		protected boolean isPreferenceExpanded(Preference preference) {
		return ((mAdapter == null)
		\|\| (mAdapter.getPreferenceAdapterPosition(preference) != RecyclerView.NO_POSITION));
		}

		protected void onDataSetChanged() {
		highlightPreferenceIfNeeded();
		updateEmptyView();

src/com/android/settings/dashboard/DashboardFragment.java

+7 −0

Original line number	Diff line number	Diff line
		@@ -313,6 +313,13 @@ public abstract class DashboardFragment extends SettingsPreferenceFragment
		controller -> controller.displayPreference(screen));
		}

		/**
		* Get current PreferenceController(s)
		*/
		protected Collection<List<AbstractPreferenceController>> getPreferenceControllers() {
		return mPreferenceControllers.values();
		}

		/**
		* Update state of each preference managed by PreferenceController.
		*/

src/com/android/settings/network/telephony/MobileNetworkSettings.java

+59 −10

Original line number	Diff line number	Diff line
		@@ -32,6 +32,10 @@ import android.view.Menu;
		import android.view.MenuInflater;
		import android.view.MenuItem;

		import androidx.annotation.VisibleForTesting;
		import androidx.preference.Preference;
		import androidx.preference.PreferenceScreen;

		import com.android.internal.telephony.TelephonyIntents;
		import com.android.settings.R;
		import com.android.settings.core.FeatureFlags;
		@@ -51,6 +55,7 @@ import com.android.settingslib.search.SearchIndexable;

		import java.util.ArrayList;
		import java.util.Arrays;
		import java.util.Collection;
		import java.util.List;

		import androidx.annotation.VisibleForTesting;
		@@ -78,6 +83,8 @@ public class MobileNetworkSettings extends RestrictedDashboardFragment {
		private UserManager mUserManager;
		private String mClickedPrefKey;

		private List<AbstractPreferenceController> mHiddenControllerList;

		public MobileNetworkSettings() {
		super(UserManager.DISALLOW_CONFIG_MOBILE_NETWORKS);
		}
		@@ -117,15 +124,15 @@ public class MobileNetworkSettings extends RestrictedDashboardFragment {
		protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
		mSubId = getArguments().getInt(Settings.EXTRA_SUB_ID,
		MobileNetworkUtils.getSearchableSubscriptionId(context));
		Log.i(LOG_TAG, "display subId: " + mSubId);

		if (FeatureFlagPersistent.isEnabled(getContext(), FeatureFlags.NETWORK_INTERNET_V2) &&
		mSubId != SubscriptionManager.INVALID_SUBSCRIPTION_ID) {
		if (!SubscriptionManager.isValidSubscriptionId(mSubId)) {
		return Arrays.asList();
		}
		return Arrays.asList(
		new DataUsageSummaryPreferenceController(getActivity(), getSettingsLifecycle(),
		this, mSubId));
		}
		return Arrays.asList();
		}

		@Override
		public void onAttach(Context context) {
		@@ -195,6 +202,50 @@ public class MobileNetworkSettings extends RestrictedDashboardFragment {
		onRestoreInstance(icicle);
		}

		@Override
		public void onExpandButtonClick() {
		final PreferenceScreen screen = getPreferenceScreen();
		mHiddenControllerList.stream()
		.filter(controller -> controller.isAvailable())
		.forEach(controller -> {
		final String key = controller.getPreferenceKey();
		final Preference preference = screen.findPreference(key);
		controller.updateState(preference);
		});
		super.onExpandButtonClick();
		}

		/*
		* Replace design within {@link DashboardFragment#updatePreferenceStates()}
		*/
		@Override
		protected void updatePreferenceStates() {
		mHiddenControllerList = new ArrayList<AbstractPreferenceController>();

		final PreferenceScreen screen = getPreferenceScreen();
		final Collection<List<AbstractPreferenceController>> controllerLists =
		getPreferenceControllers();
		controllerLists.stream().flatMap(Collection::stream)
		.forEach(controller -> {
		final String key = controller.getPreferenceKey();
		if (TextUtils.isEmpty(key)) {
		return;
		}
		final Preference preference = screen.findPreference(key);
		if (preference == null) {
		return;
		}
		if (!isPreferenceExpanded(preference)) {
		mHiddenControllerList.add(controller);
		return;
		}
		if (!controller.isAvailable()) {
		return;
		}
		controller.updateState(preference);
		});
		}

		@VisibleForTesting
		void onRestoreInstance(Bundle icicle) {
		if (icicle != null) {
		@@ -250,8 +301,7 @@ public class MobileNetworkSettings extends RestrictedDashboardFragment {

		@Override
		public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
		if (FeatureFlagPersistent.isEnabled(getContext(), FeatureFlags.NETWORK_INTERNET_V2) &&
		mSubId != SubscriptionManager.INVALID_SUBSCRIPTION_ID) {
		if (SubscriptionManager.isValidSubscriptionId(mSubId)) {
		final MenuItem item = menu.add(Menu.NONE, R.id.edit_sim_name, Menu.NONE,
		R.string.mobile_network_sim_name);
		item.setIcon(com.android.internal.R.drawable.ic_mode_edit);
		@@ -262,8 +312,7 @@ public class MobileNetworkSettings extends RestrictedDashboardFragment {

		@Override
		public boolean onOptionsItemSelected(MenuItem menuItem) {
		if (FeatureFlagPersistent.isEnabled(getContext(), FeatureFlags.NETWORK_INTERNET_V2) &&
		mSubId != SubscriptionManager.INVALID_SUBSCRIPTION_ID) {
		if (SubscriptionManager.isValidSubscriptionId(mSubId)) {
		if (menuItem.getItemId() == R.id.edit_sim_name) {
		RenameMobileNetworkDialogFragment.newInstance(mSubId).show(
		getFragmentManager(), RenameMobileNetworkDialogFragment.TAG);