Commit Graph

620 Commits

Author SHA1 Message Date
Automerger Merge Worker
561b431773 Merge "Merge "Logs accessibility service user trigger status." into rvc-dev am: a69eb462a8 am: 7725372140" into rvc-d1-dev-plus-aosp am: a6a76a1eb3 am: 4b64e6755d
Change-Id: Ibefbb689c4adf46af4ea88414b8ea14921cc77cf
2020-04-30 13:09:20 +00:00
Jason Hsu
a69eb462a8 Merge "Logs accessibility service user trigger status." into rvc-dev 2020-04-30 12:21:16 +00:00
jasonwshsu
e76f541f7c Logs accessibility service user trigger status.
* Uses the atom AccessibilityServiceReported in westworld.

Bug: 151285965
Test: make statsd_testdrive && ./out/host/linux-x86/bin/statsd_testdrive 267
Change-Id: Id6a109e4e90c09f2310d92533cd4632875712f81
2020-04-29 20:16:14 +08:00
Menghan Li
149f35605f Merge "Fix InvisibleToggle type service does not turn on or turn off correctly when edit shortcut dialog." into rvc-dev am: 981d10db0b am: 5d7fd4abc3 am: aa0c512ff5 am: 6267537581
Change-Id: I356ddb582b6fd154766c932e774ccbbe3d653f5e
2020-04-29 09:07:47 +00:00
menghanli
de1258f9cf Fix InvisibleToggle type service does not turn on or turn off correctly when edit shortcut dialog.
Root cause: service status is not updated after the shortcut status
changed.

Next: Add callback to update the service status

Bug: 155157599
Test: Manual test
Change-Id: I286a04d43066c787304c54eb7b0dfdac5728b6ac
2020-04-29 13:44:54 +08:00
Jason Hsu
f6fc1154f3 Merge "Change the name of accessibility service fragment type to more descriptive names" into rvc-dev am: e0adf5bfd6 am: cb4587f098 am: 98c5ec6e58 am: 5c884a95a3
Change-Id: I81d5eccf9a3eb45df7958ab17b13ce7fe740e952
2020-04-28 06:51:20 +00:00
jasonwshsu
43daeb90da Change the name of accessibility service fragment type to more descriptive names
Bug: 155052371
Test: manual test
Change-Id: I097138c84083528acd4d16a145921227ffe3f736
2020-04-28 00:55:04 +08:00
Menghan Li
9bc66971d7 Merge "Fix formats and internationalization of the string "0.6 seconds" in sk language" into rvc-dev am: 24f71c6e91 am: 8afeaa1fa7 am: abc21bdb41 am: 61d7b654a2
Change-Id: I39edbebb57580542270f6616c9b9a9f7d4c52d71
2020-04-27 15:39:26 +00:00
Menghan Li
24f71c6e91 Merge "Fix formats and internationalization of the string "0.6 seconds" in sk language" into rvc-dev 2020-04-27 14:22:22 +00:00
PETER LIANG
650d02d336 Merge "Add the enabled status into the condition for the service which is VolumeShortcutToggle type." into rvc-dev am: c0fc0e4542 am: 6597cf6cb2 am: cf04f8f50c am: 099432633d
Change-Id: Iad38e159775edbbf1b989ae73f7430b837a773e5
2020-04-27 08:21:44 +00:00
Peter_Liang
9e50eb1598 Add the enabled status into the condition for the service which is VolumeShortcutToggle type.
Root cause: Shouldn't show the tutorial related to accessibility button when the service which has the accessibility button flag and is VolumeShortcutToggle type is not turned on.

Next: Add the status of the corresponding service.

