Commit Graph

64562 Commits

Author SHA1 Message Date
Automerger Merge Worker
d8d4c6ec57 Merge changes from topic "am-95ec15c13b8948e1b7e3eeb03b293219" into rvc-d1-dev-plus-aosp
* changes:
  Merge "[a11y] Fix TalkBack readback on adb qrcode fragment." into rvc-dev am: 23040a3b2b am: 9ca30c00b2
  [a11y] Set focus on "Pairing device" text once QR code is scanned. am: 2a85924977 am: 7c6cf5a537
2020-04-07 18:15:36 +00:00
Joshua Duong
3c02ed26cf Merge "[a11y] Fix TalkBack readback on adb qrcode fragment." into rvc-dev am: 23040a3b2b am: 9ca30c00b2
Change-Id: I4c76daaa21e33037ec39a9a1eb61db0d2836a8fe
2020-04-07 18:15:32 +00:00
Joshua Duong
13d1ab21a6 [a11y] Set focus on "Pairing device" text once QR code is scanned. am: 2a85924977 am: 7c6cf5a537
Change-Id: I0896e0178ce5788282d76955e4cf34d0648d1df0
2020-04-07 18:15:29 +00:00
Joshua Duong
1db1005917 Merge "[a11y] Fix TalkBack readback on adb qrcode fragment." into rvc-dev am: 23040a3b2b am: b56a1dde4c
Change-Id: I99bab05797892bc16b1e11eb0443289e5d166db0
2020-04-07 18:15:22 +00:00
Joshua Duong
7fe48efd12 [a11y] Set focus on "Pairing device" text once QR code is scanned. am: 2a85924977 am: 586eb5ed83
Change-Id: Iab637847d5d43ab8e80dbe8b961625077698b209
2020-04-07 18:15:19 +00:00
Joshua Duong
4b5d5901ec Merge "[a11y] Fix TalkBack readback on adb qrcode fragment." into rvc-dev am: 23040a3b2b am: b56a1dde4c
Change-Id: Ifff24ae7e17287711ca19e3166a07a71eae45d8c
2020-04-07 18:09:58 +00:00
Joshua Duong
4a7fff070c [a11y] Set focus on "Pairing device" text once QR code is scanned. am: 2a85924977 am: 586eb5ed83
Change-Id: I7b20c1c71581af6822d4d286210fcdd24a2652e6
2020-04-07 18:09:53 +00:00
Joshua Duong
9ca30c00b2 Merge "[a11y] Fix TalkBack readback on adb qrcode fragment." into rvc-dev am: 23040a3b2b
Change-Id: I1bb852b94007710de67876ee0a5e7300603d694a
2020-04-07 18:09:02 +00:00
Joshua Duong
7c6cf5a537 [a11y] Set focus on "Pairing device" text once QR code is scanned. am: 2a85924977
Change-Id: If361d8c9e48f81a38f7745a8377fa3ea488fcf99
2020-04-07 18:09:00 +00:00
Joshua Duong
b56a1dde4c Merge "[a11y] Fix TalkBack readback on adb qrcode fragment." into rvc-dev am: 23040a3b2b
Change-Id: I118932876cf382aefb10a353ee71d3ce1609b055
2020-04-07 18:08:51 +00:00
Joshua Duong
586eb5ed83 [a11y] Set focus on "Pairing device" text once QR code is scanned. am: 2a85924977
Change-Id: Ice68896be60217349f486d337a1707c705505998
2020-04-07 18:08:49 +00:00
Joshua Duong
23040a3b2b Merge "[a11y] Fix TalkBack readback on adb qrcode fragment." into rvc-dev 2020-04-07 18:07:16 +00:00
Joshua Duong
5866463e16 [a11y] Fix TalkBack readback on adb qrcode fragment.
TalkBack was picking up the text in the action bar, so if we hide it,
it will read the first body of text it encounters which would be "Scan
QR code. Pair device over Wi-Fi by scanning a QR code."

Bug: 152461605

Test: Manual. Enable TalkBack in Settings > Accessibility > TalkBack.
Navigate to Developer options > Wireless debugging > Pair by QR code.
When QR code scanner fragment opens, it should say "Scan QR code. Pair
device over Wi-Fi by scanning a QR code."

