Snap for 4759746 from f249555f97cf3a5cd128774bd4338d83e455e772 to pi-release (1548076f) · Commits · e / os / android_packages_apps_Settings

res/values/strings.xml

+2 −2

Original line number	Diff line number	Diff line
		@@ -7365,9 +7365,9 @@
		<!-- Do not disturb onboarding dialog, do not accept new settings [CHAR LIMIT=30]-->
		<string name="zen_onboarding_no_update">Don\'t update</string>
		<!-- Do not disturb onboarding dialog, description of new settings [CHAR LIMIT=NONE]-->
		<string name="zen_onboarding_dnd_visual_disturbances_description">Your phone mutes sounds & vibrations\n\nUpdate settings to also:\n\n- Hide notifications\n\n- Only show calls from starred contacts</string>
		<string name="zen_onboarding_dnd_visual_disturbances_description">Your phone can do more to help you focus.\n\nUpdate settings to:\n\n- Hide notifications completely\n\n- Allow calls from starred contacts and repeat callers</string>
		<!-- Do not disturb onboarding dialog, header prompt for settings [CHAR LIMIT=80]-->
		<string name="zen_onboarding_dnd_visual_disturbances_header">Update your Do Not Disturb settings?</string>
		<string name="zen_onboarding_dnd_visual_disturbances_header">Update Do Not Disturb?</string>

		<!-- obsolete -->
		<string name="zen_onboarding_settings">Settings</string>

src/com/android/settings/RestrictedListPreference.java

+36 −1

