Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Support circular magnification frame on circular devices" into lmp-mr1-modular-dev

Browse Source
This commit is contained in:
Casey Burkhardt
2015-02-12 23:23:44 +00:00
committed by Android (Google) Code Review
parent 77c5de0d68 d29a1e47d4
commit 6f2dd8a9b1
3 changed files with 23 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/res/res/values/dimens.xml
View File

@@ -304,6 +304,9 @@
<!-- Touch slop for the global toggle accessibility gesture --> <!-- Touch slop for the global toggle accessibility gesture -->
<dimen name="accessibility_touch_slop">80dip</dimen> <dimen name="accessibility_touch_slop">80dip</dimen>
<!-- Width of the outline stroke used by the accessibility screen magnification indicator -->
<dimen name="accessibility_magnification_indicator_width">4dip</dimen>
<!-- Width of the sliding KeyguardSecurityContainer (includes 2x keyguard_security_view_margin) --> <!-- Width of the sliding KeyguardSecurityContainer (includes 2x keyguard_security_view_margin) -->
<dimen name="keyguard_security_width">320dp</dimen> <dimen name="keyguard_security_width">320dp</dimen>

1
core/res/res/values/symbols.xml
View File

@@ -412,6 +412,7 @@
<java-symbol type="dimen" name="notification_badge_size" /> <java-symbol type="dimen" name="notification_badge_size" />
<java-symbol type="dimen" name="immersive_mode_cling_width" /> <java-symbol type="dimen" name="immersive_mode_cling_width" />
<java-symbol type="dimen" name="circular_display_mask_offset" /> <java-symbol type="dimen" name="circular_display_mask_offset" />
<java-symbol type="dimen" name="accessibility_magnification_indicator_width" />
<java-symbol type="string" name="add_account_button_label" /> <java-symbol type="string" name="add_account_button_label" />
<java-symbol type="string" name="addToDictionary" /> <java-symbol type="string" name="addToDictionary" />

24
services/core/java/com/android/server/wm/AccessibilityController.java
View File

@@ -397,8 +397,6 @@ final class AccessibilityController {
private final class MagnifiedViewport { private final class MagnifiedViewport {
private static final int DEFAUTLT_BORDER_WIDTH_DIP = 5;
private final SparseArray<WindowState> mTempWindowStates = private final SparseArray<WindowState> mTempWindowStates =
new SparseArray<WindowState>(); new SparseArray<WindowState>();
@@ -411,6 +409,8 @@ final class AccessibilityController {
private final Region mMagnifiedBounds = new Region(); private final Region mMagnifiedBounds = new Region();
private final Region mOldMagnifiedBounds = new Region(); private final Region mOldMagnifiedBounds = new Region();
private final Path mCircularPath;
private final MagnificationSpec mMagnificationSpec = MagnificationSpec.obtain(); private final MagnificationSpec mMagnificationSpec = MagnificationSpec.obtain();
private final WindowManager mWindowManager; private final WindowManager mWindowManager;
@@ -425,12 +425,22 @@ final class AccessibilityController {
public MagnifiedViewport() { public MagnifiedViewport() {
mWindowManager = (WindowManager) mContext.getSystemService(Service.WINDOW_SERVICE); mWindowManager = (WindowManager) mContext.getSystemService(Service.WINDOW_SERVICE);
mBorderWidth = TypedValue.applyDimension( mBorderWidth = mContext.getResources().getDimension(
TypedValue.COMPLEX_UNIT_DIP, DEFAUTLT_BORDER_WIDTH_DIP, com.android.internal.R.dimen.accessibility_magnification_indicator_width);
mContext.getResources().getDisplayMetrics());
mHalfBorderWidth = (int) Math.ceil(mBorderWidth / 2); mHalfBorderWidth = (int) Math.ceil(mBorderWidth / 2);
mDrawBorderInset = (int) mBorderWidth / 2; mDrawBorderInset = (int) mBorderWidth / 2;
mWindow = new ViewportWindow(mContext); mWindow = new ViewportWindow(mContext);
if (mContext.getResources().getBoolean(
com.android.internal.R.bool.config_windowIsRound)) {
mCircularPath = new Path();
mWindowManager.getDefaultDisplay().getRealSize(mTempPoint);
final int centerXY = mTempPoint.x / 2;
mCircularPath.addCircle(centerXY, centerXY, centerXY, Path.Direction.CW);
} else {
mCircularPath = null;
}
recomputeBoundsLocked(); recomputeBoundsLocked();
} }
@@ -459,6 +469,10 @@ final class AccessibilityController {
Region availableBounds = mTempRegion1; Region availableBounds = mTempRegion1;
availableBounds.set(0, 0, screenWidth, screenHeight); availableBounds.set(0, 0, screenWidth, screenHeight);
if (mCircularPath != null) {
availableBounds.setPath(mCircularPath, availableBounds);
}
Region nonMagnifiedBounds = mTempRegion4; Region nonMagnifiedBounds = mTempRegion4;
nonMagnifiedBounds.set(0, 0, 0, 0); nonMagnifiedBounds.set(0, 0, 0, 0);