Snap for 9190355 from 6a8e193fad5d796171e47b8ce7f6e7960d8e2da4 to tm-qpr2-release (2ae91632) · Commits · e / os / android_packages_apps_Settings

res/values/strings.xml

+2 −0

Original line number	Diff line number	Diff line
		@@ -3359,6 +3359,8 @@
		<string name="screensaver_settings_title">Screen saver</string>
		<!-- List of synonyms used in the settings search bar to find the “Screen saver”. [CHAR LIMIT=NONE] -->
		<string name="keywords_screensaver">screensaver</string>
		<!-- Summary for screensaver unavailable when Bedtime mode is on [CHAR LIMIT=50] -->
		<string name="screensaver_settings_when_to_dream_bedtime">Unavailable because bedtime mode is on</string>
		<!-- The title for the toggle which disables/enables screen savers [CHAR_LIMIT=30] -->
		<string name="screensaver_settings_toggle_title">Use screen saver</string>
		<!-- Display settings screen, summary fragment for screen saver options, activated when docked or asleep and charging [CHAR LIMIT=35] -->

src/com/android/settings/display/ScreenSaverPreferenceController.java

+10 −1

Original line number	Diff line number	Diff line
		@@ -18,6 +18,7 @@ import android.os.UserManager;

		import androidx.preference.Preference;

		import com.android.settings.R;
		import com.android.settings.core.PreferenceControllerMixin;
		import com.android.settings.dream.DreamSettings;
		import com.android.settingslib.core.AbstractPreferenceController;
		@@ -26,9 +27,12 @@ public class ScreenSaverPreferenceController extends AbstractPreferenceControlle
		PreferenceControllerMixin {

		private static final String KEY_SCREEN_SAVER = "screensaver";
		private final boolean mDreamsDisabledByAmbientModeSuppression;

		public ScreenSaverPreferenceController(Context context) {
		super(context);
		mDreamsDisabledByAmbientModeSuppression = context.getResources().getBoolean(
		com.android.internal.R.bool.config_dreamsDisabledByAmbientModeSuppressionConfig);
		}

		@Override
		@@ -47,8 +51,13 @@ public class ScreenSaverPreferenceController extends AbstractPreferenceControlle

		@Override
		public void updateState(Preference preference) {
		if (mDreamsDisabledByAmbientModeSuppression
		&& AmbientDisplayAlwaysOnPreferenceController.isAodSuppressedByBedtime(mContext)) {
		preference.setSummary(R.string.screensaver_settings_when_to_dream_bedtime);
		} else {
		preference.setSummary(DreamSettings.getSummaryTextWithDreamName(mContext));
		}
		}

		private boolean isSystemUser() {
		final UserManager userManager = mContext.getSystemService(UserManager.class);

src/com/android/settings/dream/WhenToDreamPreferenceController.java

+20 −2

Original line number	Diff line number	Diff line
		@@ -20,7 +20,10 @@ import android.content.Context;

		import androidx.preference.Preference;

		import com.android.internal.annotations.VisibleForTesting;
		import com.android.settings.R;
		import com.android.settings.core.PreferenceControllerMixin;
		import com.android.settings.display.AmbientDisplayAlwaysOnPreferenceController;
		import com.android.settingslib.core.AbstractPreferenceController;
		import com.android.settingslib.dream.DreamBackend;

		@@ -29,19 +32,34 @@ public class WhenToDreamPreferenceController extends AbstractPreferenceControlle

		private static final String WHEN_TO_START = "when_to_start";
		private final DreamBackend mBackend;
		private final boolean mDreamsDisabledByAmbientModeSuppression;

		WhenToDreamPreferenceController(Context context) {
		this(context, context.getResources().getBoolean(
		com.android.internal.R.bool.config_dreamsDisabledByAmbientModeSuppressionConfig));
		}

		@VisibleForTesting
		WhenToDreamPreferenceController(Context context,
		boolean dreamsDisabledByAmbientModeSuppression) {
		super(context);

		mBackend = DreamBackend.getInstance(context);
		mDreamsDisabledByAmbientModeSuppression = dreamsDisabledByAmbientModeSuppression;
		}

		@Override
		public void updateState(Preference preference) {
		super.updateState(preference);

		int resId = DreamSettings.getDreamSettingDescriptionResId(mBackend.getWhenToDreamSetting());
		preference.setSummary(preference.getContext().getString(resId));
		if (mDreamsDisabledByAmbientModeSuppression
		&& AmbientDisplayAlwaysOnPreferenceController.isAodSuppressedByBedtime(mContext)) {
		preference.setSummary(R.string.screensaver_settings_when_to_dream_bedtime);
		} else {
		final int resId = DreamSettings.getDreamSettingDescriptionResId(
		mBackend.getWhenToDreamSetting());
		preference.setSummary(resId);
		}
		}

		@Override

src/com/android/settings/network/UiccSlotUtil.java

+26 −1

Original line number	Diff line number	Diff line
		@@ -28,7 +28,6 @@ import android.telephony.UiccSlotMapping;
		import android.util.Log;

		import com.android.internal.annotations.VisibleForTesting;
		import com.android.internal.telephony.uicc.UiccController;
		import com.android.settingslib.utils.ThreadUtils;

		import com.google.common.collect.ImmutableList;
		@@ -273,6 +272,7 @@ public class UiccSlotUtil {
		if (slotId == INVALID_PHYSICAL_SLOT_ID) {
		for (int i = 0; i < slots.length; i++) {
		if (slots[i].isRemovable()
		&& !slots[i].getIsEuicc()
		&& !slots[i].getPorts().stream().findFirst().get().isActive()
		&& slots[i].getCardStateInfo() != UiccSlotInfo.CARD_STATE_INFO_ERROR
		&& slots[i].getCardStateInfo() != UiccSlotInfo.CARD_STATE_INFO_RESTRICTED) {
		@@ -413,4 +413,29 @@ public class UiccSlotUtil {
		.findFirst()
		.orElse(INVALID_LOGICAL_SLOT_ID);
		}

		/**
		* Return whether the removable psim is enabled.
		*
		* @param telMgr is a TelephonyManager.
		* @return whether the removable psim is enabled.
		*/
		public static boolean isRemovableSimEnabled(TelephonyManager telMgr) {
		if (telMgr == null) {
		return false;
		}
		ImmutableList<UiccSlotInfo> slotInfos = UiccSlotUtil.getSlotInfos(telMgr);
		boolean isRemovableSimEnabled =
		slotInfos.stream()
		.anyMatch(
		slot -> slot != null
		&& slot.isRemovable()
		&& !slot.getIsEuicc()
		&& slot.getPorts().stream().anyMatch(
		port -> port.isActive())
		&& slot.getCardStateInfo()
		== UiccSlotInfo.CARD_STATE_INFO_PRESENT);
		Log.i(TAG, "isRemovableSimEnabled: " + isRemovableSimEnabled);
		return isRemovableSimEnabled;
		}
		}

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

+1 −15

Original line number	Diff line number	Diff line
		@@ -24,7 +24,6 @@ import android.telephony.SubscriptionInfo;
		import android.telephony.SubscriptionManager;
		import android.telephony.TelephonyManager;
		import android.telephony.UiccCardInfo;
		import android.telephony.UiccSlotInfo;
		import android.text.TextUtils;
		import android.util.Log;
		import android.view.View;
		@@ -39,8 +38,6 @@ import com.android.settings.network.SwitchToRemovableSlotSidecar;
		import com.android.settings.network.UiccSlotUtil;
		import com.android.settings.sim.SimActivationNotifier;

		import com.google.common.collect.ImmutableList;

		import java.util.ArrayList;
		import java.util.List;
		import java.util.stream.Collectors;
		@@ -586,18 +583,7 @@ public class ToggleSubscriptionDialogActivity extends SubscriptionActionDialogAc
		}

		private boolean isRemovableSimEnabled() {
		ImmutableList<UiccSlotInfo> slotInfos = UiccSlotUtil.getSlotInfos(mTelMgr);
		boolean isRemovableSimEnabled =
		slotInfos.stream()
		.anyMatch(
		slot -> slot != null
		&& slot.isRemovable()
		&& slot.getPorts().stream().anyMatch(
		port -> port.isActive())
		&& slot.getCardStateInfo()
		== UiccSlotInfo.CARD_STATE_INFO_PRESENT);
		Log.i(TAG, "isRemovableSimEnabled: " + isRemovableSimEnabled);
		return isRemovableSimEnabled;
		return UiccSlotUtil.isRemovableSimEnabled(mTelMgr);
		}

		private boolean isMultipleEnabledProfilesSupported() {