Merge cherrypicks of [7424319, 7424320, 7423808, 7423309, 7424300, 7424301,... (31a7d438) · Commits · e / os / android_frameworks_base

core/java/com/android/internal/policy/DecorView.java

+14 −6

Original line number	Diff line number	Diff line
		@@ -1226,6 +1226,10 @@ public class DecorView extends FrameLayout implements RootViewSurfaceTaker, Wind
		* are set.
		*/
		private void updateBackgroundDrawable() {
		// Background insets can be null if super constructor calls setBackgroundDrawable.
		if (mBackgroundInsets == null) {
		mBackgroundInsets = Insets.NONE;
		}
		if (mBackgroundInsets.equals(mLastBackgroundInsets)
		&& mLastOriginalBackgroundDrawable == mOriginalBackgroundDrawable) {
		return;
		@@ -1549,10 +1553,14 @@ public class DecorView extends FrameLayout implements RootViewSurfaceTaker, Wind
		return;
		}

		setPadding(mFramePadding.left + mBackgroundPadding.left,
		mFramePadding.top + mBackgroundPadding.top,
		mFramePadding.right + mBackgroundPadding.right,
		mFramePadding.bottom + mBackgroundPadding.bottom);
		// Fields can be null if super constructor calls setBackgroundDrawable.
		Rect framePadding = mFramePadding != null ? mFramePadding : new Rect();
		Rect backgroundPadding = mBackgroundPadding != null ? mBackgroundPadding : new Rect();

		setPadding(framePadding.left + backgroundPadding.left,
		framePadding.top + backgroundPadding.top,
		framePadding.right + backgroundPadding.right,
		framePadding.bottom + backgroundPadding.bottom);
		requestLayout();
		invalidate();

		@@ -1572,8 +1580,8 @@ public class DecorView extends FrameLayout implements RootViewSurfaceTaker, Wind
		if (bg != null) {
		if (fg == null) {
		opacity = bg.getOpacity();
		} else if (mFramePadding.left <= 0 && mFramePadding.top <= 0
		&& mFramePadding.right <= 0 && mFramePadding.bottom <= 0) {
		} else if (framePadding.left <= 0 && framePadding.top <= 0
		&& framePadding.right <= 0 && framePadding.bottom <= 0) {
		// If the frame padding is zero, then we can be opaque
		// if either the frame -or- the background is opaque.
		int fop = fg.getOpacity();

packages/SettingsProvider/res/values/defaults.xml

+6 −0

Original line number	Diff line number	Diff line
		@@ -229,4 +229,10 @@

		<!-- Default for Settings.Secure.AWARE_ENABLED -->
		<bool name="def_aware_enabled">false</bool>

		<!-- Default for Settings.Secure.SKIP_GESTURE -->
		<bool name="def_skip_gesture">false</bool>

		<!-- Default for Settings.Secure.SILENCE_GESTURE -->
		<bool name="def_silence_gesture">false</bool>
		</resources>

packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java

+32 −1

Original line number	Diff line number	Diff line
		@@ -3237,7 +3237,7 @@ public class SettingsProvider extends ContentProvider {
		}

		private final class UpgradeController {
		private static final int SETTINGS_VERSION = 178;
		private static final int SETTINGS_VERSION = 179;

		private final int mUserId;

		@@ -4356,6 +4356,37 @@ public class SettingsProvider extends ContentProvider {
		currentVersion = 178;
		}

		if (currentVersion == 178) {
		// Version 178: Set the default value for Secure Settings:
		// SKIP_GESTURE & SILENCE_GESTURE

		final SettingsState secureSettings = getSecureSettingsLocked(userId);

		final Setting skipGesture = secureSettings.getSettingLocked(
		Secure.SKIP_GESTURE);

		if (skipGesture.isNull()) {
		final boolean defSkipGesture = getContext().getResources().getBoolean(
		R.bool.def_skip_gesture);
		secureSettings.insertSettingLocked(
		Secure.SKIP_GESTURE, defSkipGesture ? "1" : "0",
		null, true, SettingsState.SYSTEM_PACKAGE_NAME);
		}

		final Setting silenceGesture = secureSettings.getSettingLocked(
		Secure.SILENCE_GESTURE);

		if (silenceGesture.isNull()) {
		final boolean defSilenceGesture = getContext().getResources().getBoolean(
		R.bool.def_silence_gesture);
		secureSettings.insertSettingLocked(
		Secure.SILENCE_GESTURE, defSilenceGesture ? "1" : "0",
		null, true, SettingsState.SYSTEM_PACKAGE_NAME);
		}

		currentVersion = 179;
		}


		// vXXX: Add new settings above this point.