Commit Graph

7803 Commits

Author SHA1 Message Date
TreeHugger Robot
10593796f0 Merge "Remove subtext from work challenge screens" 2021-12-09 22:51:33 +00:00
Joe Bolinger
6f35ae6fcb Update remove face enrollment strings for convenience. am: 493e889dd6 am: a0fcc6e18e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16433461

Change-Id: Id17a7dede2acc2d5b7824100a98fb3adc1f3ba2f
2021-12-09 21:41:16 +00:00
Joe Bolinger
a0fcc6e18e Update remove face enrollment strings for convenience. am: 493e889dd6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16433461

Change-Id: Ib3901ce16b07b3ee5d8554cc62acae5bbf4a76d6
2021-12-09 21:23:35 +00:00
Joe Bolinger
493e889dd6 Update remove face enrollment strings for convenience.
Fix: 209877102
Test: manual (enroll & delete)
Change-Id: Idb3a8d3622574edc47673e8fe6a72a5b9d449c7b
2021-12-09 19:24:27 +00:00
Jason Hsu
437f7c1662 Merge "Add new string to hint user of triple-tap shortcut delay" into sc-v2-dev am: dc0ee218e9 am: 22d79fabb6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16419877

Change-Id: I60bced8f5d6919fc223cbee145b413f6f033ba27
2021-12-09 13:35:12 +00:00
Rubin Xu
70172863a7 Remove subtext from work challenge screens
Bug: 201045654
Test: manual
Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.password
Change-Id: Ibd65e27d5ed2762d04aa7750908506d0353a0727
2021-12-09 13:27:03 +00:00
Jason Hsu
22d79fabb6 Merge "Add new string to hint user of triple-tap shortcut delay" into sc-v2-dev am: dc0ee218e9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16419877

Change-Id: I44ab328eff53752e188dd84e9284ff65686f7b64
2021-12-09 13:16:26 +00:00
jasonwshsu
dc156e77b4 Add new string to hint user of triple-tap shortcut delay
* Original content in magnification switch shortcut dialog needs to have
different versions for different accessibility software shortcuts. Use
this generic content to replace them.

Bug: 208749782
Test: manual test
Change-Id: Ifc6591625c92ea04f6637ecfe90ce7d7b528b295
2021-12-09 10:00:58 +00:00
TreeHugger Robot
461018844c Merge "Updated udfps strings" into sc-v2-dev am: d51b41d4ec am: 1e8e39d34e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16301855

Change-Id: I8ea6bbe13f4af8a258e33977c5f466795064953a
2021-12-01 21:00:42 +00:00
TreeHugger Robot
1e8e39d34e Merge "Updated udfps strings" into sc-v2-dev am: d51b41d4ec
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16301855

Change-Id: Ifb3782076b5f3227cdfb98ba495c41ab71835e51
2021-12-01 20:42:40 +00:00
TreeHugger Robot
d51b41d4ec Merge "Updated udfps strings" into sc-v2-dev 2021-12-01 19:58:50 +00:00
Bonian Chen
12287b2c67 Merge "[Settings] Move display of VPN version into summary text" into sc-v2-dev am: 1026e410f4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16341970

Change-Id: I37fd544ef7452a3286dd393d68407d626d9ab590
2021-11-29 06:23:02 +00:00
Alice Kuo
2240418de8 Show the multiple Mac address for the coordinated set am: 9f11a4cddf am: f0b73dade7 am: e3680e211a
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1903831

Change-Id: I126e164160dae141978a59b02cea9f0091b7265f
2021-11-29 03:04:10 +00:00
Alice Kuo
6943c0356c Add the pairing string for CSIP supported device am: f57f720c38 am: 5d1aee76c2 am: 2135db2eac
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1903830

Change-Id: I000242e2e51627507bb49e7f6f51d8a5602de493
2021-11-29 03:04:07 +00:00
Alice Kuo
e3680e211a Show the multiple Mac address for the coordinated set am: 9f11a4cddf am: f0b73dade7
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1903831

Change-Id: I65a4d227e8f92b155636d8aa51b4e5e83bac2b3d
2021-11-29 02:48:44 +00:00
Alice Kuo
2135db2eac Add the pairing string for CSIP supported device am: f57f720c38 am: 5d1aee76c2
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1903830

Change-Id: I51ff75f8a8005985a9696616edd1c8c5cdd651fe
2021-11-29 02:48:43 +00:00
Alice Kuo
f0b73dade7 Show the multiple Mac address for the coordinated set am: 9f11a4cddf
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1903831

Change-Id: I9a8a0fe9d95a4ff4adc0599ce4c9a35501968f71
2021-11-29 02:29:29 +00:00
Alice Kuo
5d1aee76c2 Add the pairing string for CSIP supported device am: f57f720c38
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1903830

