summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/accessibility
Commit message (Collapse)AuthorAgeFilesLines
...
* Merge "Adjust a11y shortcut settings based on UX input"Phil Weaver2017-06-271-19/+32
|\
| * Adjust a11y shortcut settings based on UX inputPhil Weaver2017-06-021-19/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | Use SettingsLib's versions of Custom* classes.Juan Lang2017-06-211-1/+1
| | | | | | | | | | Test: make RunSettingsRoboTests Change-Id: I2584e820b72bb4672c53fd1a9f63c7f1662e0809
* | Merge "Fix Screen Magnification recursive draw" am: 4e7846fbe4 am: db233c6e88gaochong2017-06-191-0/+2
|\ \ | | | | | | | | | | | | | | | am: dd3945eca5 Change-Id: Idb43358ecaa0ab0b04c59f255c75476857a5fb5d
| * \ Merge "Fix Screen Magnification recursive draw" am: 4e7846fbe4gaochong2017-06-191-0/+2
| |\ \ | | | | | | | | | | | | | | | | | | | | am: db233c6e88 Change-Id: If8a23a012e0b7a82dc0c6a7d349a15310b4eb43e
| | * | Fix Screen Magnification recursive drawgaochong2017-06-191-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When invoke the method View#setLayoutParams(), ViewRootImpl will run method ViewRootImpl#performTraversals(). And OnGlobalLayoutListener#onGlobalLayout() will be invoked. When the method View#setLayoutParams() is invoked in OnGlobalLayoutListener#onGlobalLayout(), there will be recursive call. The view will be draw on and on. This situation happen in Screen Magnification. It should remove the listener after work completion. Bug: https://issuetracker.google.com/issues/62613000 Test: use systrace when enter Screen Magnification,and view the "traversal" times. Change-Id: I01b1fcccb8b915ec436fb95f1d30c8ec0c0de0a9 Signed-off-by: gaochong <gaochong@xiaomi.com>
| | * | DO NOT MERGE: Revert "Update package names to work with the proto3 compiler"Tamas Berghammer2017-01-1812-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit fbd5f5fdce07a6d77dd2c3309c7272bf33414396. Change-Id: I769f7a0f509996ccc39fd1c628cad7e5ec1202bf
| | * | Update package names to work with the proto3 compilerTamas Berghammer2017-01-1112-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | Bug: b/28974522 Change-Id: I5f3adf4946ee4ba1e09e4f40afe83c151405972a (cherry picked from commit 265d3c2a0c36251bf8a9f571d7239b6dd404d942)
| * | | Fix clickjacking again for accessibility servicesPhil Weaver2017-05-303-15/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | Merge "Remove accessibility duplicates in settings search" into oc-devTreeHugger Robot2017-05-102-1/+23
| |\ \ \
| | * | | Remove accessibility duplicates in settings searchMatthew Fritze2017-05-082-1/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 33701673 Test: make RunSettingsRoboTests Change-Id: I46e79051d10c4cae851f8e76304e6cfe0a3f73d4 Merged-In: Idda6d2f98cb8d2cb91a9a4721b2ef84921f9056a
* | | | | Add help url placeholders for new pagesFan Zhang2017-06-054-2/+20
| |_|_|/ |/| | | | | | | | | | | | | | | | | | | Bug: 38412798 Test: visual Change-Id: I4ede523cb13790ea05309279f80a778b2086f850
* | | | Merge "Manual merge of ag/2319717"Phil Weaver2017-05-303-7/+37
|\ \ \ \
| * | | | Manual merge of ag/2319717Phil Weaver2017-05-303-7/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 62104030 Test: Manually tested as described in original commit msg. Change-Id: Ie00bafa736c837881a258c9de10891b27c5baefd
* | | | | Merge "Follow O patterns for a11y settings"Phil Weaver2017-05-245-64/+27
|\ \ \ \ \
| * | | | | Follow O patterns for a11y settingsPhil Weaver2017-05-245-64/+27
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* / / / / Add title to SeekbarPreference content description.Fan Zhang2017-05-161-1/+1
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | Clean up choose lock intent creationMaurice Lam2017-05-121-9/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | Remove accessibility duplicates in settings searchMatthew Fritze2017-05-091-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge for: ag/2148817 Bug: 33701673 Test: make RunSettingsRoboTests Change-Id: Idda6d2f98cb8d2cb91a9a4721b2ef84921f9056a
* | | | Merge "Fix bidi direction of dialog and bidi-wrap service name" into oc-dev ↵Roozbeh Pournader2017-05-061-3/+13
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 869d246021 am: 6b06aa1099 Change-Id: I3db0d2e88659b4cd1822a368845b9179521a69e6
| * | | Fix bidi direction of dialog and bidi-wrap service nameRoozbeh Pournader2017-05-051-3/+13
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Merge "Remove accessibility duplicates in settings search"TreeHugger Robot2017-05-021-1/+12
|\ \ \
| * | | Remove accessibility duplicates in settings searchMatthew Fritze2017-05-021-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 33701673 Test: make RunSettingsRoboTests Change-Id: Iae179b558065d728c14eb76f136d398081577779
* | | | Merge "Change String to CharSequence in #loadSummary." into oc-dev am: ↵Jeff Sharkey2017-05-012-2/+2
|\ \ \ \ | |/ / / |/| / / | |/ / | | | | | | | | | | | | ad597344a2 am: e86e611f76 Change-Id: Id13f41ae6cb32d575193732136489bbac0702a3c
| * | Merge "Change String to CharSequence in #loadSummary." into oc-devJeff Sharkey2017-05-012-2/+2
| |\ \
| | * | Change String to CharSequence in #loadSummary.Saige McVea2017-04-282-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | Merge "Fix default for a11y shortcut setting" into oc-dev am: 5ef1135b9fPhil Weaver2017-04-201-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | am: bffd5636ff Change-Id: I37e5b5651d3f1930791acf013bce10f9e5cb50ce
| * | | Fix default for a11y shortcut settingPhil Weaver2017-04-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | Merge "Respect user's choice on a11y shortcut dialog" into oc-dev am: d4ce883c64Phil Weaver2017-04-192-4/+3
|\| | | | | | | | | | | | | | | | | | | | | | | am: 8a3d606a60 Change-Id: Id39f650645400b4e5076ea0a9cd86925244e76d5
| * | | Merge "Respect user's choice on a11y shortcut dialog" into oc-devPhil Weaver2017-04-192-4/+3
| |\ \ \
| | * | | Respect user's choice on a11y shortcut dialogPhil Weaver2017-04-182-4/+3
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Wasn't checking if the user actually agreed. Whoops. Bug: 37123004 Test: Manually verified that canceling leaves the selection unchanged. Change-Id: I48a052eb74733d3d0105fc1e72c4bf77ce8be0c5
* | | | Merge "Conditionally reposition experimental preferences." into oc-dev am: ↵Saige McVea2017-04-181-0/+21
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b18e31bc5a am: f869788eb8 Change-Id: I6346767b427cd4d3711251b841afa62863db8bfe
| * | | Merge "Conditionally reposition experimental preferences." into oc-devSaige McVea2017-04-181-0/+21
| |\ \ \
| | * | | Conditionally reposition experimental preferences.Saige McVea2017-04-171-0/+21
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | Merge "Hide "Magnify with button" if no navbar is shown" into oc-dev am: ↵Casey Burkhardt2017-04-183-16/+62
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 65523b9cb0 am: 855391b66f Change-Id: Id976a6a4c502dbe8624e810587555869588f3264
| * | | Merge "Hide "Magnify with button" if no navbar is shown" into oc-devCasey Burkhardt2017-04-183-16/+62
| |\ \ \ | | |/ / | |/| |
| | * | Hide "Magnify with button" if no navbar is shownCasey Burkhardt2017-04-133-16/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | Merge "Added generic icon and magnification icon to a11y Settings." into ↵Saige McVea2017-04-141-4/+8
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | oc-dev am: ba7a4751a0 am: 8fb5b5fd0e Change-Id: I1167930dd65752403876d462150a4c63dbb1dd84
| * | | Merge "Added generic icon and magnification icon to a11y Settings." into oc-devSaige McVea2017-04-131-4/+8
| |\ \ \ | | |/ / | |/| |
| | * | Added generic icon and magnification icon to a11y Settings.Saige McVea2017-04-121-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test: Manual Bug: 36895362 Change-Id: I85281c0904bd6f562f9ebd39dd35b1eeb79108e6
* | | | Merge "Prevent gaining audio focus when opening magnification screen." into ↵Noah Wang2017-04-131-0/+5
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | oc-dev am: 93799e8758 am: d26d3e77a3 Change-Id: Ie7e2a1b947f3ba42209a77f824d7b4754fc0ce1b
| * | | Prevent gaining audio focus when opening magnification screen.Noah Wang2017-04-121-0/+5
| |/ / | | | | | | | | | | | | bug: 30521125 Change-Id: I22fe63ed2b0529c2a08b7be03c12753f3f060c1a
* | | Merge "Don't enable a11y service if scary dialog obscured" into oc-dev am: ↵Phil Weaver2017-04-071-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | 0b9cd1b40e am: ba98033945 Change-Id: I81533c721182e0e118bc2ed6eea7800c62b5be69
| * | Don't enable a11y service if scary dialog obscuredPhil Weaver2017-04-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Adding help links to font size and display settings screens.Noah Wang2017-03-281-0/+5
|/ / | | | | | | | | bug: 33110518 Change-Id: I5b75adc493ed0ab16a2dd653554af7a7c6e137ad
* | Fix Accessibility Settings crashCasey Burkhardt2017-03-241-1/+1
| | | | | | | | | | | | | | | | Update preference key to reference new magnification preference screen. Bug: 36606349 Test: Manual Change-Id: Iefb114bea6a58d6f8939ae863959d4a6922f5a1d
* | Update magnification stringsCasey Burkhardt2017-03-241-0/+21
| | | | | | | | | | | | | | | | | | - Adjusts string for triple-tap instructions - Adds summary text to Settings > Accessibility > Magnification Bug: 30960346 Test: Manual Change-Id: I151eeaa8b08c86ba8f9dec90d14388f1d775fb57
* | Settings revisions for Accessibility buttonCasey Burkhardt2017-03-242-17/+44
| | | | | | | | | | | | | | | | | | 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
* | Merge "Resolved accessibility service preference summary strings to use a ↵Saige McVea2017-03-241-7/+9
|\ \ | | | | | | | | | common resource."
| * | Resolved accessibility service preference summary strings to use a common ↵Saige McVea2017-03-241-7/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | resource. Test: Manual Bug: 34682532 Change-Id: Idf617fb5008181a0739689e40fef6b3a86aaf72b