Commit Graph

6570 Commits

Author SHA1 Message Date
Treehugger Robot
44146c8e3b Merge changes I6194592d,I5a02f847
* changes:
  Add check of canConnectTo5GInDsds to show NrDisabledInDsdsFooter
  Define a helper link for 5G limitation in DSDS footer.
2020-04-30 02:56:34 +00:00
Tim Peng
be4ed2a3cb Add "Play <APP> to" string
Bug: 155345595
Test: build pass
Change-Id: Ib656f0db2efa6f777ada2c2565493775e72634ae
2020-04-30 02:13:24 +00:00
Treehugger Robot
99c2ccf984 Merge "Disable 'Mobile data' selection after removing SIM" am: 87d1e30f17 am: d6859736a4
Change-Id: I77a6c089aec6fe57f79ef7dc7f6630ee8fc68ae7
2020-04-29 23:01:07 +00:00
Treehugger Robot
d6859736a4 Merge "Disable 'Mobile data' selection after removing SIM" am: 87d1e30f17
Change-Id: I14dc87ff0f185bdbfb5734b6501f727e2cb19792
2020-04-29 22:50:24 +00:00
Grace Jia
7098379555 Disable 'Mobile data' selection after removing SIM
Bug: 153895858
Test: Manually remove SIM and test
Change-Id: I5934b01c047172ae2269e77e2fe0945aacba4ca1
Exempt-From-Owner-Approval: Telephony settings
2020-04-29 22:34:29 +00:00
Jason Chiu
d304c20a15 Refine contextual Bluetooth card behavior when Bluetooth is off
When bluetooth is off, show the specific layout for enabling Bluetooth.

Bug: 154691520
Test: robotest
Change-Id: If3fd493558dcf2a47183345bbe175dfe257574d1
2020-04-29 16:29:41 +08:00
Beverly
dcc79e9942 Update strings to be more translation friendly
Use different strings for "None" based on the context of the string.
Some languages may require different gendered grammar depending on its
context.

Also update contacts summary string to include plurals (1 vs many).

Test: make RunSettingsRoboTests7
Bug: 154898476
Fixes: 154944295
Change-Id: If9949d75de573042389a19df3d4c5d15c6cbeb25
2020-04-28 14:53:08 +00:00
TreeHugger Robot
6f482cef09 Merge "Updates for msg apps that don't use shortcuts" into rvc-dev 2020-04-28 13:57:15 +00:00
Malcolm Chen
5e68080b1f Define a helper link for 5G limitation in DSDS footer.
Bug: 152786064
Test: manual
Change-Id: I5a02f847531988217cc6ab47e3b35ed319c1027c
Merged-In: I5a02f847531988217cc6ab47e3b35ed319c1027c
2020-04-27 18:14:46 -07:00
Brad Ebinger
c973423a34 Revise strings as per string UX review
Fixes: 154148793
Fixes: 155098265
Test: m RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.network.telephony
Merged-In: Ia510ce5262fbe576718b0785175c0a82acb3c722
Change-Id: Ia510ce5262fbe576718b0785175c0a82acb3c722
2020-04-27 18:00:29 -07:00
TreeHugger Robot
5c3f71859e Merge "Allow > 1 line title for DND duration preference" into rvc-dev 2020-04-27 20:21:50 +00:00
Beverly
f939976367 Allow > 1 line title for DND duration preference
Test: manual
Fixes: 154694705
Change-Id: I9eaffb21e5d5902782beb5e9f845394015ba23be
2020-04-27 14:23:54 -04:00
TreeHugger Robot
50a5a0c462 Merge "Separate dnd categories in a list" into rvc-dev 2020-04-27 17:38:06 +00:00
TreeHugger Robot
d28fca9182 Merge "Separate call/messages dnd summary string" into rvc-dev 2020-04-27 17:26:16 +00:00
Beverly
ae2d681faf Separate dnd categories in a list
For translations purposes, separate strings that are the first element
in a list of sound categories from the stand alone category titles.

Test: manual
Bug: 154694384
Change-Id: I1ba5a487f179103ccfa881fdc57b10b6ec2560ad
2020-04-27 12:08:11 -04:00
Julia Reynolds
8fe4b28312 Updates for msg apps that don't use shortcuts
- Notice on app specific page
- No individual conversation bubble controls

Test: manual
Bug: 154814754
Change-Id: I74c291890ba6203e6a3a162fc0c0335ed5eba3d4
2020-04-27 11:07:40 -04: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
Beverly
a8ea534674 Separate call/messages dnd summary string
The translation for call/messages may be feminine or masculine depending
on the language which changes the way this string should be translated.
Therefore, separate the string to prevent bad translations.

Test: manual
Fixes: 154687360
Change-Id: I3cbef72d41626a244ce82a0d0574427fb9c4462e
2020-04-27 10:02:28 -04: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
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
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
5ad98383d5 Merge "Add conversation onboarding" into rvc-dev 2020-04-23 17:16:58 +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
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
eb27c7d94a Merge "Define a helper link for 5G limitation in DSDS footer." into rvc-dev 2020-04-21 06:47:18 +00:00
Brad Ebinger
f82153c3ec Merge "Change to Contact Discovery Dialog Language based on Privacy Feedback" am: a7bf6a3046
Change-Id: I765918f1712bb80006a3d0751a84477a94c2d432
2020-04-20 21:06:10 +00:00
Brad Ebinger
2c60eb8851 Merge "Set the CHAR_LIMIT to 110 in order to support more translations." am: a9295ea648
Change-Id: I1d6e0324ee8db02a75e3f14ebfe24fad369b0bd2
2020-04-20 21:04:14 +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
Brad Ebinger
a7bf6a3046 Merge "Change to Contact Discovery Dialog Language based on Privacy Feedback" 2020-04-20 20:40:50 +00: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
Brad Ebinger
6b87fa6705 Set the CHAR_LIMIT to 110 in order to support more translations.
Increase the CHAR_LIMIT for contact_discovery_opt_in_summary.

Fixes: 153376000
Fixes: 150941009
Test: manual
Merged-In: Ia71c87b47ed8b5b738f6d5a9b2693e7943f6797c
Change-Id: Ia71c87b47ed8b5b738f6d5a9b2693e7943f6797c
2020-04-20 12:08:58 -07:00
Brad Ebinger
f6a1184c0f Change to Contact Discovery Dialog Language based on Privacy Feedback
Fixes: 153376820
Bug: 141950843
Test: verify text
Merged-In: Iadc46ac18c1ec8e63cfe0d4d162e7222bfbc9a12
Change-Id: Iadc46ac18c1ec8e63cfe0d4d162e7222bfbc9a12
2020-04-20 19:08:07 +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
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
e1ba740cd8 Merge "Update DND strings and image spacing" into rvc-dev 2020-04-09 21:56:33 +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
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
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
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
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