Change-Id: I809634c657558da125e72bb1fcbddaf3db46a093
2021-11-29 02:29:27 +00:00
Bonian Chen
14e76c3233 [Settings] Move display of VPN version into summary text
Move the display of version text within VPN into summary part of the
display, and limit the height of summary area.

Bug: 205460459
Test: local
Change-Id: I666b9db356feeebf04e3be688897c2d9110a5275
(cherry picked from commit 144f295d7a)
2021-11-26 05:53:46 +00:00
Bonian Chen
c74232597e Merge "[Settings] Move display of VPN version into summary text" 2021-11-26 05:44:35 +00:00
Alice Kuo
9f11a4cddf Show the multiple Mac address for the coordinated set
Show the mac address for all the devices if the device detail combine
with the multiple connections based on CSIP.

Screenshot: https://screenshot.googleplex.com/qQjc2pxNTr3tMUV

Bug: 178981521
Test: pair with the coordinated set, and check the UI
Change-Id: I01e0ec91e5c856481318d6435d174b5a2018d820
Merged-In: I01e0ec91e5c856481318d6435d174b5a2018d820
2021-11-26 13:21:48 +08:00
Alice Kuo
f57f720c38 Add the pairing string for CSIP supported device
Show the pairing dialog with the hint message
that pairing this device will pair all of the
set member of a coordinated set. If the device
supports CSIP, the message will be shown.

Screenshot: https://screenshot.googleplex.com/8WcrdgBoLRgJjHs

Bug: 178981521
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BlueotohPairingDialog
Change-Id: I5432b7264652dd4485e2669f6004caa4f7459238
Merged-In: I5432b7264652dd4485e2669f6004caa4f7459238
2021-11-26 13:13:25 +08:00
Bonian Chen
144f295d7a [Settings] Move display of VPN version into summary text
Move the display of version text within VPN into summary part of the
display, and limit the height of summary area.

Bug: 205460459
Test: local
Change-Id: I666b9db356feeebf04e3be688897c2d9110a5275
2021-11-25 10:57:57 +08:00
Bonian Chen
3f3c199dff Merge "[Settings] Remove the capital of 2nd wording" 2021-11-24 05:02:34 +00:00
Jason Hsu
db92e640b2 Merge "Remove the 'new' word for accessibility gesture tutorial dialog" into sc-v2-dev am: 37ec371fb9 am: 821a439085
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16302388

Change-Id: Ie429b8be9e7eec77389c7c25a4b0300ce88bc69f
2021-11-22 04:22:40 +00:00
Jason Hsu
821a439085 Merge "Remove the 'new' word for accessibility gesture tutorial dialog" into sc-v2-dev am: 37ec371fb9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16302388

Change-Id: I382f694fa9c17cee63ce5da9d68fffedfc3bcea3
2021-11-22 04:11:32 +00:00
jasonwshsu
7259d14324 Remove the 'new' word for accessibility gesture tutorial dialog
Root Cause: We merge back accessibility gesture feature into sc-v2, but
the tutorial dialog is still the original content.

Solution: Since it is not the new feature anymore, we just want to
introduce the feature, so remove the 'new' word.

Bug: 204850690
Test: manual test
Change-Id: I38aff0cee6779153066e414e654611fa83d0a533
2021-11-19 17:06:59 +08:00
Bonian Chen
8bb198a7d4 [Settings] Remove the capital of 2nd wording
2nd wording should avoid from capital.

Bug: 191525963
Test: local
Change-Id: I55b188df04ac0a88062a24492f44534a7d61a05b
2021-11-19 13:17:49 +08:00
Joshua Mccloskey
7c0111b0f1 Updated udfps strings
Test: Verified during enrollment that strings are correct
Fixes: 199192320
Change-Id: I9d1dd8e9be6c4d714f24dcea3c6d6de7f218dd26
2021-11-18 16:36:26 -08:00
Matt Pietal
eecacebf5d Merge "Allow a settings override for double-line clock" 2021-11-18 15:14:33 +00:00
Betty Chang
38874a5fd7 Merge "Remove the string for wifi toggle summary" into sc-v2-dev am: 34ff040431 am: 023e325653
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16279915

Change-Id: I73b425791f6f81dcd0538399d8449aa8ca29dd38
2021-11-18 06:47:11 +00:00
Betty Chang
023e325653 Merge "Remove the string for wifi toggle summary" into sc-v2-dev am: 34ff040431
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16279915

Change-Id: Id0a6f3124c0df3332f4b808ba7251a181f0bb483
2021-11-18 06:30:05 +00:00
Betty Chang
34ff040431 Merge "Remove the string for wifi toggle summary" into sc-v2-dev 2021-11-18 06:17:52 +00:00
Matt Pietal
a5415907ea Allow a settings override for double-line clock
This setting allows users to always show a single-line format clock,
regardless of notification status.

