Commit Graph

943 Commits

Author SHA1 Message Date
Fan Zhang
179645eecd Add help url placeholders for new pages
Bug: 38412798
Test: visual
Change-Id: I4ede523cb13790ea05309279f80a778b2086f850
2017-06-05 14:50:01 -07:00
Phil Weaver
8fcf4d8349 Adjust a11y shortcut settings based on UX input
Disabling the shortcut if no service is configured, so we
users won't see an "On" unless the shortcut will have an
effect.

If no service is configured and the user tries to enable
the shortcut, the service picking UI is shown. If the user
chooses a service, the shortcut turns on. If not, the
shortcut remains off.

Service selection is disabled when the shortcut is disabled
(except for the specific case above).

Lock screen behavior selection is disabled when the shortcut
is disabled.

Also updating a couple of strings based on UX input.

Adding an AOSP header to a file that somehow got checked in
without one.

Fixes: 37443184
Fixes: 38030853

Test: Manually went through the various combinations of
shortcut on and service enabled. I turned off the default
selection of TalkBack as the shortcut service to ensure
that we show a dialog when no service is selected.

Change-Id: Iac5cff12edea91a496fc81781518db4ae49ef334
2017-06-02 16:10:13 -07:00
Phil Weaver
64822d40dc Merge "Manual merge of ag/2319717" 2017-05-30 19:46:18 +00:00
Phil Weaver
ed0866ebfd Fix clickjacking again for accessibility services
Turns out that the flag for the window being obscured
does not imply that it is also partially obscured.

Also blocking system alerts and toast windows over the
accessibility service preference screen (and its associated
warning dialog) as well as the warning dialog shown when
a service is made available with the accessibiity shortcut.

Bug: 62104030
Test: Manually verified that I can't enable Select to Speak
when switch access is highlighting the button. I am able to
do that without this fix. Also started a service that
displayed a system overlay and confirmed that the overlay
disappears on a11y service preference screens and when a
new service is configured for the a11y shortcut.
Merged-In: Ie00bafa736c837881a258c9de10891b27c5baefd

Change-Id: Iabbded1a12dbc33d76e51c0bac710280a88080f3
2017-05-30 10:45:23 -07:00
Phil Weaver
2e2dbfe549 Manual merge of ag/2319717
Bug: 62104030
Test: Manually tested as described in original commit msg.
Change-Id: Ie00bafa736c837881a258c9de10891b27c5baefd
2017-05-30 10:41:52 -07:00
Phil Weaver
be39d57762 Merge "Follow O patterns for a11y settings" 2017-05-24 19:37:41 +00:00
Phil Weaver
ed5f0951f8 Follow O patterns for a11y settings
Move the summary for the toggled features to a footer.
Make the settings appear as a preference.

Bug: 36780887
Test: Start settings and observe the new UI looks a lot
like the mocks referenced in the bug. Also added unit
test to verify that summary text shows up.

Change-Id: I1d002b194991d0901ecb27198ba5de73bd23a5a9
2017-05-24 10:35:20 -07:00
Fan Zhang
cbfe1eb881 Add title to SeekbarPreference content description.
Adding a title to contentDesciption of the seekbar.
The title is helpful to indicate which seekbar user is changing when
talkback is enabled.

Also move SeekBarPreference from root package to widget packge.

Change-Id: I793f41c4902e350b6bc6d62761362779cc3722a9
Fix: 35421942
Test: make RunSettingsRoboTests
2017-05-16 12:35:45 -07:00
Maurice Lam
2eb170cd6f Clean up choose lock intent creation
Consolidated the many variants of ChooseLock*.createIntent, so that
it will take the same set of arguments.

Also modified SetupChooseLock*.createIntent to modifyIntentForSetup,
which will take the intent created by ChooseLock* and modify it for
use with setup.

Test: cd tests/robotests && mma
Change-Id: I5ff033f459c33ec9980872a536b3996d89f2bbbb
2017-05-12 15:35:20 -07:00
TreeHugger Robot
8fc602fed8 Merge "Remove accessibility duplicates in settings search" into oc-dev 2017-05-10 05:07:53 +00:00
Matthew Fritze
6ad5848775 Remove accessibility duplicates in settings search
Merge for: ag/2148817

