Merge "Split Ambient Display settings." into nyc-mr1-dev (4f8a703d) · Commits · e / os / android_packages_apps_Settings

res/raw/gesture_ambient_lift.mp4

0 → 100644

+0 −0

Empty file added.

res/values/strings.xml

+20 −6

Original line number	Original line	Diff line number	Diff line
	@@ -2229,7 +2229,7 @@
	<!-- [CHAR LIMIT=30] Display settings screen, setting option name to change whether the ambient display feature is enabled. -->		<!-- [CHAR LIMIT=30] Display settings screen, setting option name to change whether the ambient display feature is enabled. -->
	<string name="doze_title">Ambient display</string>		<string name="doze_title">Ambient display</string>
	<!-- [CHAR LIMIT=NONE] Display settings screen, setting description for the ambient display feature. -->		<!-- [CHAR LIMIT=NONE] Display settings screen, setting description for the ambient display feature. -->
	<string name="doze_summary">Wake screen when you double-tap it or get new notifications. See how</string>		<string name="doze_summary">Wake screen when you receive notifications</string>
	<!-- [CHAR LIMIT=30] Sound & display settings screen, setting option name to change font size -->		<!-- [CHAR LIMIT=30] Sound & display settings screen, setting option name to change font size -->
	<string name="title_font_size">Font size</string>		<string name="title_font_size">Font size</string>
	<!-- Summary for Font size. Lets the user know that this will make text larger or smaller. Appears in the accessibility portion of setup wizard. [CHAR LIMIT=NONE] -->		<!-- Summary for Font size. Lets the user know that this will make text larger or smaller. Appears in the accessibility portion of setup wizard. [CHAR LIMIT=NONE] -->
	@@ -7762,11 +7762,25 @@
	<!-- Summary text for double twist for camera mode [CHAR LIMIT=160]-->		<!-- Summary text for double twist for camera mode [CHAR LIMIT=160]-->
	<string name="double_twist_for_camera_mode_summary"></string>		<string name="double_twist_for_camera_mode_summary"></string>

	<!-- Title text for ambient display [CHAR LIMIT=60]-->		<!-- Title text for ambient display double tap [CHAR LIMIT=60]-->
	<string name="ambient_display_title">Quick screen check</string>		<string name="ambient_display_title">Quick screen check - Double Tap</string>

	<!-- Summary text for ambient display [CHAR LIMIT=160]-->		<!-- Summary text for ambient display double tap (phone) [CHAR LIMIT=160]-->
	<string name="ambient_display_summary">To check your phone without waking it up fully, double-tap it or pick it up</string>		<string name="ambient_display_summary" product="default">To check your phone without waking it up fully, double-tap it</string>
			<!-- Summary text for ambient display double tap (tablet) [CHAR LIMIT=160]-->
			<string name="ambient_display_summary" product="tablet">To check your tablet without waking it up fully, double-tap it</string>
			<!-- Summary text for ambient display double tap (device) [CHAR LIMIT=160]-->
			<string name="ambient_display_summary" product="device">To check your device without waking it up fully, double-tap it</string>

			<!-- Title text for ambient display pick up [CHAR LIMIT=60]-->
			<string name="ambient_display_pickup_title">Quick screen check - Pickup notifications</string>

			<!-- Summary text for ambient display (phone) [CHAR LIMIT=160]-->
			<string name="ambient_display_pickup_summary" product="default">To check your phone without waking it up fully, pick it up</string>
			<!-- Summary text for ambient display (tablet) [CHAR LIMIT=160]-->
			<string name="ambient_display_pickup_summary" product="tablet">To check your tablet without waking it up fully, pick it up</string>
			<!-- Summary text for ambient display (device) [CHAR LIMIT=160]-->
			<string name="ambient_display_pickup_summary" product="device">To check your device without waking it up fully, pick it up</string>

	<!-- Title text for fingerprint swipe for notifications [CHAR LIMIT=60]-->		<!-- Title text for fingerprint swipe for notifications [CHAR LIMIT=60]-->
	<string name="fingerprint_swipe_for_notifications_title">Swipe for notifications</string>		<string name="fingerprint_swipe_for_notifications_title">Swipe for notifications</string>

res/xml/display_settings.xml

+3 −12

Original line number	Original line	Diff line number	Diff line
	@@ -79,19 +79,10 @@
	android:key="lift_to_wake"		android:key="lift_to_wake"
	android:title="@string/lift_to_wake_title" />		android:title="@string/lift_to_wake_title" />

	<PreferenceScreen		<SwitchPreference
	android:key="doze"		android:key="doze"
	android:title="@string/ambient_display_title"		android:title="@string/doze_title"
	android:summary="@string/doze_summary" >		android:summary="@string/doze_summary" />
	<intent
	android:targetPackage="com.android.settings"
	android:targetClass="com.android.settings.Settings$GestureSettingsActivity" >
	<extra android:name="show_drawer_menu"
	android:value="true" />
	<extra android:name="gesture_scroll_to_preference"
	android:value="gesture_pick_up_and_nudge" />
	</intent>
	</PreferenceScreen>

	<SwitchPreference		<SwitchPreference
	android:key="tap_to_wake"		android:key="tap_to_wake"

res/xml/gesture_settings.xml

+11 −5