Original line number	Diff line number	Diff line
		@@ -16,10 +16,16 @@

		package com.android.settings;

		import android.app.ActivityManager;
		import android.app.AlertDialog;
		import android.app.KeyguardManager;
		import android.content.Context;
		import android.content.DialogInterface;
		import android.content.Intent;
		import android.os.Bundle;
		import android.os.RemoteException;
		import android.os.UserManager;
		import android.support.annotation.VisibleForTesting;
		import android.support.v14.preference.ListPreferenceDialogFragment;
		import android.support.v7.preference.PreferenceViewHolder;
		import android.util.AttributeSet;
		@@ -32,6 +38,7 @@ import android.widget.ImageView;
		import android.widget.ListAdapter;
		import android.widget.ListView;

		import com.android.settings.Utils;
		import com.android.settingslib.RestrictedLockUtils;
		import com.android.settingslib.RestrictedPreferenceHelper;

		@@ -43,6 +50,8 @@ import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
		public class RestrictedListPreference extends CustomListPreference {
		private final RestrictedPreferenceHelper mHelper;
		private final List<RestrictedItem> mRestrictedItems = new ArrayList<>();
		private boolean mRequiresActiveUnlockedProfile = false;
		private int mProfileUserId;

		public RestrictedListPreference(Context context, AttributeSet attrs) {
		super(context, attrs);
		@@ -68,6 +77,24 @@ public class RestrictedListPreference extends CustomListPreference {

		@Override
		public void performClick() {
		if (mRequiresActiveUnlockedProfile) {
		// Check if the profile is started, first.
		if (Utils.startQuietModeDialogIfNecessary(getContext(), UserManager.get(getContext()),
		mProfileUserId)) {
		return;
		}

		// Next, check if the profile is unlocked.
		KeyguardManager manager =
		(KeyguardManager) getContext().getSystemService(Context.KEYGUARD_SERVICE);
		if (manager.isDeviceLocked(mProfileUserId)) {
		Intent intent = manager.createConfirmDeviceCredentialIntent(
		null, null, mProfileUserId);
		getContext().startActivity(intent);
		return;
		}
		}

		if (!mHelper.performClick()) {
		super.performClick();
		}
		@@ -92,6 +119,14 @@ public class RestrictedListPreference extends CustomListPreference {
		return mHelper.isDisabledByAdmin();
		}

		public void setRequiresActiveUnlockedProfile(boolean reqState) {
		mRequiresActiveUnlockedProfile = reqState;
		}

		public void setProfileUserId(int profileUserId) {
		mProfileUserId = profileUserId;
		}

		public boolean isRestrictedForEntry(CharSequence entry) {
		if (entry == null) {
		return false;

src/com/android/settings/bluetooth/BluetoothDevicePreference.java

+7 −1

Original line number	Diff line number	Diff line
		@@ -56,6 +56,7 @@ public final class BluetoothDevicePreference extends GearPreference implements

		private AlertDialog mDisconnectDialog;
		private String contentDescription = null;
		private boolean mHideSecondTarget = false;
		/* Talk-back descriptions for various BT icons */
		Resources mResources;

		@@ -86,7 +87,8 @@ public final class BluetoothDevicePreference extends GearPreference implements
		protected boolean shouldHideSecondTarget() {
		return mCachedDevice == null
		\|\| mCachedDevice.getBondState() != BluetoothDevice.BOND_BONDED
		\|\| mUserManager.hasUserRestriction(DISALLOW_CONFIG_BLUETOOTH);
		\|\| mUserManager.hasUserRestriction(DISALLOW_CONFIG_BLUETOOTH)
		\|\| mHideSecondTarget;
		}

		@Override
		@@ -112,6 +114,10 @@ public final class BluetoothDevicePreference extends GearPreference implements
		return mCachedDevice;
		}

		public void hideSecondTarget(boolean hideSecondTarget) {
		mHideSecondTarget = hideSecondTarget;
		}

		public void onDeviceAttributesChanged() {
		/*
		* The preference framework takes care of making sure the value has

src/com/android/settings/bluetooth/BluetoothDeviceUpdater.java

+25 −18

Original line number	Diff line number	Diff line
		@@ -56,29 +56,14 @@ public abstract class BluetoothDeviceUpdater implements BluetoothCallback,
		protected final DevicePreferenceCallback mDevicePreferenceCallback;
		protected final Map<BluetoothDevice, Preference> mPreferenceMap;
		protected Context mPrefContext;
		protected DashboardFragment mFragment;

		private final boolean mShowDeviceWithoutNames;
		private DashboardFragment mFragment;
		private Preference.OnPreferenceClickListener mDevicePreferenceClickListener = null;

		@VisibleForTesting
		final GearPreference.OnGearClickListener mDeviceProfilesListener = pref -> {
		final CachedBluetoothDevice device =
		((BluetoothDevicePreference) pref).getBluetoothDevice();
		if (device == null) {
		return;
		}
		final Bundle args = new Bundle();
		args.putString(BluetoothDeviceDetailsFragment.KEY_DEVICE_ADDRESS,
		device.getDevice().getAddress());

		new SubSettingLauncher(mFragment.getContext())
		.setDestination(BluetoothDeviceDetailsFragment.class.getName())
		.setArguments(args)
		.setTitle(R.string.device_details_title)
		.setSourceMetricsCategory(mFragment.getMetricsCategory())
		.launch();

		launchDeviceDetails(pref);
		};

		private class PreferenceClickListener implements
		@@ -201,7 +186,7 @@ public abstract class BluetoothDeviceUpdater implements BluetoothCallback,
		public abstract boolean isFilterMatched(CachedBluetoothDevice cachedBluetoothDevice);

		/**
		* Update whether to show {@cde cachedBluetoothDevice} in the list.
		* Update whether to show {@link CachedBluetoothDevice} in the list.
		*/
		protected void update(CachedBluetoothDevice cachedBluetoothDevice) {
		if (isFilterMatched(cachedBluetoothDevice)) {
		@@ -239,6 +224,28 @@ public abstract class BluetoothDeviceUpdater implements BluetoothCallback,
		}
		}

		/**
		* Get {@link CachedBluetoothDevice} from {@link Preference} and it is used to init
		* {@link SubSettingLauncher} to launch {@link BluetoothDeviceDetailsFragment}
		*/
		protected void launchDeviceDetails(Preference preference) {
		final CachedBluetoothDevice device =
		((BluetoothDevicePreference) preference).getBluetoothDevice();
		if (device == null) {
		return;
		}
		final Bundle args = new Bundle();
		args.putString(BluetoothDeviceDetailsFragment.KEY_DEVICE_ADDRESS,
		device.getDevice().getAddress());

		new SubSettingLauncher(mFragment.getContext())
		.setDestination(BluetoothDeviceDetailsFragment.class.getName())
		.setArguments(args)
		.setTitle(R.string.device_details_title)
		.setSourceMetricsCategory(mFragment.getMetricsCategory())
		.launch();
		}

		/**
		* @return {@code true} if {@code cachedBluetoothDevice} is connected
		* and the bond state is bonded.

src/com/android/settings/bluetooth/ConnectedBluetoothDeviceUpdater.java

+19 −0

Original line number	Diff line number	Diff line
		@@ -16,11 +16,14 @@
		package com.android.settings.bluetooth;

		import android.bluetooth.BluetoothAdapter;
		import android.bluetooth.BluetoothDevice;
		import android.bluetooth.BluetoothProfile;
		import android.content.Context;
		import android.media.AudioManager;
		import android.support.annotation.VisibleForTesting;
		import android.support.v7.preference.Preference;
		import android.util.Log;

		import com.android.settings.connecteddevice.DevicePreferenceCallback;
		import com.android.settings.dashboard.DashboardFragment;
		import com.android.settingslib.bluetooth.CachedBluetoothDevice;
		@@ -116,4 +119,20 @@ public class ConnectedBluetoothDeviceUpdater extends BluetoothDeviceUpdater {
		}
		return isFilterMatched;
		}

		@Override
		protected void addPreference(CachedBluetoothDevice cachedDevice) {
		super.addPreference(cachedDevice);
		final BluetoothDevice device = cachedDevice.getDevice();
		if (mPreferenceMap.containsKey(device)) {
		final BluetoothDevicePreference btPreference =
		(BluetoothDevicePreference) mPreferenceMap.get(device);
		btPreference.setOnGearClickListener(null);
		btPreference.hideSecondTarget(true);
		btPreference.setOnPreferenceClickListener((Preference p) -> {
		launchDeviceDetails(p);
		return true;
		});
		}
		}
		}