Change-Id: Ia91bf4ea215e6a377335f2b9dcf2acf10afd268e
(cherry picked from commit bfd73c0d78)
Exempt-From-Owner-Approval: cherry-pick
2020-04-07 18:06:37 +00:00
Joshua Duong
2a85924977 [a11y] Set focus on "Pairing device" text once QR code is scanned.
Bug: 152462657

Test: Manual. Enable TalkBack in Settings > Accessibility. Navigate to
Developer options > Wireless debugging > Pairing device with QR code.
Scan a valid QR code, which should change to "Pairing device..." and
screen reader should say "Pairing device".

Change-Id: If467b56f787bda765fce1e5d46f8ab3c6210dc76
(cherry picked from commit 07ad841e2d)
Exempt-From-Owner-Approval: cherry-pick
2020-04-07 18:06:25 +00:00
TreeHugger Robot
40cc13b1b0 Merge "Adjust tap targets in history" into rvc-dev am: 7c4557bec8 am: ceac4f44b9 am: c0510ab6f4 am: 581ccf9a7c
Change-Id: I0f16bb41599f158760f8be5e0c0f5e0d7e99a257
2020-04-07 15:00:45 +00:00
TreeHugger Robot
8290ca9205 Merge "Adjust tap targets in history" into rvc-dev am: 7c4557bec8 am: 1f80709343 am: 08273a87f6
Change-Id: I14bc5e952341fa91baa4bfe92b75cf97a867986e
2020-04-07 14:53:58 +00:00
TreeHugger Robot
801743a362 Merge "Adjust tap targets in history" into rvc-dev am: 7c4557bec8 am: ceac4f44b9 am: 0e33c051c0
Change-Id: I3ab64ed6051e3e069adf1a9cdb863f5ffb208193
2020-04-07 14:52:22 +00:00
TreeHugger Robot
581ccf9a7c Merge "Adjust tap targets in history" into rvc-dev am: 7c4557bec8 am: ceac4f44b9 am: c0510ab6f4
Change-Id: I9a596eed261f3c271f3f848a861c6c8291b04dc6
2020-04-07 14:52:00 +00:00
TreeHugger Robot
08273a87f6 Merge "Adjust tap targets in history" into rvc-dev am: 7c4557bec8 am: 1f80709343
Change-Id: I36f894fea05993af901ce916009388057e5e8c27
2020-04-07 14:42:24 +00:00
menghanli
be11a370e6 Fix gesture navigation popup is displaying inconsistently on the System navigation page.
- Need to use new api to get the accessibility service list.

Bug: 149665916
Test: local test
Change-Id: Ib712769436bf7be5fbea34ba2251bdbe6bcefb95
2020-04-07 22:42:20 +08:00
TreeHugger Robot
c0510ab6f4 Merge "Adjust tap targets in history" into rvc-dev am: 7c4557bec8 am: ceac4f44b9
Change-Id: I164b2587f5c2840fa3e21c3c1d29b8a0bde95ea0
2020-04-07 14:40:50 +00:00
TreeHugger Robot
0e33c051c0 Merge "Adjust tap targets in history" into rvc-dev am: 7c4557bec8 am: ceac4f44b9
Change-Id: Ib835a71df1f54be8544e4d85f872dd9e43defcba
2020-04-07 14:40:27 +00:00
TreeHugger Robot
1f80709343 Merge "Adjust tap targets in history" into rvc-dev am: 7c4557bec8
Change-Id: Ic3ffd4305548bab9d15196cdccea795417566060
2020-04-07 14:24:39 +00:00
TreeHugger Robot
ceac4f44b9 Merge "Adjust tap targets in history" into rvc-dev am: 7c4557bec8
Change-Id: I650b9faf069cb50999d1a3d99665ff5d4411b956
2020-04-07 14:24:34 +00:00
TreeHugger Robot
7c4557bec8 Merge "Adjust tap targets in history" into rvc-dev 2020-04-07 14:12:35 +00:00
TreeHugger Robot
3fd62755a1 Merge "The text on toast should be changed when remains 1 time for SIM lock input" into rvc-dev am: 9a84a2d544 am: 6882062638 am: 9f4acebb5f am: 5b81702572
Change-Id: Id2c4b04565609ee64f8a68ee5efa5ebd412bbaff
2020-04-07 12:16:18 +00:00
Bonian Chen
5a31b13971 [Settings] "Data during calls" in DDS SUB is still in advanced option.
The DataDuringCallsPreferenceController didn't listen the mobile data changed and update the preference.

