Commit Graph

580 Commits

Author SHA1 Message Date
Automerger Merge Worker
01233f2fc2 Merge "Update R acessibility assets and strings (2/n)" into rvc-dev am: 873b50a46a am: 4c69bcab70 am: 5ed8894807 am: e5be54a8f4
Change-Id: I31126710d4b2085711992fcb3da0ffef6e804a23
2020-03-12 06:43:06 +00:00
Automerger Merge Worker
e673cc176f Merge "Update R acessibility assets and strings (1/n)" into rvc-dev am: 3fd654becb am: 9e15dc3582 am: d137a12391 am: 81f18805dd
Change-Id: I7aa20264dced48447aa8ee8466b4f5e03b69bda3
2020-03-12 06:42:26 +00:00
Menghan Li
873b50a46a Merge "Update R acessibility assets and strings (2/n)" into rvc-dev 2020-03-12 05:37:32 +00:00
menghanli
a248e0e6d5 Update R acessibility assets and strings (1/n)
- Color correction
- Color inversion
- Magnification
- Dwell
- Caption preferences
- Allow shortcut from lockscreen

Bug: 148837311
Test: Manual test
Change-Id: I1f5ff3bcbf53dab508311bcea3712ad2b30898eb
2020-03-12 07:18:58 +08:00
Automerger Merge Worker
5df2b2f142 Merge "Align help resource usage in caption preferences." into rvc-dev am: 91e5ece7ab am: 07fb084ce7 am: bfa63c5fbd am: 87b44ea9da
Change-Id: I887ce0220886c085531c0e484373e2976865518a
2020-03-11 20:49:45 +00:00
Jason Hsu
91e5ece7ab Merge "Align help resource usage in caption preferences." into rvc-dev 2020-03-11 17:47:16 +00:00
menghanli
19cf6ddff8 Update R acessibility assets and strings (2/n)
- Temporary-use template summary by shortcut state

Bug: 148837311
Test: Manual test
Change-Id: Ia720b8f3f317bb1874d6758ebc4fbf4145d0c217
2020-03-11 17:21:27 +08:00
Automerger Merge Worker
6c96993e25 Merge "ShortcutPreference Toggle design (2/n)" into rvc-dev am: 42dcad9b2b am: 888ebb0dbb am: 6a6d437ffb am: 538ab8c28b
Change-Id: I16eb36a8ef7d74b8015fec7221f8047e1db51011
2020-03-09 08:46:54 +00:00
menghanli
5d7083a103 ShortcutPreference Toggle design (2/n)
- Removes edit shortcut disable condition.
- Shows "off" if user removes all items in edit dialog.
- Restores last time what user chosen options when show edit dialog.

Bug: 148989269
Test: Manually test
Change-Id: I105abda782999d38c92e3de9811e2fd378869e73
2020-03-06 18:02:53 +08:00
Automerger Merge Worker
512cc0fc8d Merge "Update edit shortcut dialog measurements and assets." into rvc-dev am: b6ab224ddb am: 696d25adf0 am: 5b97ecf287 am: 223199e10c
Change-Id: I0050be30c56fb5218d474f307d44545b452a49a6
2020-03-06 09:11:03 +00:00
menghanli
fd5143751e Update edit shortcut dialog measurements and assets.
Bug: 148837311
Test: Manual test
Change-Id: I0c018f3f39e43657cbbd45734846213c9964a268
2020-03-05 22:32:33 +08:00
jasonwshsu
0259f84c5f Align help resource usage in caption preferences.
* Add string to get the help page intent

Bug: 149887377
Test: manual test
Change-Id: I15b9c4edd260153aa929d68845faed0af16a4ffa
2020-03-05 21:02:47 +08:00
Automerger Merge Worker
515eced35a Merge "Accessibility shortcut primary action - remove search and help icon" into rvc-dev am: 91d2dbe2d4 am: d53f368e7e am: 1272338049 am: a3f95abb80 am: d21ff96627
Change-Id: If3f69e5e7e2f3ad5ab9494e208b6eef7f095fcd9
2020-03-04 13:32:50 +00:00
Automerger Merge Worker
99983fe462 Merge "Accessibility shortcut primary action - add settings UI for accessibility shortcut type fragment" into rvc-dev am: 58081f2c36 am: 2f0acb9ac5 am: 3d9118084d am: de5ef978c1 am: f3ae51c8af
Change-Id: Id446eb10fb103edc8f90ecf69fc12040419e3381
2020-03-04 13:32:34 +00:00
Jason Hsu
91d2dbe2d4 Merge "Accessibility shortcut primary action - remove search and help icon" into rvc-dev 2020-03-04 12:14:49 +00:00
Jason Hsu
58081f2c36 Merge "Accessibility shortcut primary action - add settings UI for accessibility shortcut type fragment" into rvc-dev 2020-03-04 12:13:42 +00:00
jasonwshsu
693068f512 Accessibility shortcut primary action - remove search and help icon
* Show search and help page only for accessibility framework feature. Framework don't know the information for downloaded accessibility.
* Modify MagnificationPreferenceFragment to use same logic.