Bug: 33701673
Test: make RunSettingsRoboTests
Change-Id: Idda6d2f98cb8d2cb91a9a4721b2ef84921f9056a
2017-05-09 09:17:13 -07:00
Matthew Fritze
7ae3c078b6 Remove accessibility duplicates in settings search
Bug: 33701673
Test: make RunSettingsRoboTests
Change-Id: I46e79051d10c4cae851f8e76304e6cfe0a3f73d4
Merged-In: Idda6d2f98cb8d2cb91a9a4721b2ef84921f9056a
2017-05-08 18:34:43 +00:00
Roozbeh Pournader
16db0413f1 Merge "Fix bidi direction of dialog and bidi-wrap service name" into oc-dev am: 869d246021
am: 6b06aa1099

Change-Id: I3db0d2e88659b4cd1822a368845b9179521a69e6
2017-05-06 01:41:43 +00:00
Roozbeh Pournader
15bebece94 Fix bidi direction of dialog and bidi-wrap service name
Previously, the name of the service being in a different direction
from the locale could cause bidi artifacts.

Now, we explicitly set the direction of the dialog to the locale, and
bidi-wrap the service name.

Test: Manual
Change-Id: I563299866b24a4ce90fa2d09781aa269d8de2edd
Fixes: 37761152
2017-05-05 13:40:05 -07:00
TreeHugger Robot
e2987d7173 Merge "Remove accessibility duplicates in settings search" 2017-05-02 19:07:44 +00:00
Matthew Fritze
49915a64c5 Remove accessibility duplicates in settings search
Bug: 33701673
Test: make RunSettingsRoboTests
Change-Id: Iae179b558065d728c14eb76f136d398081577779
2017-05-02 17:39:24 +00:00
Jeff Sharkey
4869effb72 Merge "Change String to CharSequence in #loadSummary." into oc-dev am: ad597344a2
am: e86e611f76

Change-Id: Id13f41ae6cb32d575193732136489bbac0702a3c
2017-05-01 18:22:36 +00:00
Jeff Sharkey
ad597344a2 Merge "Change String to CharSequence in #loadSummary." into oc-dev 2017-05-01 17:52:27 +00:00
Saige McVea
2cc818acce Change String to CharSequence in #loadSummary.
Per API council review, localized strings should return CharSequence. Changes here
account for the different type returned.

Test: ag/1813674

Bug: 37723508

Change-Id: I7dacab8af48932db031de22835b65eba30393956
2017-04-28 20:35:21 -07:00
Phil Weaver
debcceb6b4 Merge "Fix default for a11y shortcut setting" into oc-dev am: 5ef1135b9f
am: bffd5636ff

Change-Id: I37e5b5651d3f1930791acf013bce10f9e5cb50ce
2017-04-20 18:53:23 +00:00
Phil Weaver
a989b19646 Fix default for a11y shortcut setting
Settings thought the default for "Allow from lock screen" was
on. It's really off.

Bug: 37158451
Test: Manually confirmed that a fresh device now shows off.
Change-Id: I38dc4f6d2bfec5e0c8562c0d2c6e034db461aa98
2017-04-19 11:09:23 -07:00
Phil Weaver
e9edc8f357 Merge "Respect user's choice on a11y shortcut dialog" into oc-dev am: d4ce883c64
am: 8a3d606a60

Change-Id: Id39f650645400b4e5076ea0a9cd86925244e76d5
2017-04-19 16:16:14 +00:00
Phil Weaver
d4ce883c64 Merge "Respect user's choice on a11y shortcut dialog" into oc-dev 2017-04-19 16:09:16 +00:00
Phil Weaver
ed69e8a417 Respect user's choice on a11y shortcut dialog
Wasn't checking if the user actually agreed. Whoops.

Bug: 37123004
Test: Manually verified that canceling leaves the selection
unchanged.

