Commit Graph

402 Commits

Author SHA1 Message Date
Jackal Guo
d6e8dba7e9 Using actual display id
For MagnificationGestureHandler, enable the support for multi-display
by giving actual display id instead of default one.

Bug: 112273690
Test: A11y CTS & unit test
Test: manual
Change-Id: I0f1e844e491f39d35b75ab398ff9481680610fc9
2019-01-24 14:41:06 +08:00
Jackal Guo
a275d99547 Merge "Support A11yInputFilter on multi-display" 2019-01-24 05:43:07 +00:00
Rhed Jao
be6a92d6b2 Merge "Fix delay when multi-tap out of distance slop." 2019-01-23 05:58:13 +00:00
Jackal Guo
8b729932db Support A11yInputFilter on multi-display
In order to support multi-display, some event handlers need to be
plural. Based on the characteristic of each event handler, only
the event handler that needs to deal with concurrent events from
different display needs multi-instance.

Test: a11y CTS & unit tests
Test: atest SystemUITests
Change-Id: I76379fb82aad09ee20609d81bd5b1dda15931905
2019-01-23 12:53:35 +08:00
Rhed Jao
dcc2b928fb Merge "Enable multi-display support for magnification controller" 2019-01-23 03:34:54 +00:00
Rhed Jao
0232d29e7b Fix delay when multi-tap out of distance slop.
Triple tap gesture didn't consider the case when user tap quickly
and out of distance slop. Just send out all delay motion events
if we detect a tap with out of the distance slop.

Bug: 122623669
Test: atest MagnificationGestureHandlerTest
Change-Id: Iadd05441e10f720f57297b6091f4acff5d198b7c
2019-01-22 18:52:49 +08:00
Christine Franks
88ec096b72 Merge "Move a11y color transforms to ColorDisplayService" 2019-01-18 23:08:37 +00:00
Rhed Jao
02655dc38c Enable multi-display support for magnification controller
1) New api for a11y service to specify display id and return
per display magnification controller.
2) Updae MagnificationController to support multi-display.
3) Update AccessibilityController to support multi-display
magnifier.

Bug: 112273690
Test: atest MagnificationControllerTest
Test: atest MagnificationGestureHandlerTest
Test: atest CtsAccessibilityTestCases
Test: atest CtsAccessibilityServiceTestCases

Change-Id: I643a8f96e7d57f729daf8df7f26c9014b1dfd476
2019-01-18 16:53:32 +08:00
Jackal Guo
e9d09ea04f Merge "Transit to exploration state after gesture isn't recognized" 2019-01-17 08:08:19 +00:00
Christine Franks
9114f46d36 Move a11y color transforms to ColorDisplayService
Bug: 111215474
Test: atest FrameworksServicesTests:ColorDisplayServiceTest and
atest FrameworksServicesTests:AccessibilityManagerTest
Change-Id: I264192f23fa3eeb821e1570be5c016824f3c3215
2019-01-14 14:13:14 -08:00
Gilbert Lee
d38d699054 Adjust maximum accessibility magnification scale from 5x to 8x
Bug: 76414773
Test: Manual
      atest FrameworksServicesTests:com.android.server.accessibility

Change-Id: I558c641bc65ba07a6544d439c8616a7e5d6960b4
2019-01-08 13:04:27 +08:00
Yuki Awano
ca4c57439d Add getAccessibilityWindowId system process API
- Add an API to get accessibility window id from window token. This API
  can be called only from a system process.

Bug: 119794051
Test: None
Change-Id: I37db50209efeb81f3e3502d84fd53fedec695f99
2018-12-10 13:36:56 +09:00
Robert Carr
51141c0a60 ScreenMagnifier: Track SurfaceFlinger Input
Surface scaling is now automatically/in-general applied to input
coordinates and so the accessibility service doesn't need to do
it's own scaling. We also track the renaming of "scaleFactor"
to "globalScaleFactor"