Bug: 142531433
Bug: 150130421
Test: manual test
Change-Id: I29ab5080acc035f46f1e816a9df1b46020bc356c
2020-03-04 17:27:35 +08:00
jasonwshsu
c7fa4da58d Accessibility shortcut primary action - add settings UI for accessibility shortcut type fragment
Bug: 142531433
Test: manual test
Change-Id: I6a9eebc1718f2b924cfb373f09abb57890fa10a5
2020-03-04 16:06:41 +08:00
Automerger Merge Worker
c22840f7ec Merge "ShortcutPreference Toggle design." into rvc-dev am: 6acde7c21f am: 36a30b38b9 am: 3cee900a20 am: 9c00d5db7b
Change-Id: If0a32e40551cb39287b248ff481d8f60bc1e3610
2020-03-03 12:58:18 +00:00
menghanli
919e555a51 ShortcutPreference Toggle design.
- For target SDK < 30 app show as preference item to trigger shortcut on/off.
- For target SDK >= 30 app show two item: the left one can edit shortcut and the right one be a on/off trigger button.

The design is reference from WIFI setting which has similar comportment.

Bug: 148989269
Test: Test result in Buganizer.

Change-Id: I815206d9e885c01bf3e6445820176aed4a743323
2020-03-03 17:31:27 +08:00
Automerger Merge Worker
57e7ed0704 Merge "Accessibility Service & Shortcut Redesign - Remove “volume key shortcut” setting (5/n)" into rvc-dev am: c023e758f7 am: 8c131f3213 am: d7ba7964c1 am: 1d6fcee05e
Change-Id: I3205776376d20d8586e4eeb4a081b5a53f588c3a
2020-02-27 07:59:10 +00:00
TreeHugger Robot
c023e758f7 Merge "Accessibility Service & Shortcut Redesign - Remove “volume key shortcut” setting (5/n)" into rvc-dev 2020-02-27 06:57:22 +00:00
jasonwshsu
5c38960848 Accessibility Service & Shortcut Redesign - Remove “volume key shortcut” setting (5/n)
* AccessibilityShortcutPreferenceFragment was removed,
ShortcutServicePickerFragment should also removed.

Bug: 142529032
Test: Manual test
Change-Id: I08f96a3794235d308b10f3846f1b4f7bb4306923
2020-02-26 21:17:59 +08:00
Peter_Liang
ab05476fc1 Fine-tune the widget of "Allow rich content in Accessibility Settings" for security.
1. Remove tag checker in HtmlTextPreference.
2. Set the max height for AnimatedImagePreference.

Bug: 149516547
Test: manaul test
Change-Id: I98f49d055db9427d91a3f1ca816e94a11d29cd3d
Merged-In: I98f49d055db9427d91a3f1ca816e94a11d29cd3d
(cherry picked from commit 10bc375176)
2020-02-25 09:06:12 +00:00
Jean Chen
ad2dc2b361 Merge "Support caption second UI structure (5/n)" 2020-02-24 07:48:13 +00:00
TreeHugger Robot
2f011c4246 Merge "Support autoclick secondary action (8/n)" 2020-02-22 10:28:40 +00:00
Peter_Liang
10bc375176 Fine-tune the widget of "Allow rich content in Accessibility Settings" for security.
1. Remove tag checker in HtmlTextPreference.
2. Set the max height for AnimatedImagePreference.

Bug: 149516547
Test: manaul test
Change-Id: I98f49d055db9427d91a3f1ca816e94a11d29cd3d
2020-02-21 21:35:29 +00:00
ChenJean
ba7eb47823 Support caption second UI structure (5/n)
Update constants

Bug: 143502915
Test: manual
Change-Id: I7d27bc255f4f5fa8d8a34e6ced533b61ea827ef1
2020-02-21 17:59:37 +08:00
ChenJean
b6d6d9da46 Support autoclick secondary action (8/n)
Modify options description logic from 5 types to 3 types.

Bug: 149884746
Test: manual
Change-Id: I714db2a450e34d33e5728cf355136d26bef77e11
2020-02-21 16:54:09 +08:00
PETER LIANG
52ff691add Merge "Revise the modifier and naming of public APIs for allow rich content." 2020-02-19 23:51:48 +00:00
Jason Hsu
9ab1bd2587 Merge changes from topic "open_shortcut"
* changes:
  Accessibility shortcut primary action - implement launched type fragment.
  Accessibility shortcut primary action - setup entry for launched type fragment.
2020-02-19 13:58:25 +00:00
Peter_Liang
4f01e9aa46 Revise the modifier and naming of public APIs for allow rich content.
Change "int getAnimatedImageRes()" to "Drawable loadAnimatedImage(PackageManager packageManager)"

