Commit Graph

6484 Commits

Author SHA1 Message Date
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
Menghan Li
e1bc8b3aa1 Merge "Refines the limit of advanced in edit shortcut dialog." into rvc-dev am: 450d0eb385 am: 6c780ee4ca am: 6977b8f3ab am: b481b405d8
Change-Id: I97b4b3fc5e92a6ee454af07844eaec4211b1221e
2020-04-24 17:07:15 +00:00
menghanli
29020158d3 Refines the limit of advanced in edit shortcut dialog.
Root cause: The "Advanced" string is allowed only 10 characters which makes the Czech translation less accurate and clear.
Next: There is enough space for longer message, refines limit to 20 characters.

Bug: 154753232
Test: local test
Change-Id: I60e35bbcfb85acb9a993b8ac9e120971e49fdfaf
2020-04-24 13:46:45 +00:00
Menghan Li
6b6d0e6d35 Merge "Refines accessibility button in shortcut summary strings" into rvc-dev am: 5cb20b91b2 am: 739cc4f500 am: 39ddda3cda am: 6ed8f17acb
Change-Id: Id348a4a4aa8afdced12b4dc149ac34c9250e5173
2020-04-24 05:07:06 +00:00
Menghan Li
5cb20b91b2 Merge "Refines accessibility button in shortcut summary strings" into rvc-dev 2020-04-24 04:18:05 +00:00
menghanli
2869235a86 Refines accessibility button in shortcut summary strings
Root cause: we plan to only capitalize the first letter only, it would cause
this sentence has new capitalized issue.

Next: Refines the sentence.

Bug: 148837311
Test: Manual test
Change-Id: I0f6d3d1a3713701b4e2cd09eb49706bbe4604ce9
2020-04-24 01:41:49 +00:00
TreeHugger Robot
236e9abf75 Merge "String update for notifications" into rvc-dev am: eba37898c8 am: 3c020616e0 am: 37433b9baa am: 957d07f46f
Change-Id: I4c732e70deef9e9f4ff641511d5d285ed30d210c
2020-04-23 22:44:35 +00:00
Fabian Kozynski
b229ffaac4 Merge "Add setting toggle for power menu privacy" into rvc-dev am: 7848696ea1 am: d1da33e594 am: fab7053e19 am: fb1285f927
Change-Id: Ib34c1637f590ab73627c7e6ff48ee9e11fb710d4
2020-04-23 20:51:11 +00:00
Julia Reynolds
cee485b88b String update for notifications
Test: manual
Fixes: 154541748
Change-Id: I007875e19410a7b2a51ca73a9329e0c4cea76c5d
2020-04-23 20:29:35 +00:00
Fabian Kozynski
7848696ea1 Merge "Add setting toggle for power menu privacy" into rvc-dev 2020-04-23 19:38:05 +00:00
Julia Reynolds
4d61625614 Merge "Add conversation onboarding" into rvc-dev am: 5ad98383d5 am: f6c0274140 am: d752bf1aff am: 4798d1a032
Change-Id: I4a852d3b04c635e1477769e112d97b2212c20f08
2020-04-23 18:19:04 +00:00
Julia Reynolds
5ad98383d5 Merge "Add conversation onboarding" into rvc-dev 2020-04-23 17:16:58 +00:00
Brad Ebinger
54c8a3842b Merge "Revise strings as per string UX review" into rvc-dev am: c3d052a48c am: d73fd30545 am: a62927963a am: 15801febee
Change-Id: I7029c358b769253c6cdd625b3d13c301b4f1602d
2020-04-23 16:43:26 +00:00
Brad Ebinger
c3d052a48c Merge "Revise strings as per string UX review" into rvc-dev 2020-04-23 15:38:39 +00: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
Julia Reynolds
2980f78e36 Add conversation onboarding
Test: atest
Fixes: 150791002
Change-Id: I51c27300acb8e18b28b5b5e5bf0d2623c65af909
2020-04-22 16:51:34 -04:00
Zhen Zhang
f8c357a1e8 Merge "Add ethernet tether option into AllInOneTetherSettings" into rvc-dev am: 92340eb89e am: 274a4006e1 am: 98cd9d278c am: 4c20cbfbe7
Change-Id: I516f4804473ed8ba56a673451bea126a4979ad8e
2020-04-22 04:05:05 +00:00
Zhen Zhang
92340eb89e Merge "Add ethernet tether option into AllInOneTetherSettings" into rvc-dev 2020-04-22 02:52:58 +00:00
Fabian Kozynski
518023ca0e Add setting toggle for power menu privacy
Adds a toggle for Secure.POWER_MENU_LOCKED_SHOW_CONTENT.

The toggle is disabled if cards & passes and controls are off or if the
user does not have a secure lock screen.