Bug: 80101428
Bug: 113136004
Bug: 111440400
Test: Magnifier works
Change-Id: Ib6a0ad7df56c7d040497d6f352abe3d74c38a49f
2018-11-27 18:06:36 -08:00
Rhed Jao
6c7522aecc Fix uiautomator failed to get active window.
A11y clients do not get correct RelevantEventTypes value
immediately, after a11y state turn on. This impact a11y clients
sending a11y events.

Bug: 112870790
Test: Manual - adb shell uiautomator dump
Test: atest CtsAccessibilityServiceTestCases
Change-Id: I6c55e4cd8e8823c2741628c38f94ab627ba74295
2018-11-19 11:19:38 +08:00
Rhed Jao
41118f33b1 Update a11y recommended timeout api.
Update api name to getRecommendedTimeoutMillis.
Api returns timeout for interactive or non-interactive controls.
Also provide the options for a11y service to specify two kinds of
timeout.

Bug: 111210981
Test: atest SettingsBackupTest
Test: atest AccessibilityManagerTest
Test: atest AccessibilityServiceInfoTest
Change-Id: I37d35796fd72bb4d6628a6bb33b111987f321552
2018-11-09 10:24:07 +08:00
Jackal Guo
5f766d81c5 Transit to exploration state after gesture isn't recognized
When gesture detection fails, TouchExplorer will try to transit to
exploration state once user is still touching the screen. However,
it resets the state right after it tries to transit to exploration
state currently.

Bug: 118724767
Test: A11y CTS & unit test
Change-Id: Ifcf931233da7cfcaf5b6c608bcd1c26e3a7a904a
2018-11-01 19:13:22 +08:00
Phil Weaver
667c2d0fa6 Clean up a11y bindInstantService and package check
Two orthogonal changes:
1. Making bindInstantService property internal to UserState and
putting a permission check on the setter.

Having the setter in SecurityPolicy didn't make sense to me
since the field was public anyway.

I'm removing the permission check on the getter for the system,
since the field is checked anyway in getInstalledA11yServices.
So it seems like it's possible to determine the value of this
value without the permission. It also just doesn't seem like
reading this value has any security implications.

I'm doing this as part of pulling SecurityPolicy out of AMS. It
felt silly to have a permission check that was only enforced
if the caller went out of its way to have it enforced.

2. Making list of valid packages independent of the caller.

Bug: 110715236
Fixes: 118701258
Test: A11y CTS
Change-Id: I43ad0b3f3e30eae1c2a3582db672217d957919df
2018-10-30 14:29:47 -07:00
Phil Weaver
27beee50d3 Make performAccessibilityShortcut a SystemAPI
Also create a new MANAGE_ACCESSIBILITY permission to
perform the shortcut.

Bug: 116118615
Test: make, activate accessibility shortcut
Change-Id: Ic65a0cdf7393429e14cb98f4fb0734d20069b05a
2018-10-30 10:10:41 -07:00
sanryhuang
95d6d82b13 Enable Per-display support on MagnificationController.
Refactor
1. Create DisplayMagnification to support multi-display
2. Using PooledLambda to simplify the existing code

Bug: 112273690
Test: MagnificationControllerTest, MagnificationGestureHandlerTest and
Manual test.

Change-Id: I19436b4671421dc58c0036e55f75178c1f413e9e
2018-10-22 20:55:24 +08:00
Jackal Guo
a1300eb05c Merge "Add null check for WindowInfo" 2018-10-10 23:32:22 +00:00
Jackal Guo
e97db706ce Add null check for WindowInfo
The WindowInfo may be null if the target window can't be found in
current mWindowInfoById. Add null guard to prevent from NPE here.

Bug: 116652152
Test: atest CtsAccessibilityServiceTestCases
Test: atest CtsAccessibilityTestCases
Change-Id: Iaf2446e66420289be4154e90fbe213bbca9fd41f
2018-10-09 17:59:26 +08:00
TreeHugger Robot
f4c7bdd1a6 Merge "Add synchronization to UiAutomationManager." 2018-10-08 20:48:38 +00:00
Phil Weaver
dd577717f4 Add synchronization to UiAutomationManager.
The client change method needs to be called with a lock
held, and there's a one-off bug that looks like two threads
were shutting down UiAutomation simultaneously. Adding
a lock to prevent this from happening.