Bug: 142532186
Test: manual test
Change-Id: I9d56e53fd8c4050fda0c5c82c7265330246e4119
2020-02-19 21:43:00 +08:00
jasonwshsu
db883712c3 Accessibility shortcut primary action - implement launched type fragment.
Bug: 142531433
Test: make RunSettingsRoboTests
Change-Id: I444bcc921b2a05483e508934c6f0b90b2cc53421
2020-02-19 15:25:59 +08:00
jasonwshsu
b67d873372 Accessibility shortcut primary action - setup entry for launched type fragment.
* Reduce the complexity of updateServicePreferences.
* Introduces RestrictedPreferenceHelper to setup installed
AccessibilityServiceInfo and AccessibilityShortcutInfo.

Bug: 142531433
Test: make RunSettingsRoboTests
Change-Id: I0f5eeac56a93caadeb05c25f1f8c4daa0d775b35
2020-02-19 15:25:48 +08:00
menghanli
c4cbe4ec43 Fix “Select to Speak & TalkBack ” Functionalities broken from Vision Settings.
getArguments() order to cause the mToggleServiceDividerSwitchPreference is null.

Bug: 149663592
Test: Manual test
Change-Id: I2d4a229f9386cf5c223056b39174c0e4bd891bdc
2020-02-19 03:17:00 +00:00
menghanli
9a12fd86c8 Fix overlapped Voice Access labeled item in shortcut component.
The label of shortcut preference and checkbook are overlapped, but only
the checkbox can be triggered.

Action: set parent layout to be non-selectable.

Bug: 149627994
Test: Manual test
Change-Id: Ic0b58159111c27ef94b10c6935178c3b80995d11
2020-02-17 13:33:05 +00:00
Jean Chen
b18b637b0e Merge "Support caption second UI structure (4/n)" 2020-02-17 03:41:48 +00:00
ChenJean
04fe3260d7 Support caption second UI structure (4/n)
Always show preview text on windows.

Bug: 143502915
Test: manual
Change-Id: I65b48373905fc59a664c51500613f1dc509b5c8f
2020-02-17 10:16:00 +08:00
Menghan Li
9d664e3c90 Merge "Use a configurable default if the setting has never been set." 2020-02-16 00:38:50 +00:00
menghanli
655551841a Use a configurable default if the setting has never been set.
AccessibilityManager#getAccessibilityShortcutTargets may not return
correct shortcut targets during boot. Needs to read settings directly.

Bug: 149293174
Bug: 147989561
Test: Manual test
Change-Id: Ia8997b08d11da78dab5cd568787e9c61b0b0eeab
2020-02-16 00:38:31 +00:00
Jason Hsu
133dc99b42 Merge "Fix the animated image can not be displayed." 2020-02-15 09:22:58 +00:00
jasonwshsu
78400244af Fix the animated image can not be displayed.
* Need to process arguments earlier.

Bug: 142528112
Test: Manual test
Change-Id: I63e116e47ccdb6409969f629b41b8c3622adb9dc
2020-02-15 15:53:45 +08:00
Jason Hsu
e5cdb3a9ac Merge "Fix the NPE error when get the service summary." 2020-02-15 07:05:23 +00:00
jasonwshsu
13b6850c52 Fix the NPE error when get the service summary.
* Check NPE for AccessibilityInfo.loadSummary()
* Remove the state argument that could get from info argument

Bug: 148837311
Test: Manual test
Change-Id: Ic6906fdbdd7f1c241776d1045be33f89468670b6
2020-02-15 11:49:37 +08:00
Menghan Li
c23968fe0d Merge "Use HTML text preference for rich content" 2020-02-14 10:57:26 +00:00
Jean Chen
e9f289d5b3 Merge "Support autoclick secondary action (5/n)" 2020-02-14 01:28:15 +00:00
Menghan Li
655debca76 Merge "Accessibility Service & Shortcut Redesign - Remove “volume key shortcut” setting (2/n)" 2020-02-14 00:01:49 +00:00
Menghan Li
14c548e38a Merge "Remove on/off information if the services cannot toggle service on/off" 2020-02-13 15:33:48 +00:00
menghanli
04a46cb7c6 Remove on/off information if the services cannot toggle service on/off
Bug: 148837311
Test: Manual test
Change-Id: I57e0ed33bebc41cde99008bb2ed014c63194c52a
2020-02-13 10:41:30 +00:00
menghanli
a8b9f30d11 Accessibility Service & Shortcut Redesign - Remove “volume key shortcut” setting (2/n)
Bug: 142529032
Test: make RunSettingsRoboTests ROBOTEST_FILTER=AccessibilityShortcutPreferenceControllerTest
Change-Id: Ic55d4fd8db0678b8fccbbb6ef1d217b47a5094bd
2020-02-13 15:44:11 +08:00