Commit Graph

20819 Commits

Author SHA1 Message Date
Beverly
9c622a85a4 Update "important" conversations to "priority"
To maintain consistency between Conversation settings pages and
conversation notification guts text.

Test: manual
Fixes: 153624868
Change-Id: I58cd80403e8bdff32722c95ab8ac2278604ea3dd
2020-04-09 13:57:14 +00:00
TreeHugger Robot
e0767c012e Merge "Remove unused file." into rvc-dev am: 493c841a3a
Change-Id: I1cbbd17beb7a7e3cc3d6009218dca52f34efaa13
2020-04-09 13:44:16 +00:00
TreeHugger Robot
4a00690e81 Merge "Remove unused file." into rvc-dev am: 493c841a3a
Change-Id: Ib6357e2044b45a096fde4d6cd74502b5062f1914
2020-04-09 13:44:06 +00:00
TreeHugger Robot
493c841a3a Merge "Remove unused file." into rvc-dev 2020-04-09 13:28:21 +00:00
Pavel Grafov
6684c5c4f8 Remove unused file.
Bug: 149075700
Test: compiles
Change-Id: Iaa50a96107ca9cb4419875e4067e61a8f5d093e5
2020-04-09 12:22:01 +01:00
Goven Liu
c8cc5d0bbe Merge "[Wi-Fi] Use getUriHelpString() result to judge if Settings APP should register the help button click event and file related intent if need." into rvc-dev am: 5a8e9e452a am: e5153b50f6 am: 67f7f28b2b am: 46b44a95c7
Change-Id: Ib7291dd2b494b9426fd60c446d9f3162628268d5
2020-04-08 23:23:39 +00:00
Goven Liu
febabbdf12 Merge "[Wi-Fi] Use getUriHelpString() result to judge if Settings APP should register the help button click event and file related intent if need." into rvc-dev am: 5a8e9e452a am: e5153b50f6 am: c79dc027de
Change-Id: I20b647683040bb4ec371d13ac2c8749feb5882c6
2020-04-08 22:56:00 +00:00
Goven Liu
c23f06f079 Merge "[Wi-Fi] Use getUriHelpString() result to judge if Settings APP should register the help button click event and file related intent if need." into rvc-dev am: 5a8e9e452a
Change-Id: Id1c48c08e3e141b207488e3a86e9a7542ed53e6a
2020-04-08 22:42:34 +00:00
Goven Liu
e5153b50f6 Merge "[Wi-Fi] Use getUriHelpString() result to judge if Settings APP should register the help button click event and file related intent if need." into rvc-dev am: 5a8e9e452a
Change-Id: I029733e8a768a097c6eaf513566772c375d6073f
2020-04-08 22:42:28 +00:00
Goven Liu
5a8e9e452a Merge "[Wi-Fi] Use getUriHelpString() result to judge if Settings APP should register the help button click event and file related intent if need." into rvc-dev 2020-04-08 22:37:35 +00:00
TreeHugger Robot
d2774334aa Merge "Update display logic for no shared data." into rvc-dev am: e886ef9e9a am: b0171b6a58 am: b7c70e141a am: 3803f40c26
Change-Id: If8e743b89bcfee32ab087fd0a0514aa7afe17c19
2020-04-08 16:07:22 +00:00
TreeHugger Robot
f1f1074034 Merge "Update display logic for no shared data." into rvc-dev am: e886ef9e9a am: b0171b6a58 am: 95784202e7
Change-Id: I345084140b6b406f9c6b4e2ce41337c242ed5e1a
2020-04-08 15:49:03 +00:00
TreeHugger Robot
bc7986e92b Merge "Update display logic for no shared data." into rvc-dev am: e886ef9e9a
Change-Id: I95e826289036439674c19c52b1871d1820d06cac
2020-04-08 15:21:41 +00:00
TreeHugger Robot
b0171b6a58 Merge "Update display logic for no shared data." into rvc-dev am: e886ef9e9a
Change-Id: I3a9cfaa21188906acb440216314cf412bf3221ed
2020-04-08 15:21:33 +00:00
TreeHugger Robot
e886ef9e9a Merge "Update display logic for no shared data." into rvc-dev 2020-04-08 15:11:37 +00:00
TreeHugger Robot
f400f8c880 Merge "Update string to Android security update" into rvc-dev am: f10afc071f am: cf485a9b31 am: a1151b054a am: ab0132097f
Change-Id: Iadb9035f1497a5cfc0b9bd178b9df1a58308bdcc
2020-04-08 12:59:52 +00:00
TreeHugger Robot
d37ed99ac3 Merge "Update string to Android security update" into rvc-dev am: f10afc071f am: cf485a9b31 am: 2321c0aded
Change-Id: Ia7b96d94e72a1a7f997a3a998dd952e443b4c853
2020-04-08 12:47:26 +00:00
TreeHugger Robot
0affb4891f Merge "Update string to Android security update" into rvc-dev am: f10afc071f
Change-Id: I1a6535c3c0f328b9a57e9693be0f492c941f8a10
2020-04-08 12:19:23 +00:00
TreeHugger Robot
cf485a9b31 Merge "Update string to Android security update" into rvc-dev am: f10afc071f
Change-Id: I127edfd51a04449945bda3262ef3de4c201de026
2020-04-08 12:19:08 +00:00
TreeHugger Robot
f10afc071f Merge "Update string to Android security update" into rvc-dev 2020-04-08 12:05:59 +00:00
Mill Chen
3cde287564 Update string to Android security update
For consistency with Mainline, we changed the string from Android
security patch level to Android security update.