Bug: 148989018
Test: manual test
Change-Id: Icc1dc071387e34401ecf67ed9fbc7bd4f9f9d612
2020-04-27 02:42:19 +00:00
Jason Hsu
d071e4e0e7 Merge "Use new setting key to maintain the list of user assigned shortcut targets." into rvc-dev am: 79d73eaa59 am: faa9c3b033 am: 4d2022a4d9 am: 2b47e35081
Change-Id: I78bc231cf66a0de45fbc0c5b31013e7b3c60f11a
2020-04-24 03:31:18 +00:00
Jason Hsu
79d73eaa59 Merge "Use new setting key to maintain the list of user assigned shortcut targets." into rvc-dev 2020-04-24 03:07:39 +00:00
Menghan Li
fb4e0f68f6 Merge "Fix Auto click (dwell timing) the checked option isn't the same as the option before upgrading the OS" into rvc-dev am: 6f9f91b67b am: 9e155131e7 am: 6df7977c9a am: c58cc5094c
Change-Id: Ib433cfcab4803c5c889ada6f9efe1353a181fd54
2020-04-23 15:03:04 +00:00
Menghan Li
6f9f91b67b Merge "Fix Auto click (dwell timing) the checked option isn't the same as the option before upgrading the OS" into rvc-dev 2020-04-23 13:57:45 +00:00
PETER LIANG
516516f1e9 Merge changes from topic "tutorial_improvement" into rvc-dev am: b6bf10ebbc am: 15d20efe43 am: 636d68059e am: fbe9b33c73
Change-Id: I8711cc5c75a05d7865b22e411648debe3adda41e
2020-04-23 13:28:37 +00:00
menghanli
771163f0d3 Fix Auto click (dwell timing) the checked option isn't the same as the option before upgrading the OS
Root cause:
After OS upgrade to R, the original logic only check SP key but does not consider the setting enabled key to cause it cannot not show correctly.

Next:
1) accessibility_autoclick_enabled=1 but does not have SP key, customize layout is checked and show the right value
2) accessibility_autoclick_enabled=1 and have SP key, show according items is checked
3) accessibility_autoclick_enabled=0, off button is checked

Bug: 151123423
Test: local test
Change-Id: I9ebcbb35ee0071dbf8c969d0a70ea6293f4c6edb
2020-04-23 09:22:01 +00:00
Peter_Liang
8cbb44d6f6 Tutorial improvement for Accessibility shortcut (3/n).
Add test cases for tutorial pages.

Bug: 148989018
Bug: 134640159
Test: manual test & run RoboTests
Change-Id: I9bb29f6e61e331c3f9a2408a1eebc3d5e9e16000
2020-04-23 12:18:26 +08:00
Peter_Liang
72aa60ae95 Tutorial improvement for Accessibility shortcut (2/n).
Update UI widgets to meet the new design.

Bug: 148989018
Test: manual test
Change-Id: Ife42995af193db6746135d29f6fa1ad452d265a6
2020-04-23 12:18:26 +08:00
Peter_Liang
cfe3e454ac Tutorial improvement for Accessibility shortcut (1/n).
Because can't save the value into setting keys for the service before version R, and in order to let tutorial dialog can get the consistent value, using alternative that each fragment with shortcut to must implement the new abstract method.

Bug: 148989018
Test: manual test
Change-Id: Iba2a7daa70eb00f0bba37317c9355531fbb77628
2020-04-23 12:18:23 +08:00
menghanli
8a27603600 Fix formats and internationalization of the string "0.6 seconds" in sk language
Root cause: The OTHER quantity does not require special treatment of the given quantity
Next: Using few quantity for the language requires special treatment of "small" numbers (as with  numbers ending 2, 3, or 4)

Bug: 154085511
Test: Change language to Slovensko to check the UI
Change-Id: I9143d9504cf8f9c5ccf17160e0dc0943fa10d31d
2020-04-23 11:30:17 +08:00
PETER LIANG
feb67761de Merge "Uniform the settings enum proto for accessibility tutorial." into rvc-dev am: a83a8e29c3 am: c9be2d385c am: 102651fad8 am: 357c9d5de6
Change-Id: I28d97b7d45b5bc356bdeba01c63cb075e68042f7
2020-04-22 13:00:24 +00:00
PETER LIANG
a83a8e29c3 Merge "Uniform the settings enum proto for accessibility tutorial." into rvc-dev 2020-04-22 11:42:27 +00:00
Jason Hsu
51dfd5b356 Merge "Show default description only if description and html description are empty" into rvc-dev am: 0055a74794 am: d31f5d58d8 am: 69eade7c4e am: 9103cf5254
Change-Id: I8d77752b010f610d852ada909112e160694a800f
2020-04-21 10:43:36 +00:00
jasonwshsu
f74c0a72b6 Show default description only if description and html description are empty
* AccessibilitySettings only get the description to pass to the
ToggleFeaturePreferenceFragment
* ToggleFeaturePreferenceFragment handle the default description logic