Original line number	Original line	Diff line number	Diff line
	@@ -38,9 +38,15 @@
	settings:animation="@raw/gesture_twist"/>		settings:animation="@raw/gesture_twist"/>

	<com.android.settings.gestures.GesturePreference		<com.android.settings.gestures.GesturePreference
	android:key="gesture_pick_up_and_nudge"		android:key="gesture_double_tap_screen"
	android:title="@string/ambient_display_title"		android:title="@string/ambient_display_title"
	android:summary="@string/ambient_display_summary"		android:summary="@string/ambient_display_summary"
	settings:animation="@raw/gesture_ambient_tap"/>		settings:animation="@raw/gesture_ambient_tap"/>

			<com.android.settings.gestures.GesturePreference
			android:key="gesture_pick_up"
			android:title="@string/ambient_display_pickup_title"
			android:summary="@string/ambient_display_pickup_summary"
			settings:animation="@raw/gesture_ambient_lift"/>

	</PreferenceScreen>		</PreferenceScreen>
			No newline at end of file

src/com/android/settings/DisplaySettings.java

+15 −5

Original line number	Original line	Diff line number	Diff line
	@@ -41,7 +41,6 @@ import android.support.v7.preference.DropDownPreference;
	import android.support.v7.preference.ListPreference;		import android.support.v7.preference.ListPreference;
	import android.support.v7.preference.Preference;		import android.support.v7.preference.Preference;
	import android.support.v7.preference.Preference.OnPreferenceChangeListener;		import android.support.v7.preference.Preference.OnPreferenceChangeListener;
	import android.support.v7.preference.PreferenceScreen;
	import android.text.TextUtils;		import android.text.TextUtils;
	import android.util.Log;		import android.util.Log;

	@@ -97,10 +96,10 @@ public class DisplaySettings extends SettingsPreferenceFragment implements
	private ListPreference mNightModePreference;		private ListPreference mNightModePreference;
	private Preference mScreenSaverPreference;		private Preference mScreenSaverPreference;
	private SwitchPreference mLiftToWakePreference;		private SwitchPreference mLiftToWakePreference;
			private SwitchPreference mDozePreference;
	private SwitchPreference mTapToWakePreference;		private SwitchPreference mTapToWakePreference;
	private SwitchPreference mAutoBrightnessPreference;		private SwitchPreference mAutoBrightnessPreference;
	private SwitchPreference mCameraGesturePreference;		private SwitchPreference mCameraGesturePreference;
	private PreferenceScreen mDozePreference;

	@Override		@Override
	protected int getMetricsCategory() {		protected int getMetricsCategory() {
	@@ -144,10 +143,11 @@ public class DisplaySettings extends SettingsPreferenceFragment implements
	removePreference(KEY_LIFT_TO_WAKE);		removePreference(KEY_LIFT_TO_WAKE);
	}		}

	if (!isDozeAvailable(activity)) {		if (isDozeAvailable(activity)) {
	removePreference(KEY_DOZE);		mDozePreference = (SwitchPreference) findPreference(KEY_DOZE);
			mDozePreference.setOnPreferenceChangeListener(this);
	} else {		} else {
	mDozePreference = (PreferenceScreen) findPreference(KEY_DOZE);		removePreference(KEY_DOZE);
	}		}

	if (isTapToWakeAvailable(getResources())) {		if (isTapToWakeAvailable(getResources())) {
	@@ -360,6 +360,12 @@ public class DisplaySettings extends SettingsPreferenceFragment implements
	mTapToWakePreference.setChecked(value != 0);		mTapToWakePreference.setChecked(value != 0);
	}		}

			// Update doze if it is available.
			if (mDozePreference != null) {
			int value = Settings.Secure.getInt(getContentResolver(), DOZE_ENABLED, 1);
			mDozePreference.setChecked(value != 0);
			}

	// Update camera gesture #1 if it is available.		// Update camera gesture #1 if it is available.
	if (mCameraGesturePreference != null) {		if (mCameraGesturePreference != null) {
	int value = Settings.Secure.getInt(getContentResolver(), CAMERA_GESTURE_DISABLED, 0);		int value = Settings.Secure.getInt(getContentResolver(), CAMERA_GESTURE_DISABLED, 0);
	@@ -407,6 +413,10 @@ public class DisplaySettings extends SettingsPreferenceFragment implements
	boolean value = (Boolean) objValue;		boolean value = (Boolean) objValue;
	Settings.Secure.putInt(getContentResolver(), WAKE_GESTURE_ENABLED, value ? 1 : 0);		Settings.Secure.putInt(getContentResolver(), WAKE_GESTURE_ENABLED, value ? 1 : 0);
	}		}
			if (preference == mDozePreference) {
			boolean value = (Boolean) objValue;
			Settings.Secure.putInt(getContentResolver(), DOZE_ENABLED, value ? 1 : 0);
			}
	if (preference == mTapToWakePreference) {		if (preference == mTapToWakePreference) {
	boolean value = (Boolean) objValue;		boolean value = (Boolean) objValue;
	Settings.Secure.putInt(getContentResolver(), DOUBLE_TAP_TO_WAKE, value ? 1 : 0);		Settings.Secure.putInt(getContentResolver(), DOUBLE_TAP_TO_WAKE, value ? 1 : 0);