Bug: 111170405
Bug: 110845380
Test: A11y CTS and unit tests. I can't repro the issue, so
I can't write a test that specifically causes the problem
that this test makes pass.

Change-Id: Ia01603fcca5bcee70efd24e7af667d47d3057d61
2018-10-05 17:48:36 -07:00
Jackal Guo
f798d6e758 Correct the state of the accessibility service
When an accessibility service package changes, it would be unbound.
This also causes it's removed from mBoundServices and adding into
mBindingServices currently. Hence, nothing happens since it's not
in mBoundServices in onPackageUpdateFinished(). Also, this service
wouldn't be bound since it is kept in mBindingServices. Remove the
accessibility service from mBindingServices after update, remove,
and force stop.

Bug: 116758044
Test: atest CtsAccessibilityServiceTestCases
Test: atest CtsAccessibilityTestCases
Test: update, remove, and force stop an enabled a11y service, and
      check if it could work again.
Change-Id: I61f8ac3ad92480b296f9970c9bb92af8f6767f1a
2018-10-04 12:23:21 +08:00
Dieter Hsu
a7fa814e95 Fix accessibility services tests to work with atest
- Remove @BeforeClass `Looper.prepare()` that do not work with atest
- Fix TouchExplorerTest: mock AccessibilityGestureDetector to not create
  internal handler.
- Fix broken tests in MagnificationControllerTest
- Remove @FlakyTest annotation from MagnificationControllerTest &
  FingerprintGestureControllerTest

When using atest, timeout is applied to command `am instrument`. Then
@BeforeClass & @Before are both running on instrument thread, but test
cases are running on a seperate thread. It dispatch messages immediately
if the looper is associated to the same thread. When runniung tests with
atest, dispatching the message is not always done in the same thread. So
verifying the expectation on test thread would be flaky.

The solution to use a looper associated with test thread would be ugly.
Because the looper related stuff should set up without @Before or
@BeforeClass including preparing a looper on demand in a utility
function for every test case needed.

Here changing the handler behavior to enqueue but to dispatch messages
explictly from test could serialize the execution. This would use main
looper (no need to prepare) to create handler, but dispatch and clear
messages ourself. Not good enough but less ugly to run `am instrument`
with or without timeout.

Bug: 74748946
Test: atest -d FrameworksServicesTests:com.android.server.accessibility
Test: adb shell am instrument -w -e package com.android.server.accessibility \
      com.android.frameworks.servicestests/androidx.test.runner.AndroidJUnitRunner

Change-Id: Ib67d8b7305511d218b23f4b5ab0b0a12bea9ae10
2018-09-14 08:57:44 +00:00
Jackal Guo
f6493516eb Merge "Accessibility actions should trigger ACTION_OUTSIDE" 2018-09-13 05:09:49 +00:00
Rhed Jao
f78014e7be Merge "Adding a11y ui minimum timeout api." 2018-09-13 01:44:13 +00:00
Rhed Jao
e972881f59 Adding a11y ui minimum timeout api.
Bug: 111210981
Test: atest SettingsBackupTest
Test: atest AccessibilityManagerTest
Test: atest AccessibilityServiceInfoTest
Change-Id: I706d05f9b4a9e2daec06243493989b442be107db
2018-09-12 09:56:58 +08:00
Jackal Guo
ac2b62e9b5 Accessibility actions should trigger ACTION_OUTSIDE
Some accessibility actions (e.g., click) aren't counted as touch
currently. Hence, windows that are monitoring touches outside of
themselves wouldn't be notified when an accessibility action
takes place on another window.

WindowsInfo doesn't record if a window monitoring touches outside
nowadays. In order to find out this kind of window, add the field
for it.

Bug: 76228634
Bug: 62725890
Test: check if dialogs (e.g., volume panel or a11y menu) dismiss
      after performing a11y action click.