Change-Id: I48a052eb74733d3d0105fc1e72c4bf77ce8be0c5
2017-04-18 17:53:14 -07:00
Saige McVea
c83b8de6a7 Merge "Conditionally reposition experimental preferences." into oc-dev am: b18e31bc5a
am: f869788eb8

Change-Id: I6346767b427cd4d3711251b841afa62863db8bfe
2017-04-18 22:00:48 +00:00
Saige McVea
b18e31bc5a Merge "Conditionally reposition experimental preferences." into oc-dev 2017-04-18 21:47:25 +00:00
Casey Burkhardt
1a63f973e9 Merge "Hide "Magnify with button" if no navbar is shown" into oc-dev am: 65523b9cb0
am: 855391b66f

Change-Id: Id976a6a4c502dbe8624e810587555869588f3264
2017-04-18 02:50:09 +00:00
Casey Burkhardt
65523b9cb0 Merge "Hide "Magnify with button" if no navbar is shown" into oc-dev 2017-04-18 00:06:53 +00:00
Saige McVea
6a6b97905f Conditionally reposition experimental preferences.
Specifically, move colour inversion and colour correction preferences
to the display category if device is color transform accelerated.

Test: Manual

Bug: 36603386

Change-Id: I4f7e4e569f5f358e6e3c705f9df02e0da473a081
2017-04-17 11:59:07 -07:00
Saige McVea
4d75b8812e Merge "Added generic icon and magnification icon to a11y Settings." into oc-dev am: ba7a4751a0
am: 8fb5b5fd0e

Change-Id: I1167930dd65752403876d462150a4c63dbb1dd84
2017-04-14 15:52:41 +00:00
Casey Burkhardt
875d3b2471 Hide "Magnify with button" if no navbar is shown
Devices without a software-rendered navigation bar will be unable to
use "Magnify with button" as no accessibility button trigger for
magnification can be shown.

In this case, we hide the setting by preventing
MagnificationPreferenceFragment from showing the list of mag
modes, instead launching directly into the PreferenceFragment for
"Magnify with triple-tap"

Bug: 36862906
Test: Manual - Configured marlin to disable the navigation bar and
      verified behavior in SUW and Settings

Change-Id: Ie614ec292d7779044274b7c79eaed1df080c0fd1
2017-04-13 15:50:28 -07:00
Saige McVea
ba7a4751a0 Merge "Added generic icon and magnification icon to a11y Settings." into oc-dev 2017-04-13 19:07:33 +00:00
Noah Wang
c7b2bc65cb Merge "Prevent gaining audio focus when opening magnification screen." into oc-dev am: 93799e8758
am: d26d3e77a3

Change-Id: Ie7e2a1b947f3ba42209a77f824d7b4754fc0ce1b
2017-04-13 04:12:54 +00:00
Saige McVea
672cb2edc6 Added generic icon and magnification icon to a11y Settings.
Test: Manual

Bug: 36895362

Change-Id: I85281c0904bd6f562f9ebd39dd35b1eeb79108e6
2017-04-12 12:52:21 -07:00
Noah Wang
ea5ebaa50c Prevent gaining audio focus when opening magnification screen.
bug: 30521125
Change-Id: I22fe63ed2b0529c2a08b7be03c12753f3f060c1a
2017-04-12 11:52:23 -07:00
Phil Weaver
19ebace6c4 Merge "Don't enable a11y service if scary dialog obscured" into oc-dev am: 0b9cd1b40e
am: ba98033945

Change-Id: I81533c721182e0e118bc2ed6eea7800c62b5be69
2017-04-07 05:55:19 +00:00
Phil Weaver
c8e20afa3c Don't enable a11y service if scary dialog obscured
We were only checking if the OK button itself was obscured.
Changing to check if any part of the window is obscured.

Bug: 31855267
Test: Created a sample a11y service that displays a UI to cover
part of the window, but not the OK button. It was possible to
enable an a11y service before this change, but now it displays
a warning toast.

