Merge "Fix the layout flag for magnification settings" into udc-dev (30a68e5f) · Commits · e / os / android_frameworks_base

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

+1 −5

Original line number	Diff line number	Diff line
		@@ -354,10 +354,6 @@ class WindowMagnificationSettings implements MagnificationGestureDetector.OnGest
		}

		mWindowManager.addView(mSettingView, mParams);
		if (resetPosition) {
		// Request focus on the settings panel when position of the panel is reset.
		mSettingView.requestFocus();
		}

		// Exclude magnification switch button from system gesture area.
		setSystemGestureExclusion();
		@@ -536,7 +532,7 @@ class WindowMagnificationSettings implements MagnificationGestureDetector.OnGest
		LayoutParams.WRAP_CONTENT,
		LayoutParams.WRAP_CONTENT,
		LayoutParams.TYPE_ACCESSIBILITY_MAGNIFICATION_OVERLAY,
		/* _flags= */ 0,
		LayoutParams.FLAG_NOT_FOCUSABLE,
		PixelFormat.TRANSPARENT);
		params.gravity = Gravity.TOP \| Gravity.START;
		params.accessibilityTitle = getAccessibilityWindowTitle(context);

+0 −7

Original line number	Diff line number	Diff line
		@@ -201,13 +201,6 @@ public class WindowMagnificationSettingsTest extends SysuiTestCase {
		assertThat(magnifierMediumButton.isSelected()).isTrue();
		}

		@Test
		public void showSettingPanel_focusOnThePanel() {
		mWindowMagnificationSettings.showSettingPanel();

		assertThat(mSettingView.isFocused()).isTrue();
		}

		private <T extends View> T getInternalView(@IdRes int idRes) {
		T view = mSettingView.findViewById(idRes);
		assertNotNull(view);