Test: atest CtsAccessibilityServiceTestCases
Test: atest CtsAccessibilityTestCases
Test: atest WindowStateTests
Change-Id: I4fd84848b8a445e6df22251d68449ae8b502c601
2018-09-05 16:35:03 +08:00
Phil Weaver
e05fba4e94 Change API name for a11y keyboard flag
Bug: 113855740
Test: make
Change-Id: Ia41360cb5e2bf5d845027add13dec34bc246f403
2018-09-04 17:08:56 -07:00
Dieter Hsu
01f426fd5e Add TouchExplorerTest
- Add test cases to check sent action-change-to-non-move motion events
  is not contain history.
- Fix AccessilityGestureDetector TODO that will affect atest test fail

Bug: 74069091
Test: atest FrameworksServicesTests:TouchExplorerTest FrameworksServicesTests:AccessibilityGestureDetectorTest

Change-Id: Iae4321eaeea15021dfed4503da4665398d899c07
2018-08-24 15:38:59 +08:00
Jackal Guo
ea479da1e0 disableSelf doesn't recover the init state of value
It leaves empty string instead of null for the value of
secure.enabled_accessibility_services. It may cause other tests
fails.

Bug: 111317486
Test: atest CtsAccessibilityServiceTestCases
Test: manual check the value of settings providers after test
Change-Id: I3f882ba00145ffa555514117c4684aec9ce33947
2018-08-21 11:41:43 +08:00
Jackal Guo
7080e1a588 Avoid duplicated touch events
TouchExplorer doesn't check for double tap (and hold) so there may
be duplicated TYPE_TOUCH_INTERACTION_START/END events.

Bug: 66730372
Test: manual
Test: CtsAccessibilityServiceTestCases
Test: CtsAccessibilityTestCases
Change-Id: Iece13d3a401f13d8a7dcda2147b2865eee5e5f33
2018-08-09 10:01:28 +08:00
Dieter Hsu
1979bad271 Remove dupe events while 2-fingers scrolling
Move events may contain a history of other move events. When we split
the event, each of the resulting events has history. When the system
dispatches the events, it also dispatches the ones in the history.

We change these events with actions which are NOT ACTION_MOVE and
inject to input. But those histories are no longer consistent with what
happened and are causing InputDispatcher::injectInputEvent to enqueue
duplicated events of each historical pointer coord.

Bug: 74069091
Test: manual
Test: atest CtsAccessibilityTestCases
Test: atest CtsAccessibilityServiceTestCases

Change-Id: I2a9f5526cbeecfcc379f86624607190e16265405
2018-08-06 06:08:07 +00:00
Phil Weaver
a92586955a Merge "Eliminate race condition for a11y windows" 2018-08-03 22:58:42 +00:00
Jackal Guo
9e795d828a Merge "Magnification isn't reset when service is disabled" 2018-08-03 01:23:38 +00:00
TreeHugger Robot
637415892c Merge "Remove batchMotionEvent in AccessibilityInputFilter." 2018-08-02 07:10:42 +00:00
Phil Weaver
c72faad7ab Eliminate race condition for a11y windows
Update the window list when a new window is registered
with a11y.

Bug: 111766358
Test: A11y CTS.
Change-Id: Id5ec3db3da1849b5de91cce55a67d8241e489e1f
2018-07-31 16:02:07 -07:00
Jackal Guo
1418a6b07f Magnification isn't reset when service is disabled
If the disabled service is the last service to magnify, reset the
magnification.

Bug: 28623059
Test: manual
Test: atest CtsAccessibilityTestCases
Test: atest CtsAccessibilityServiceTestCases
Test: testResetIfNeeded_resetsOnlyIfLastMagnifyingServiceIsDisabled
Change-Id: I6b12a5251b5fede8d2c9eb06048bf9fa4bd70f8b
2018-07-31 11:24:29 +08:00
Phil Weaver
b5df055d34 Merge "Enhance a11y soft keyboard controller" 2018-07-27 23:43:32 +00:00
Phil Weaver
03a65b04d8 Enhance a11y soft keyboard controller
Allow a11y services to request that the soft keyboard be
shown even when the hard keyboard is attached.

Defer to users who override this behavior, and put things
back the way they were when a service requesting this
behavior stops.