Change-Id: I21974535aba734da6ea9d7accf67fb9237fd16fc
2017-04-05 09:28:32 -07:00
Noah Wang
474c291fa7 Adding help links to font size and display settings screens.
bug: 33110518
Change-Id: I5b75adc493ed0ab16a2dd653554af7a7c6e137ad
2017-03-28 02:01:26 -07:00
Casey Burkhardt
059a8e3d12 Fix Accessibility Settings crash
Update preference key to reference new magnification preference screen.
Bug: 36606349
Test: Manual

Change-Id: Iefb114bea6a58d6f8939ae863959d4a6922f5a1d
2017-03-24 23:33:45 -07:00
Casey Burkhardt
5477832096 Update magnification strings
- Adjusts string for triple-tap instructions
- Adds summary text to Settings > Accessibility > Magnification

Bug: 30960346
Test: Manual
Change-Id: I151eeaa8b08c86ba8f9dec90d14388f1d775fb57
2017-03-24 19:24:34 -07:00
Casey Burkhardt
bc3827d717 Settings revisions for Accessibility button
Populates and displays a warning message when a feature that relies
on the Accessibility button is enabled, but not assigned.

Bug: 34720082
Test: Manual
Change-Id: Ie7031716a91fdf7fc40f32bf4e0ad17af85aa573
2017-03-24 17:01:06 -07:00
Saige McVea
5bbf987d1a Merge "Resolved accessibility service preference summary strings to use a common resource." 2017-03-24 22:56:04 +00:00
Phil Weaver
296b7263ad A11y shortcut settings enhancement
Adding shortcut on/off switch, improving the service picker,
and adding a switch to enable the shortcut on the lock screen.

Also adjusted setting search code to avoid indexing the
accessibility shortcut aside from the main accessibility settings
page.

Bug: 35872328
Bug: 35219988
Test: Ran in a variety of conditions, ran existing settings test.
Also added basic robo test, verified existing robo tests pass.
Change-Id: I4da9bad74caf96d9c8f3640e7db5417b4ee5d602
2017-03-24 13:15:13 -07:00
Saige McVea
6413604bbd Resolved accessibility service preference summary strings to use a common resource.
Test: Manual

Bug: 34682532

Change-Id: Idf617fb5008181a0739689e40fef6b3a86aaf72b
2017-03-24 12:48:11 -07:00
Casey Burkhardt
6075d46e85 Merge "Updates to Magnification Settings" 2017-03-24 19:35:20 +00:00
Casey Burkhardt
9c7143c3e4 Updates to Magnification Settings
Restructures accessibility settings to support multiple
magnification modes.

Removes "preview" behavior within magnification settings

Test: Manual
Bug: 30960346
Bug: 36136580
Change-Id: I9f95b8ef2460f5178336e8cb44b10a2553d28ea9
2017-03-24 00:35:28 -07:00
Fan Zhang
d53859df7d Set about phone subtext to device model string.
Also remove useless custom preference

Fix: 36395109
Test: robotests
Change-Id: I07297e6ade6991a8262473c9f59c21d914300244
2017-03-23 17:33:33 -07:00
Fan Zhang
e05b352758 Misc search summary text updates.
- Remove static text from default app summaries.They will be filled
dynamically at runtime, so we don't need the static ones here.
- Remove summaryOn/summaryOff strings from a few fragments. Search
framework does not need them.

Change-Id: I165766073ba70aceead88c3df02d62f3700e4592
Fix: 36474747
Fix: 34573952
Test: run existing tests
2017-03-21 14:52:40 -07:00
Saige McVea
061362754a Fixes string reference in SEARCH_INDEX_DATA_PROVIDER and minor changes to UI based on UX review.
Bug: 34682532

Test: ag/1813674 and manual testing with TalkBack, Switch Access, S2S, and Accessibility Scanner.

Undo "Revert "Accessibility settings refresh.""
This reverts commit 31d855e739.

Change-Id: I7187250e8070418894aee4ee6c8c5d8282339c82
2017-03-15 15:07:33 -07:00
Saige McVea
31d855e739 Revert "Accessibility settings refresh."
This reverts commit 89a5c62963.

Change-Id: I97e420e4f78ee3e48b8aa10c8f5c1e2861032fab
2017-03-13 18:04:00 +00:00