Bug: 149344454
Test: make RunSettingsRoboTests ROBOTEST_FILTER=DataDuringCallsPreferenceControllerTest

Merged-In: I0121f06efb5257dccc05ad06b93a9db263f012b5
Change-Id: I6c8802aeb7b4f4850cb143e70a9e06de9fd93902
2020-04-07 20:11:09 +08:00
TreeHugger Robot
18e20a058f Merge "The text on toast should be changed when remains 1 time for SIM lock input" into rvc-dev am: 9a84a2d544 am: 2bf987e586 am: 40a0e05fd4
Change-Id: I3e4499fb0863d56d2f0966f1dd03cc7b2de20b99
2020-04-07 12:01:50 +00:00
TreeHugger Robot
c596957b07 Merge "The text on toast should be changed when remains 1 time for SIM lock input" into rvc-dev am: 9a84a2d544 am: 6882062638 am: cb0d8ba575
Change-Id: I5e74deeb8c8431b896cdc0c194e662ed92ab0c85
2020-04-07 12:01:44 +00:00
TreeHugger Robot
5b81702572 Merge "The text on toast should be changed when remains 1 time for SIM lock input" into rvc-dev am: 9a84a2d544 am: 6882062638 am: 9f4acebb5f
Change-Id: I20bd31116c7d40698c2546bb00d4c3e6564710a8
2020-04-07 12:01:15 +00:00
TreeHugger Robot
40a0e05fd4 Merge "The text on toast should be changed when remains 1 time for SIM lock input" into rvc-dev am: 9a84a2d544 am: 2bf987e586
Change-Id: Ia3b6c4b3b7f0a4abdfca77a2d1ef3ccc0b70f4ef
2020-04-07 11:53:17 +00:00
Automerger Merge Worker
7ab0499a38 Merge "Catch crash in mobile network ProgressDialog" am: aaee4539c7 am: 840506e88a am: 2d84cdbc3a am: e6c57426cd am: 7300bab2b6
Bug: 146057372

Change-Id: If80a964d28950288f042d4a1ccfc183b9c4f0067
(cherry picked from commit 0577514d0d)
2020-04-07 11:49:41 +00:00
TreeHugger Robot
9f4acebb5f Merge "The text on toast should be changed when remains 1 time for SIM lock input" into rvc-dev am: 9a84a2d544 am: 6882062638
Change-Id: If7383eeace3677f175e86939ea080db0c8da273c
2020-04-07 11:47:25 +00:00
TreeHugger Robot
cb0d8ba575 Merge "The text on toast should be changed when remains 1 time for SIM lock input" into rvc-dev am: 9a84a2d544 am: 6882062638
Change-Id: I03e4f69f5802783792c27fc79f759d0476288e56
2020-04-07 11:46:54 +00:00
TreeHugger Robot
2bf987e586 Merge "The text on toast should be changed when remains 1 time for SIM lock input" into rvc-dev am: 9a84a2d544
Change-Id: I84afaeb5920c87dce64be375657d769f4770d876
2020-04-07 11:39:56 +00:00
TreeHugger Robot
6882062638 Merge "The text on toast should be changed when remains 1 time for SIM lock input" into rvc-dev am: 9a84a2d544
Change-Id: I275316f28e7cd9027a5e121b76f6af52283c8ad9
2020-04-07 11:39:41 +00:00
Bonian Chen
1df6c9cdd4 [Settings] Code refactor
Remove unused import

