Merge "refactor(size preference): rename the class to WindowMagnificationFrameSizePrefs" into main (d3ed1a2a) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/accessibility/WindowMagnificationController.java

+6 −6

Original line number	Diff line number	Diff line
		@@ -240,7 +240,7 @@ class WindowMagnificationController implements View.OnTouchListener, SurfaceHold
		private boolean mEditSizeEnable = false;
		private boolean mSettingsPanelVisibility = false;
		@VisibleForTesting
		WindowMagnificationSizePrefs mWindowMagnificationSizePrefs;
		WindowMagnificationFrameSizePrefs mWindowMagnificationFrameSizePrefs;

		@Nullable
		private final MirrorWindowControl mMirrorWindowControl;
		@@ -270,7 +270,7 @@ class WindowMagnificationController implements View.OnTouchListener, SurfaceHold
		mSysUiState = sysUiState;
		mScvhSupplier = scvhSupplier;
		mConfiguration = new Configuration(context.getResources().getConfiguration());
		mWindowMagnificationSizePrefs = new WindowMagnificationSizePrefs(mContext);
		mWindowMagnificationFrameSizePrefs = new WindowMagnificationFrameSizePrefs(mContext);

		final Display display = mContext.getDisplay();
		mDisplayId = mContext.getDisplayId();
		@@ -457,7 +457,7 @@ class WindowMagnificationController implements View.OnTouchListener, SurfaceHold

		if (!enable) {
		// Keep the magnifier size when exiting edit mode
		mWindowMagnificationSizePrefs.saveSizeForCurrentDensity(
		mWindowMagnificationFrameSizePrefs.saveSizeForCurrentDensity(
		new Size(mMagnificationFrame.width(), mMagnificationFrame.height()));
		}
		}
		@@ -944,7 +944,7 @@ class WindowMagnificationController implements View.OnTouchListener, SurfaceHold
		}

		private void setMagnificationFrame(int width, int height, int centerX, int centerY) {
		mWindowMagnificationSizePrefs.saveSizeForCurrentDensity(new Size(width, height));
		mWindowMagnificationFrameSizePrefs.saveSizeForCurrentDensity(new Size(width, height));

		// Sets the initial frame area for the mirror and place it to the given center on the
		// display.
		@@ -954,11 +954,11 @@ class WindowMagnificationController implements View.OnTouchListener, SurfaceHold
		}

		private Size restoreMagnificationWindowFrameSizeIfPossible() {
		if (!mWindowMagnificationSizePrefs.isPreferenceSavedForCurrentDensity()) {
		if (!mWindowMagnificationFrameSizePrefs.isPreferenceSavedForCurrentDensity()) {
		return getDefaultMagnificationWindowFrameSize();
		}

		return mWindowMagnificationSizePrefs.getSizeForCurrentDensity();
		return mWindowMagnificationFrameSizePrefs.getSizeForCurrentDensity();
		}

		private Size getDefaultMagnificationWindowFrameSize() {

packages/SystemUI/src/com/android/systemui/accessibility/WindowMagnificationSizePrefs.java→packages/SystemUI/src/com/android/systemui/accessibility/WindowMagnificationFrameSizePrefs.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -23,14 +23,14 @@ import android.util.Size;
		/**
		* Class to handle SharedPreference for window magnification size.
		*/
		final class WindowMagnificationSizePrefs {
		final class WindowMagnificationFrameSizePrefs {

		private static final String WINDOW_MAGNIFICATION_PREFERENCES =
		"window_magnification_preferences";
		Context mContext;
		SharedPreferences mWindowMagnificationSizePreferences;

		public WindowMagnificationSizePrefs(Context context) {
		WindowMagnificationFrameSizePrefs(Context context) {
		mContext = context;
		mWindowMagnificationSizePreferences = mContext
		.getSharedPreferences(WINDOW_MAGNIFICATION_PREFERENCES, Context.MODE_PRIVATE);

packages/SystemUI/tests/src/com/android/systemui/accessibility/WindowMagnificationSizePrefsTest.java→packages/SystemUI/tests/src/com/android/systemui/accessibility/WindowMagnificationFrameSizePrefsTest.java

+7 −7

Original line number	Diff line number	Diff line
		@@ -39,9 +39,9 @@ import org.junit.runner.RunWith;
		@SmallTest
		@RunWith(AndroidTestingRunner.class)
		@TestableLooper.RunWithLooper
		public class WindowMagnificationSizePrefsTest extends SysuiTestCase {
		public class WindowMagnificationFrameSizePrefsTest extends SysuiTestCase {

		WindowMagnificationSizePrefs mWindowMagnificationSizePrefs;
		WindowMagnificationFrameSizePrefs mWindowMagnificationFrameSizePrefs;
		FakeSharedPreferences mSharedPreferences;

		@Before
		@@ -51,24 +51,24 @@ public class WindowMagnificationSizePrefsTest extends SysuiTestCase {
		when(mContext.getSharedPreferences(
		eq("window_magnification_preferences"), anyInt()))
		.thenReturn(mSharedPreferences);
		mWindowMagnificationSizePrefs = new WindowMagnificationSizePrefs(mContext);
		mWindowMagnificationFrameSizePrefs = new WindowMagnificationFrameSizePrefs(mContext);
		}

		@Test
		public void saveSizeForCurrentDensity_getExpectedSize() {
		Size testSize = new Size(500, 500);
		mWindowMagnificationSizePrefs.saveSizeForCurrentDensity(testSize);
		mWindowMagnificationFrameSizePrefs.saveSizeForCurrentDensity(testSize);

		assertThat(mWindowMagnificationSizePrefs.getSizeForCurrentDensity())
		assertThat(mWindowMagnificationFrameSizePrefs.getSizeForCurrentDensity())
		.isEqualTo(testSize);
		}

		@Test
		public void saveSizeForCurrentDensity_containsPreferenceForCurrentDensity() {
		Size testSize = new Size(500, 500);
		mWindowMagnificationSizePrefs.saveSizeForCurrentDensity(testSize);
		mWindowMagnificationFrameSizePrefs.saveSizeForCurrentDensity(testSize);

		assertThat(mWindowMagnificationSizePrefs.isPreferenceSavedForCurrentDensity())
		assertThat(mWindowMagnificationFrameSizePrefs.isPreferenceSavedForCurrentDensity())
		.isTrue();
		}
		}