Fixes: 151841551
Test: robotests
Change-Id: I6e53cef54add7f5f00b9766a5f2e9fdea9a62dd5
2020-04-08 09:08:01 +00:00
TreeHugger Robot
5dd64aeef2 Merge "Import translations. DO NOT MERGE" 2020-04-08 05:50:29 +00:00
govenliu
a82d2c8a88 [Wi-Fi] Use getUriHelpString() result to judge if Settings APP should register the help button click event and file related intent if need.
The Openroaming help button should show only when the getHelpUriString() value is not null, and need to handle the click event in Settings APP.

Bug: 146669261
Test: Adjust unit test cases:
      1. make RunSettingsRoboTests ROBOTEST_FILTER=WifiEntryPreferenceTest
      2. make RunSettingsRoboTests ROBOTEST_FILTER=WifiSettings2Test
Change-Id: I27a717c3014b01cc464908bac56f64bd08aa5da3
2020-04-08 13:41:15 +08:00
Bill Yi
f33e8c30cb Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Change-Id: Ib09b5deae13c5c3a27d883319071ba07a18be330
2020-04-07 16:53:15 -07:00
TreeHugger Robot
18f56af885 Merge "Import translations. DO NOT MERGE" into rvc-dev 2020-04-07 23:47:28 +00:00
Bill Yi
1a53940403 Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Change-Id: I440827c763d4ba0068cfa60749a054e470da1192
2020-04-07 16:20:36 -07:00
Bill Yi
a49e904780 Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Change-Id: I37ab2380d2cd22581ddc8cfaa9d0f873ee5dc323
2020-04-07 14:47:22 -07:00
Bill Yi
ea107980f0 Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Change-Id: Iac2e8d8906fd2900b3ef81c68135ba8b95b06590
2020-04-07 14:14:15 -07:00
Joshua Duong
5200ae3db6 [a11y] Set focus on "Pairing device" text once QR code is scanned. am: 2a85924977 am: 586eb5ed83 am: 4a7fff070c
Change-Id: I76621bea58f68cf7a550219b2aca90b97a5ea438
2020-04-07 18:22:30 +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
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
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
012fa8528f Merge "Adjust tap targets in history" into rvc-dev am: 7c4557bec8 am: ceac4f44b9 am: 0e33c051c0 am: 801743a362
Change-Id: I30ce8bf6b0a411e8ec6118591665b4d7c3454320
2020-04-07 15:00:12 +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
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
57ed321169 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 am: c596957b07
Change-Id: Ia752cd84ed9f641e9115c66191619924cde31c32
2020-04-07 12:16:23 +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
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
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
826e02af15 Merge "Add keywords for system naviagtion setting" into rvc-dev am: e55fe59844 am: a08e2e4976 am: 818a285564 am: eda0fb7123
Change-Id: Iaa632dca7a1685e733c0c034aec97dac2d78a1f9
2020-04-07 11:19:12 +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
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
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
Tsung-Mao Fang
73c2a8b76f Add keywords for system naviagtion setting
Fix: 152979084
Test: Open setting search, see system navigation when I typed "swipe"
Change-Id: I2937276f9eb7e9534aa61e2c4b256ce218b99140
2020-04-07 16:39:29 +08:00
Jason Hsu
9c1de4e4a0 Merge "Add accessibility color inversion help resources to link to existing help page." into rvc-dev am: dfa6cf0d05 am: 5aa7cde292 am: 290ec80d7b am: 7181b065e6
Change-Id: If5f286669510135e3ba5b7a1387737387488ff45
2020-04-07 07:26:26 +00:00