Fixes: 194905512
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.display
Change-Id: I94ade1b2d968e5783750e7a98a9a5d28cc22b659
2021-11-17 19:29:19 +00:00
Matt Pietal
d8ca5298ec [DO NOT MERGE] Allow a settings override for double-line clock am: cb4836b486
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16276359

Change-Id: Ic95e5a3863b64a2fda813500335ac04db8d6ae56
2021-11-17 17:41:24 +00:00
changbetty
14d1b41464 Remove the string for wifi toggle summary
Bug: 204124091
Test: Manual test
Change-Id: I0d1d7d6061b756a09942ce7cb0f66a1b1c962eb1
2021-11-17 15:18:22 +00:00
ykhung
3c1da6b2af Update "Mobile network standby" attribute label into "Mobile network" am: 13a52a081e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16279909

Change-Id: I7588c48981e0a4f351302fd1b38f8c943509375a
2021-11-17 14:19:22 +00:00
Matt Pietal
cb4836b486 [DO NOT MERGE] Allow a settings override for double-line clock
This setting allows users to always show a single-line format clock,
regardless of notification status.

Fixes: 194905512
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.display
Change-Id: I94ade1b2d968e5783750e7a98a9a5d28cc22b659
2021-11-17 13:34:36 +00:00
ykhung
13a52a081e Update "Mobile network standby" attribute label into "Mobile network"
Bug: 205051643
Test: make SettingsRoboTests
Change-Id: Ia8f5c3e76d72ffa6fd0601c58b1b3d157b711b30
(cherry picked from commit 22dc875ba7)
2021-11-17 12:35:23 +00:00
Ronish Kalia
0b30679a2c Merge changes from topic "qr-code-and"
* changes:
  Add tests for QRCodeScannerPreferenceController
  Add a new setting for QR Code Scanner button on lockscreen
2021-11-15 16:35:45 +00:00
TreeHugger Robot
59f749e112 Merge "Revert "Revert "Update styling of NLS dialog""" 2021-11-12 14:01:31 +00:00
Julia Reynolds
617a562660 Revert "Revert "Update styling of NLS dialog""
This reverts commit 6d37fdc546.

Reason for revert: The Android Auto test has been disabled

Change-Id: Iddbe3098d79fbe33c16c2a9c06c8df4a22b49afb
Bug: 205920324
Fixes: 191331361
2021-11-12 11:46:37 +00:00
Shaowei Shen
1f41bae30f Merge "[Sound panel] Use localized string for button text" into sc-v2-dev am: 2874b6442e am: da06c920b9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16236322

Change-Id: I39cf8181840d77c828183f3e11b8996ea5bb7551
2021-11-12 09:49:52 +00:00
Shaowei Shen
da06c920b9 Merge "[Sound panel] Use localized string for button text" into sc-v2-dev am: 2874b6442e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16236322

Change-Id: I7b413717713090f236d5dcddd8978927dc4da02b
2021-11-12 09:32:16 +00:00
Shaowei Shen
2874b6442e Merge "[Sound panel] Use localized string for button text" into sc-v2-dev 2021-11-12 09:14:19 +00:00
Julia Reynolds
6d37fdc546 Revert "Update styling of NLS dialog"
This reverts commit 358fe8e508.

Reason for revert: Android Auto has a test depending on the old layout of the dialog, and we need to revert until that test is updated

Change-Id: I47095be8c89d5bea27de835ea3fa700e3b90b49d
Bug: 205920324
Bug: 191331361
2021-11-11 18:55:35 +00:00
shaoweishen
dbc08a2178 [Sound panel] Use localized string for button text
use localized string "Settings" as button text in Sound panel.
revert text change in ag/15926634

Bug: 204326209
Test: Verified on device
Change-Id: Ibe99369d3c9f9f2131a33b7831f93a5d1554db3f
2021-11-11 08:24:04 +00:00
Julia Reynolds
358fe8e508 Update styling of NLS dialog
To make the content easier to parse

Test: manual
Fixes: 191331361
Change-Id: I1a86b761a09fd29a9581abfd9c4b313feb19394a
2021-11-08 20:54:40 +00:00
Julia Reynolds
98cc4f1302 Some updates for better localization
Test: manual
Fixes: 190021494
Fixes: 185203196
Fixes: 190088372
Change-Id: Ia2871814870a1f0e5c5f2deed06dcbef7b2bd967
2021-11-05 20:05:41 +00:00
TreeHugger Robot
d1f20d673e Merge "Update "Mobile network standby" attribute label into "Mobile network"" into sc-v2-dev am: c425a4ae93 am: 8e9b44ea7d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16182698

Change-Id: I2b01076c97aad16df7ed6576a1b13cbfc6c23bd1
2021-11-04 10:28:06 +00:00