Merge "Add tests for MagnificationController." (a46f009b) · Commits · e / os / android_frameworks_base

core/java/android/provider/Settings.java

+2 −11

Original line number	Diff line number	Diff line
		@@ -5161,18 +5161,10 @@ public final class Settings {
		"accessibility_display_magnification_scale";

		/**
		* Setting that specifies whether the display magnification should be
		* automatically updated. If this fearture is enabled the system will
		* exit magnification mode or pan the viewport when a context change
		* occurs. For example, on staring a new activity or rotating the screen,
		* the system may zoom out so the user can see the new context he is in.
		* Another example is on showing a window that is not visible in the
		* magnified viewport the system may pan the viewport to make the window
		* the has popped up so the user knows that the context has changed.
		* Whether a screen magnification is performed is controlled by
		* {@link #ACCESSIBILITY_DISPLAY_MAGNIFICATION_ENABLED}
		* Unused mangnification setting
		*
		* @hide
		* @deprecated
		*/
		public static final String ACCESSIBILITY_DISPLAY_MAGNIFICATION_AUTO_UPDATE =
		"accessibility_display_magnification_auto_update";
		@@ -6491,7 +6483,6 @@ public final class Settings {
		ACCESSIBILITY_DISPLAY_DALTONIZER_ENABLED,
		ACCESSIBILITY_DISPLAY_MAGNIFICATION_ENABLED,
		ACCESSIBILITY_DISPLAY_MAGNIFICATION_SCALE,
		ACCESSIBILITY_DISPLAY_MAGNIFICATION_AUTO_UPDATE,
		ACCESSIBILITY_SCRIPT_INJECTION,
		ACCESSIBILITY_WEB_CONTENT_KEY_BINDINGS,
		ENABLED_ACCESSIBILITY_SERVICES,

+0 −8

Original line number	Diff line number	Diff line
		@@ -1310,10 +1310,6 @@ class DatabaseHelper extends SQLiteOpenHelper {
		loadFractionSetting(stmt, Settings.Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_SCALE,
		R.fraction.def_accessibility_display_magnification_scale, 1);
		stmt.close();
		stmt = db.compileStatement("INSERT INTO secure(name,value) VALUES(?,?);");
		loadBooleanSetting(stmt,
		Settings.Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_AUTO_UPDATE,
		R.bool.def_accessibility_display_magnification_auto_update);

		db.setTransactionSuccessful();
		} finally {
		@@ -2508,10 +2504,6 @@ class DatabaseHelper extends SQLiteOpenHelper {
		loadFractionSetting(stmt, Settings.Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_SCALE,
		R.fraction.def_accessibility_display_magnification_scale, 1);

		loadBooleanSetting(stmt,
		Settings.Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_AUTO_UPDATE,
		R.bool.def_accessibility_display_magnification_auto_update);

		loadBooleanSetting(stmt, Settings.Secure.USER_SETUP_COMPLETE,
		R.bool.def_user_setup_complete);

+9 −1

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

		private final class UpgradeController {
		private static final int SETTINGS_VERSION = 134;
		private static final int SETTINGS_VERSION = 135;

		private final int mUserId;

		@@ -2545,6 +2545,14 @@ public class SettingsProvider extends ContentProvider {
		currentVersion = 134;
		}

		if (currentVersion == 134) {
		// Remove setting that specifies if magnification values should be preserved.
		// This setting defaulted to true and never has a UI.
		getSecureSettingsLocked(userId).deleteSettingLocked(
		Settings.Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_AUTO_UPDATE);
		currentVersion = 135;
		}

		if (currentVersion != newVersion) {
		Slog.wtf("SettingsProvider", "warning: upgrading settings database to version "
		+ newVersion + " left it at "

+2 −5

Original line number	Diff line number	Diff line
		@@ -829,9 +829,10 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub {
		* @param centerX the new screen-relative center X coordinate
		* @param centerY the new screen-relative center Y coordinate
		*/
		void notifyMagnificationChanged(@NonNull Region region,
		public void notifyMagnificationChanged(@NonNull Region region,
		float scale, float centerX, float centerY) {
		synchronized (mLock) {
		notifyClearAccessibilityCacheLocked();
		notifyMagnificationChangedLocked(region, scale, centerX, centerY);
		}
		}
		@@ -901,10 +902,6 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub {
		mSecurityPolicy.onTouchInteractionEnd();
		}

		void onMagnificationStateChanged() {
		notifyClearAccessibilityCacheLocked();
		}

		private void switchUser(int userId) {
		synchronized (mLock) {
		if (mCurrentUserId == userId && mInitialized) {