Bug: 154092127
Test: make -j64 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.accessibility.AccessibilitySettingsTest"
Change-Id: I516a393aeef1472ca5d185d477a2b0b108fc5342
2020-04-21 01:34:22 +00:00
jasonwshsu
b59175a5a3 Remove unused attribute 'EXTRA_SUMMARY_RES' am: 1be2666d11 am: e7766cc455 am: b25cd33e39 am: 86125faa38
Change-Id: I2b40e454750f7a6d62696b30a9e4fc96133882d4
2020-04-20 17:43:01 +00:00
jasonwshsu
1be2666d11 Remove unused attribute 'EXTRA_SUMMARY_RES'
* Magnification already use EXTRA_HTML_DESCRIPTION to replace it.

Bug: 154092127
Test: manual test
Change-Id: I5385907eb0911894159a80444493bf233bb43e1a
2020-04-20 23:09:59 +08:00
Peter_Liang
a277adc7c7 Uniform the settings enum proto for accessibility tutorial.
Replace 'DIALOG_TOGGLE_SCREEN_ACCESSIBILITY_BUTTON' and 'DIALOG_TOGGLE_SCREEN_GESTURE_NAVIGATION' with DIALOG_ACCESSIBILITY_TUTORIAL.

Bug: 148989018
Test: manual test
Change-Id: I991cc8fac532982ebdb4995b42ea01a3dc0e52e3
2020-04-20 16:00:39 +08:00
jasonwshsu
e1eec16427 Use new setting key to maintain the list of user assigned shortcut targets.
* Framework changes to keep ACCESSIBILITY_BUTTON_TARGET_COMPONENT
contains only a single target, use ACCESSIBILITY_BUTTON_TARGETS to maintain the targets list.

Bug: 151295675
Test: manual test
Change-Id: I2218402fd122acc9a86c64127e9cfcf77a6e241e
2020-04-16 17:21:20 +08:00
PETER LIANG
1bf15b52fb Merge "Revising the function name related to user shortcut type." into rvc-dev am: eb04ef4f75 am: 4c7a690479 am: be6265865c am: 53bf408b10 am: 4ef910ce6c
Change-Id: I87157d34786e5ff5fe5d1442ddfb9ac284ffa931
2020-04-15 23:55:30 +00:00
Peter_Liang
58cc3ea7f9 Revising the function name related to user shortcut type.
Should add 's' into the name.

Bug: 148989018
Test: manual test
Change-Id: I46aadb80f4f28dc1794fc3313563c79be149e847
2020-04-15 17:43:05 +08:00
TreeHugger Robot
d445934279 Merge "Hide Bluetooth, Reset, Accessibility Settings in ARC" into rvc-dev am: 545f08e872 am: 35d8c0bdb3 am: d2b330f5ef am: 2e7b71dce7
Change-Id: I7fe65de1a8576603a1b43123d7544872cfa66c7b
2020-04-13 01:42:25 +00:00
TreeHugger Robot
545f08e872 Merge "Hide Bluetooth, Reset, Accessibility Settings in ARC" into rvc-dev 2020-04-13 00:28:11 +00:00
TreeHugger Robot
30cd86012a Merge "Support click metrics logs in several pages" into rvc-dev am: afaf654a77 am: 976b3690fe am: 70f0c6a53f am: 8a009ac35d
Change-Id: If31a5ac9df256919696df72de5452e68b914deb3
2020-04-10 14:06:12 +00:00
TreeHugger Robot
afaf654a77 Merge "Support click metrics logs in several pages" into rvc-dev 2020-04-10 12:55:10 +00:00
Menghan Li
a530dc4621 Merge "Sets the scroll indicators for edit shortcut dialog." into rvc-dev am: 417011c6f7 am: 698b8f1f87 am: 534d5ca2b6 am: 0ed4426b51
Change-Id: I54e100b80baf1ed15dc132dd8ebecab545be2d85
2020-04-10 07:49:36 +00:00
Hiroki Sato
0e75d475ec Hide Bluetooth, Reset, Accessibility Settings in ARC
This is an upstreaming change of http://ag/8541963 and
http://ag/10296201 to hide some items from settings search.

This CL also adds javadoc to some settings classes to fix pre-upload
warnings.