Test: manual
Test: PowerMenuPrivacyPreferenceControllerTest
Bug: 152212779
Change-Id: I45134cb9522a81b8e1b520938001488da7f40906
2020-04-21 20:29:31 +00:00
Xiangyu/Malcolm Chen
ee407ebaf5 Merge "Define a helper link for 5G limitation in DSDS footer." into rvc-dev am: eb27c7d94a am: 9df4b0ce58 am: d8ea2851e1 am: 2edb453bc0
Change-Id: Id9b94a945e2bc0e7a4176239f6eb07451616bd0c
2020-04-21 07:59:35 +00:00
Xiangyu/Malcolm Chen
eb27c7d94a Merge "Define a helper link for 5G limitation in DSDS footer." into rvc-dev 2020-04-21 06:47:18 +00:00
Zhen Zhang
c10ec56e0f Add ethernet tether option into AllInOneTetherSettings
Create controller for ethernet tether preference in
AllInOneTetherSettings and corresponding test.

Test: AllInOneTetherSettingsTest; UsbTetherPreferenceControllerTest;
BluetoothTetherPreferenceControllerTest;
EthernetTetherPreferenceControllerTest;
WifiTetherDisablePreferenceControllerTest; TetherEnablerTest
Bug: 153690620

Change-Id: I8918d5c8a82c521b00eb3c712af80c2041778595
2020-04-20 13:53:58 -07:00
Malcolm Chen
80be9de6d0 Define a helper link for 5G limitation in DSDS footer.
Bug: 152786064
Test: manual
Change-Id: I5a02f847531988217cc6ab47e3b35ed319c1027c
2020-04-20 19:12:16 +00:00
Julia Reynolds
4b34bd1c31 Merge "Update conversation bubble settings" into rvc-dev am: 608bd69328 am: a8bb57287c am: 075f8a5256 am: f889af8b16
Change-Id: I962e75a1cea26798f692ce4afd09b5394829dbd9
2020-04-20 14:45:31 +00:00
Julia Reynolds
cecc69512d Update conversation bubble settings
Test: atest
Fixes: 153471239
Change-Id: If53571b17236e5f49a1750acc9816287f5de2b1a
2020-04-17 16:32:44 -04:00
Brad Ebinger
b8e0cd7989 Revise strings as per string UX review
Fixes: 154148793
Test: m RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.network.telephony
Change-Id: Ia510ce5262fbe576718b0785175c0a82acb3c722
2020-04-16 15:33:17 -07:00
George Chang
dd4ef7e5bd Merge "[NFC] Disable contactless payments when no payment application installed" into rvc-dev am: 0181643bb7 am: 5a6d05885a am: 270ea3400b am: e7b5086dd1
Change-Id: Ia66e6d95715674c409dd17b583a20b957e58ce8d
2020-04-13 03:58:19 +00:00
George Chang
28895f2822 [NFC] Disable contactless payments when no payment application installed
Bug: 153821082
Bug: 149270345
Test: Check settings
Change-Id: I5162ecb07c26a33427305b6cf65829b2c61ad317
2020-04-13 01:53:23 +00:00
TreeHugger Robot
eb2c2aab5d Merge "Update DND strings and image spacing" into rvc-dev am: e1ba740cd8 am: 71f088666a am: 8310f3a01b am: 721e029b0a
Change-Id: If2c6cf1f704d92be65c875c185336549d8087caa
2020-04-09 23:34:44 +00:00
TreeHugger Robot
e1ba740cd8 Merge "Update DND strings and image spacing" into rvc-dev 2020-04-09 21:56:33 +00:00
Fabian Kozynski
0ba807a267 Merge "Added settings screens for Power Menu" into rvc-dev am: 4d02f7b2e2 am: 03fcf4849a am: 553666ff75 am: b86716bf98
Change-Id: I6b492d6c196bb55d1a716131580568c31c8c51c7
2020-04-09 18:12:14 +00:00
Fabian Kozynski
4d02f7b2e2 Merge "Added settings screens for Power Menu" into rvc-dev 2020-04-09 17:58:44 +00:00
TreeHugger Robot
e90ceec5a4 Merge "Update "important" conversations to "priority"" into rvc-dev am: 9c10b9c03a am: f1895785f1 am: 88b26ebffd am: f8d2cfb236
Change-Id: I15e6da430fb1f370de4e8f6d3ed210addec624ba
2020-04-09 17:46:24 +00:00
TreeHugger Robot
9c10b9c03a Merge "Update "important" conversations to "priority"" into rvc-dev 2020-04-09 16:48:18 +00:00
Beverly
ecc377bab8 Update DND strings and image spacing
Test: manual
Bug: 153428950
Change-Id: I25ff7432d6e22224fd1922f097fdd5bdf9ef9a5a
2020-04-09 14:32:26 +00:00
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
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
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
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
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
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
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
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
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