Bug: 10956255
Test: build pass
Change-Id: I256870483d85bf7000556357071834cad24884d1
2020-04-07 19:29:49 +08:00
TreeHugger Robot
9a84a2d544 Merge "The text on toast should be changed when remains 1 time for SIM lock input" into rvc-dev 2020-04-07 11:23:32 +00:00
TreeHugger Robot
705610b21a Merge "Add keywords for system naviagtion setting" into rvc-dev am: e55fe59844 am: a08e2e4976 am: 8c698be978 am: f33b730c53
Change-Id: I5500fb20d7c41a24c7d957532edf4a8fc0662adc
2020-04-07 11:19:51 +00:00
TreeHugger Robot
f33b730c53 Merge "Add keywords for system naviagtion setting" into rvc-dev am: e55fe59844 am: a08e2e4976 am: 8c698be978
Change-Id: Id55fbfb85c65e8069b3c37d7f55204ea98f62732
2020-04-07 11:04:17 +00:00
TreeHugger Robot
cbfa4ac95e Merge "Add keywords for system naviagtion setting" into rvc-dev am: e55fe59844 am: 5230f73c24 am: 2b1b3a3235
Change-Id: I4d66ce545dded7857e626cf8107065bbc949e928
2020-04-07 11:04:07 +00:00
TreeHugger Robot
eda0fb7123 Merge "Add keywords for system naviagtion setting" into rvc-dev am: e55fe59844 am: a08e2e4976 am: 818a285564
Change-Id: I5bfd565e46af65a1387d34589f95b87ff336c1cd
2020-04-07 11:03:50 +00:00
TreeHugger Robot
8c698be978 Merge "Add keywords for system naviagtion setting" into rvc-dev am: e55fe59844 am: a08e2e4976
Change-Id: I4b12c37a4e438edae5a3b954cc7e51c73f65a9cc
2020-04-07 10:51:41 +00:00
TreeHugger Robot
2b1b3a3235 Merge "Add keywords for system naviagtion setting" into rvc-dev am: e55fe59844 am: 5230f73c24
Change-Id: I0286f3c98ac3f324ad22199ae41c7b8b26736a22
2020-04-07 10:51:30 +00:00
TreeHugger Robot
818a285564 Merge "Add keywords for system naviagtion setting" into rvc-dev am: e55fe59844 am: a08e2e4976
Change-Id: I945715634aa4723781ae2cdb34cbe889ba55580a
2020-04-07 10:51:08 +00:00
TreeHugger Robot
5230f73c24 Merge "Add keywords for system naviagtion setting" into rvc-dev am: e55fe59844
Change-Id: Iece5c56dd27f2777c725f665b3f14afa5fbc9839
2020-04-07 10:37:52 +00:00
TreeHugger Robot
a08e2e4976 Merge "Add keywords for system naviagtion setting" into rvc-dev am: e55fe59844
Change-Id: Ic357e80726731fad84ee277dfcc33afd8e8373a7
2020-04-07 10:37:43 +00:00
TreeHugger Robot
e55fe59844 Merge "Add keywords for system naviagtion setting" into rvc-dev 2020-04-07 10:22:07 +00:00
Bonian Chen
71101c5cbd [automerger skipped] Merge "[Settings] Refactor TelephonyConstants" am: 9371311309 am: d998b07a01 -s ours am: 54209e0477 -s ours am: de17f8a7f1 -s ours
am skip reason: Change-Id If0552d7ce20de5941667aa64e682202aaf32c597 with SHA-1 b1c7e21066 is in history

Change-Id: Id3f57a4b4d8d2106c754ca23aa163425476a43c9
2020-04-07 09:05:32 +00:00
Tsung-Mao Fang
9c69ded434 The text on toast should be changed when remains 1 time for SIM lock input
This cl was cherry-picked from aosp/585306

The behavior of getQuantityString() is different according to language, it gets
both "other" and "one" string if English is system language. But it always gets
"other" string if non-English, then the "other" string of wrong_pin_code is
shown even if remains 1 time of SIM lock input.

In order to change the string in any language, we add new string for
remains 1 time.

Test: Rebuild rom
Fix: 71783850
Change-Id: If4b53bbbc6b51582bc0837abf4497d9a75ebbaad
2020-04-07 16:54:06 +08:00