Bug: 153704887
Test: Manual. In ARC build, "bluetooth" and "accessibility" no longer shows related settings.
Change-Id: Ic3e9217944251adbea1bdd67baf66d3a9e89583a
2020-04-10 16:00:57 +09:00
menghanli
bff36f7e8c Sets the scroll indicators for edit shortcut dialog.
- The indicators appears while content view is out of vision for vertical scrolling.

Bug: 142531156
Test: local test
Change-Id: Ifa1966b1df7628029976d27d72d2ae63d84e28c3
2020-04-10 00:32:04 +08:00
mincheli
c419cc6804 Applies magnification capability settings key
Bug: 144327603
Test: make RunSettingsRoboTests
Change-Id: I45cfc9ce646c8d0c9aaaeaa1cb073fb2ae1ec3de
2020-04-09 01:25:26 +00:00
mincheli
5c108a0b27 Add back the entrance of magnification settings in master branch
Bug: 146473544
Test: make RunSettingsRoboTests
Change-Id: I2e040c0b722944077dd026c32f195e5a45a52c88
2020-04-08 14:24:59 +08:00
Jason Chiu
b12e3b96c9 Support click metrics logs in several pages
- Assign metrics category to perferences at an earlier stage in
  DashboardFragment for better usability.

Bug: 137559984
Test: robotest
Change-Id: Icd4185efa0e655be20c4b673a1380fa42140923f
2020-04-07 16:44:53 +08:00
Jason Hsu
dfa6cf0d05 Merge "Add accessibility color inversion help resources to link to existing help page." into rvc-dev 2020-04-07 06:28:10 +00:00
Menghan Li
c0c522d999 Merge "Support caption second UI structure (5/n)" into rvc-dev 2020-04-07 04:24:20 +00:00
Menghan Li
47b01403ee Merge "Support autoclick secondary action (8/n)" into rvc-dev 2020-04-07 04:23:56 +00:00
jasonwshsu
7c073c4c40 Add accessibility color inversion help resources to link to existing help page.
Bug: 151604096
Bug: 150873532
Test: manual test
Change-Id: Ie042d822de3ff5017548b8d92c74b208ee1f3a02
2020-04-07 12:06:03 +08:00
Jason Hsu
eb11b5113c Merge "Add accessibility timeout help resources to link to existing help page." into rvc-dev 2020-04-06 05:56:18 +00:00
ChenJean
aa87e024d5 Support caption second UI structure (5/n)
Update constants

Bug: 143502915
Test: manual
Merged-In: I7d27bc255f4f5fa8d8a34e6ced533b61ea827ef1
Change-Id: I7d27bc255f4f5fa8d8a34e6ced533b61ea827ef1
(cherry picked from commit ba7eb47823)
2020-04-06 04:20:05 +00:00
ChenJean
9e1bb0def1 Support autoclick secondary action (8/n)
Modify options description logic from 5 types to 3 types.

Bug: 149884746
Test: manual
Merged-In: I714db2a450e34d33e5728cf355136d26bef77e11
Change-Id: I714db2a450e34d33e5728cf355136d26bef77e11
(cherry picked from commit b6d6d9da46)
2020-04-06 04:19:16 +00:00
jasonwshsu
65b3c904a5 Add accessibility timeout help resources to link to existing help page.
Bug: 151605034
Bug: 150915029
Test: manual test
Change-Id: I3482711fdf417989a8a8ec3bd05fbf81bdd947cb
2020-04-03 00:28:33 +08:00
jasonwshsu
bfc3201e84 Show empty options in shortcut chooser dialog if shortPreference is unchecked.
* Fix the magnification can not auto restore shortcut options.
* The shortcut chooser dialog behavior will be:
1. If user's toggle switch is turned off, and they open the shortcut chooser dialog, none of the options are selected. In this state, if user chooses some of the shortcuts and saves, these choices will be honored.
2. If user's toggle switch is turned off, and they turn on the switch without opening the shortcut chooser dialog, their previously-saved shortcut option is brought back (e.g. if I previously used a11y button, I turn toggle switch off and then on again, I still have a11y button).
3. If user's toggle switch is turned on, and they open the shortcut chooser dialog, their previously-saved shortcut options will be shown.

Bug: 152539702
Bug: 153042341
Test: manual test
Change-Id: Ic109b3363eaf00ba77ce0ed05f4ec11517b1367e
2020-04-02 15:38:11 +08:00