Bug: 31012180
Test: Adding CTS tests in linked CL, ran a11y unit tests,
modified TestBack to use the new flag and verified behavior
with a hard keyboard and verfied that settings behave as
expected when overriding and rebooting.
Change-Id: I530481e102ac376a4506b662862ee1ee74815b40
2018-07-27 12:58:18 -07:00
Rhed Jao
fe39083a97 Remove batchMotionEvent in AccessibilityInputFilter.
Change-Id: I65da739528cb8ff329721015de0adf5b269c46c5
Fixes: b/77939003
Test: A11y CTS
2018-07-26 14:15:09 +08:00
Jackal Guo
1528c875e3 Correct return value of MagnificationController#reset
It only returns true if magnification changes from magnifying to
non-magnifying. This is inconsistent with the docs. Return true if
the magnification scale and center is reset.

Bug: 64616261
Test: atest CtsAccessibilityTestCases
Test: atest CtsAccessibilityServiceTestCases
Change-Id: I0c496c5c45c2e35025f1887842a2a9741c440af1
2018-07-24 17:49:16 +08:00
Jackal Guo
d447b5cfc6 Merge "Using transformed event for standard gesture detector" 2018-07-20 03:26:27 +00:00
Jackal Guo
79ea482641 Using transformed event for standard gesture detector
TouchExplorer uses raw event in both a11y and standard gestures
detection, but transformed event in following movement. This
inconsistency causes significant difference of distance between
their locations when screen is magnified and long press would fail.
Passing transformed events for standard gesture detector instead.

Bug: 67378068
Test: manually test if double tap and hold works while Talkback
and Magnification are both enabled.
Test: manually test if Talkback and Magnification work as expected.
Test: AccessibilityGestureDetectorTest

Change-Id: I0e1dc59e25bc36f1f99ba6ecdb05c9c488b6f47e
2018-07-19 11:33:54 +08:00
Rhed Jao
8a39cef7f8 Update AccessibilityManagerService to use SystemService
Bug: 70221242
Test: atest CtsAccessibilityServiceTestCases
Change-Id: Icdf0772d0be93168a954fdd746cada4d5d507eb4
2018-07-18 13:42:35 +08:00
TreeHugger Robot
24158ba81b Merge "Make sure keys get flushed when connection falls apart." 2018-07-02 17:58:20 +00:00
Qasid Sadiq
5bbc301350 Make sure keys get flushed when connection falls apart.
This is for the event that a key has been intercepted, sent to the app,
and the app hasn't handled it yet. If the connection dies, the key is
lost. So flush all pending keys.

Test: Unit test (this would have caught me introducing this bug in the
first place).

Bug:74593001
Change-Id: I5a94aafe5c58f18a3e9ca46f7cd5a9cb71d38aaa
2018-06-27 22:33:11 +00:00
Wale Ogunwale
9e4f3e077f Introduced WindowProcessController/Listener (10/n)
One heavy dependence between the current AMS service and activities
is process management which is heavy affected by activities and their
current state. We introduce WindowProcessController and WindowProcessListener
objects as a structured way for the process changes in AM package to
be communicated to the WM package and WindowProcessListner for activity
changes in the WM package to the communicated back to the AM package.
The ProcessRecord object in AM will own the WindowProcessController object
and also implement the WindowProcessListener.

Test: Existing tests pass
Test: go/wm-smoke-auto
Bug: 80414790
Change-Id: I9e96e841b0f95e99a597cb4629fa5d2fe45760b6
2018-06-22 14:26:24 -07:00
Wale Ogunwale
6767eaee94 Split internal interface activities from current AM interface (3/n)
3rd step in unifying the window hierarchy that is currently split
within AM and WM packages. We separate the the internal interface used
to communicate within system server dealing with activities and their
containers (tasks, stack, display) from the rest of AM internal
interface.

Test: Existing tests pass
Test: go/wm-smoke-auto
Bug: 80414790
Change-Id: Idad77721c1fe10621b9be5dced42a0a11f0183e5
2018-06-15 08:43:22 -07:00