Merge "Add utility methods to AmbientDisplayConfig" into pi-dev am: 758cfd63db (6a94ccdb) · Commits · e / os / android_frameworks_base

core/java/com/android/internal/hardware/AmbientDisplayConfiguration.java

+11 −4

Original line number	Original line	Diff line number	Diff line
	@@ -59,8 +59,11 @@ public class AmbientDisplayConfiguration {
	}		}

	public boolean pulseOnPickupAvailable() {		public boolean pulseOnPickupAvailable() {
	return mContext.getResources().getBoolean(R.bool.config_dozePulsePickup)		return dozePulsePickupSensorAvailable() && ambientDisplayAvailable();
	&& ambientDisplayAvailable();		}

			public boolean dozePulsePickupSensorAvailable() {
			return mContext.getResources().getBoolean(R.bool.config_dozePulsePickup);
	}		}

	public boolean pulseOnPickupCanBeModified(int user) {		public boolean pulseOnPickupCanBeModified(int user) {
	@@ -73,7 +76,11 @@ public class AmbientDisplayConfiguration {
	}		}

	public boolean pulseOnDoubleTapAvailable() {		public boolean pulseOnDoubleTapAvailable() {
	return !TextUtils.isEmpty(doubleTapSensorType()) && ambientDisplayAvailable();		return doubleTapSensorAvailable() && ambientDisplayAvailable();
			}

			public boolean doubleTapSensorAvailable() {
			return !TextUtils.isEmpty(doubleTapSensorType());
	}		}

	public String doubleTapSensorType() {		public String doubleTapSensorType() {
	@@ -115,7 +122,7 @@ public class AmbientDisplayConfiguration {
	return boolSettingDefaultOff(Settings.Secure.ACCESSIBILITY_DISPLAY_INVERSION_ENABLED, user);		return boolSettingDefaultOff(Settings.Secure.ACCESSIBILITY_DISPLAY_INVERSION_ENABLED, user);
	}		}

	private boolean ambientDisplayAvailable() {		public boolean ambientDisplayAvailable() {
	return !TextUtils.isEmpty(ambientDisplayComponent());		return !TextUtils.isEmpty(ambientDisplayComponent());
	}		}