Commit Graph

9294 Commits

Author SHA1 Message Date
YK Hung
3a04e20f39 Merge "Update tablet help article link (1/2)" into udc-dev am: a4f67e02c8 am: 94f5c7a913
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23695285

Change-Id: I825b76d4c744ed5edc2ce4732d120f44b40fb0d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-20 07:46:39 +00:00
YK Hung
a4f67e02c8 Merge "Update tablet help article link (1/2)" into udc-dev 2023-06-20 06:34:46 +00:00
Chaohui Wang
f355bc2e01 Merge "Migrate PlatformCompat App List to SPA" into udc-qpr-dev am: 879ff5f271 am: 78981afdc2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23410196

Change-Id: I09189fc2dfe6789db9c7745dd43cf5168c2e9dfc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-16 09:24:26 +00:00
Lifu Tang
5ef1e90b53 Update location settings status text to use slash
This change is to comply with the new UX guideline that requires the
punctuation used after "On" or "Off" state to be a slash instead of a
dash.

Bug: 259364228
Test: manual.
Change-Id: I0e63fd66aa6f4479a6f0c6e5a58d3e0f9b5b10e9
2023-06-15 13:58:51 -07:00
Chaohui Wang
ed6d6c9e0f Migrate PlatformCompat App List to SPA
So hidden modules are not shown in the list.

This will also improve the developer experience.

Bug: 273913035
Test: Manually with App Compatibility Changes
Test: Unit test
Change-Id: Ic78a51819159a0f848db6173f751b1be8c6b1e70
2023-06-15 09:37:11 +00:00
Rhed Jao
07f9d1ccbe Merge "[Settings] Add a verification flow for exiting repair mode" into udc-qpr-dev am: e1c9d65cda am: 721a7bacaa
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23629341

Change-Id: If01a1c5c13433e85f9b91790375dc2f297777dd7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-15 07:19:57 +00:00
Wesley Wang
ddbb5bcd5c Update tablet help article link (1/2)
Bug: 287122689
Test: make SettingsRoboTests
Change-Id: If09f7a6aab01f00bdb1675444237698643e6ba93
2023-06-15 14:38:59 +08:00
Rhed Jao
b7a4a7daa4 [Settings] Add a verification flow for exiting repair mode
Handles the ACTION_CONFIRM_REPAIR_MODE_DEVICE_CREDENTIAL
intent to launch the confirm device credential activity for
users to exiting repair mode. The activity passes a special
user id USER_REPAIR_MODE to the framework and verify credentials
that the user enrolled in normal mode.

Bug: 277561275
Test: am start -a android.app.action.PREPARE_REPAIR_MODE_DEVICE_CREDENTIAL
      settings put global repair_mode_active 1
      am start -a android.app.action.CONFIRM_REPAIR_MODE_DEVICE_CREDENTIAL
      The credential is verified successfully.
Change-Id: I9ffe32f9925ee2b990c49d5674d27196a4c9edf7
2023-06-15 02:14:41 +00:00
Han Xu
e319c686e7 Add manufactured year into hardware info page am: b452bc9f9d am: 15da26329f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23629342

Change-Id: I29b80b692bc97132b5cc7eac3d3a153d0f93d238
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-12 18:08:24 +00:00
Han Xu
1a9a892ff3 Add manufactured year into hardware info page am: b452bc9f9d am: eefb4e777d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23629342

Change-Id: Id5c47cbcbefad23dc81eb4e597aed8a21a36affc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-12 18:06:10 +00:00
Han Xu
b452bc9f9d Add manufactured year into hardware info page
Bug: 285471557
Test: manual visually
Change-Id: Iaab254ac6ee77217e29d89524d782577f44119cb
2023-06-12 17:43:55 +08:00
Jason Hsu
bab462f1d6 Merge "Change the summary string to exclude 'Audio output' feature" into udc-dev am: fecfa96723 am: 3608d5bf18
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23557965

Change-Id: Id50ea2a480c6d674a77764e285642f2087df9c40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-12 04:52:00 +00:00
Jason Hsu
51f58b5933 Merge "Change the summary string to exclude 'Audio output' feature" into udc-dev am: fecfa96723 am: 842eda9339
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23557965

Change-Id: I537ba7aa4f9e74cd8a8303859f0028aa949ea640
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-12 04:49:58 +00:00
Jason Hsu
fecfa96723 Merge "Change the summary string to exclude 'Audio output' feature" into udc-dev 2023-06-12 03:54:11 +00:00
jasonwshsu
ac04ce9091 Change the summary string to exclude 'Audio output' feature
'Audio output' plan to punt into U-QPR or V. Change the summary to not mention it.

Bug: 286174797
Test: flash rom and check UI not exist
Change-Id: I66ffb26c9b9ed612f41be7025a474cc63f256d87
2023-06-08 09:05:53 +00:00
Treehugger Robot
73ec1f8416 Merge "[Regional] Change the wording from "Use app default" to "Usw default"" into udc-qpr-dev am: 8f3679ab91 am: fe675b620c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23601572

Change-Id: I9fcd6a377d5fd0174261bf3dcc2e99d575509e7c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-08 08:12:26 +00:00
Zoey Chen
3b698670ad [Regional] Change the wording from "Use app default" to "Usw default"
Bug: 282890644
Change-Id: I0735b38afd666895bf9801170bea6178f9ba6292
Test: manual
2023-06-07 12:40:05 +00:00
George Chang
6b83876c1e Merge "Correct typo in the launch via NFC bottom string" into udc-dev am: 832e0b015e am: 29dd0bf796
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23584036

Change-Id: I4ed20c3448a6b8be5065efd6cad0b1ef765135d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-07 10:15:29 +00:00
George Chang
9a3cb029b5 Merge "Correct typo in the launch via NFC bottom string" into udc-dev am: 832e0b015e am: 4b49493d05
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23584036

Change-Id: Ic377f1dd84eac4f051f3695c883ff9986bb02d63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-07 10:11:22 +00:00
Wenhui Yang
71b8076566 Merge "Fix face model delete message" into udc-qpr-dev am: 4eceb6c5c5 am: e947da08e3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23573016

Change-Id: I097e0a9e37fb960118efc10724ebe95efdf7caa2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-06 21:53:16 +00:00
Wenhui Yang
5e71aee4cd Fix face model delete message
Add new strings for face model deletion when fingerprint unlock is available.

Test: Manual - test on devices and observe the error message is correct.
Fixes: 283122570
Change-Id: I0511e58d030b8b63391d8406bfc0447fe33fa9fc
2023-06-06 19:44:17 +00:00
George
d41299016e Correct typo in the launch via NFC bottom string
Bug: 283521954
Test: manual check the string
Change-Id: Ia32817ee1735831d0156a84ef7f48af94131dc73
2023-06-06 21:39:01 +08:00
Yanli Wan
d3516aa5d0 Merge "Update the string of Settings preference for device lock" into udc-dev am: 7cc3625678 am: f120e3d563
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23522457

Change-Id: Iaf3158afffa27a9c8dac6862a1516019613852ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-02 15:56:33 +00:00
Yanli Wan
c3f578b815 Merge "Update the string of Settings preference for device lock" into udc-dev am: 7cc3625678 am: 0ca7d94e3c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23522457

Change-Id: I90932b3abaa492d5e381ef5a5c1043fdce3a8ec1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-02 15:35:43 +00:00
Chaohui Wang
a96e08ad5c Merge "Unify the strings for Erase eSIM / eUICC" into udc-qpr-dev am: 28300d5340 am: 4775a69214
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23510726

Change-Id: I73abb8dec94f34578ea087dd3d25e82fa751a9c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-02 05:51:10 +00:00
Yanli Wan
23560717c4 Update the string of Settings preference for device lock
Bug: 282040794
Test: build & test locally
Change-Id: Ic9139c061b8cbea08bf74d0462420bf3157c4477
2023-06-01 22:57:48 +00:00
Chaohui Wang
0937c24f8f Unify the strings for Erase eSIM / eUICC
erase_sim_confirm_button & erase_euicc_data_button are the same string
and with same meanings, but since the description of
erase_euicc_data_button is wrong and causes translate issue, clean up
erase_euicc_data_button then.

Fix: 279600315
Test: Visual check on Erase eSIMs dialog
Change-Id: I5dec3dd5c1e851f84dd401dddd5416a27cb1a428
2023-06-01 15:28:47 +08:00
TreeHugger Robot
01164c361d Merge "Add more search terms for WPP" into udc-dev am: 2484fa72d6 am: 4e65ffbd96
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23436100

Change-Id: Ie8dee6c8a945099d431fa59624833a5f0383d8d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-31 23:48:34 +00:00
TreeHugger Robot
48381cbd0a Merge "Add more search terms for WPP" into udc-dev am: 2484fa72d6 am: becebd3a55
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23436100

Change-Id: I097932611469fa2b7db783946c6e189a8aced28d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-31 23:17:37 +00:00
TreeHugger Robot
2484fa72d6 Merge "Add more search terms for WPP" into udc-dev 2023-05-31 22:02:49 +00:00
Julia Reynolds
be451ceb73 Merge "Update string to be phone/tablet agnostic" into udc-dev am: a171a9d426 am: d8cfa9ad5f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23451841

Change-Id: I00308d27a004f68456d42439a9a8054719d6648a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-30 18:17:14 +00:00
Julia Reynolds
8af2c63650 Merge "Update string to be phone/tablet agnostic" into udc-dev am: a171a9d426 am: 4b37c06442
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23451841

Change-Id: I94f8964e63ec2a44020b09562cd69a74100c7716
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-30 18:15:09 +00:00
Julia Reynolds
a171a9d426 Merge "Update string to be phone/tablet agnostic" into udc-dev 2023-05-30 16:48:52 +00:00
Treehugger Robot
83e13d5cec Merge "Shorten the Accessibility shortcut tutorial string for button settings." 2023-05-26 21:06:53 +00:00
TreeHugger Robot
a6f32e2cb3 Merge "Update bad calibration error message" into udc-dev am: 1df5ad89ee am: 1efd1f6d3c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23452010

Change-Id: I343c82faae3d9fb135d4e9e500923a3fec91de4e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-26 20:20:45 +00:00
TreeHugger Robot
bb92abb0ae Merge "Update bad calibration error message" into udc-dev am: 1df5ad89ee am: 5c238c0f5b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23452010

Change-Id: I8eb5dffe4b0bdef9cdfc8d37b5968c301d04e05b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-26 20:17:53 +00:00
Daniel Norman
cbea2f8d35 Shorten the Accessibility shortcut tutorial string for button settings.
This should hopefully lead to shorter translations in languages that use
more characters than English, and also helps already-short translations
fit on one line when using maximum font size.

Screenshots:
- EN, default font size: https://screenshot.googleplex.com/4aDxShGtQ5Bnz2E.png
- EN, largest font size: https://screenshot.googleplex.com/83ovdiUBAwXgmNw.png

Bug: 284035025
Change-Id: Ie08b3fe9b741acf7d90c8fa306a336ce1b6f4bd9
2023-05-26 12:47:30 -07:00
Julia Reynolds
3bf7130628 Update string to be phone/tablet agnostic
Test: View NotificationChannel UI
Fixes: 279155066
Change-Id: I6d02a863a27092e35e66023966b3e007c6b45d7b
2023-05-26 14:57:59 -04:00
Diya Bera
1069105558 Update bad calibration error message
Test: Manual - send bad calibration error in code and observe the
strings
Bug: 280786940

Change-Id: I999750b98fcfd83a6fd265bac0aa334342c9f536
2023-05-26 10:26:59 -07:00
Chaohui Wang
2e871b3727 Merge "Move unrestricted data summary to DataSaverController" into udc-qpr-dev am: 97963e8389 am: 6a6e3b848b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23442437

Change-Id: I2dd90fc550a0db58021061024eefae44a02de7b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-26 08:42:38 +00:00
Chaohui Wang
3e35cff7ba Move unrestricted data summary to DataSaverController
DataSaverController currently used in 2 pages,
- Network & internet > Data Saver
- Apps > Special app access

This helps unify the logic, and instead of showing on "Special app
access", this summary shows on "Unrestricted data" is make more sense.

Bug: 280280596
Test: Manually on above pages
Test: Unit test
Change-Id: Ia151ed8179a250f8f20cc5041f9383fffebdab10
2023-05-26 13:05:48 +08:00
Austin Wang
9df7a5ca8d Add more search terms for WPP
Bug: 275728495
Test: flash and search settings
Change-Id: I59b7b95c7f105cf1577b5649ddb8a0844ab93f01
2023-05-25 11:07:40 -07:00
TreeHugger Robot
adcdbf2c7d Merge "Add a footer message for battery cycle count" into udc-qpr-dev am: 810659f82d am: 8163f3d93b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23419678

Change-Id: Ia54dd14fa776b2bd2102c6926288068e69321c96
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-25 07:11:39 +00:00
TreeHugger Robot
810659f82d Merge "Add a footer message for battery cycle count" into udc-qpr-dev 2023-05-25 05:53:19 +00:00
Yi-Ling Chuang
20c5966bf4 Add a footer message for battery cycle count
Bug: 276399056
Test: rebuild
Change-Id: I3aea252ace55edbde117698c17f1b4e0ab601b89
2023-05-25 12:24:24 +08:00
Chun-Ku Lin
9849bce398 Merge "Unified service and shortcut state summary on a11y settings page." 2023-05-24 22:21:26 +00:00
Diya Bera
573a59f8d0 Fingerprint Error Dialog am: 71dd391e4d am: 565ce9eaae
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23378197

Change-Id: Ia96b5aa1a9cd700b15ddf9aa986856ff4aee5f83
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-24 20:59:04 +00:00
Diya Bera
6c57a7ab4f Fingerprint Error Dialog am: 71dd391e4d am: 3926ee9543
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23378197

Change-Id: I905be42814e8db90eddaac4c3a8be881a92cca17
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-24 20:57:30 +00:00
Yi-Ling Chuang
b2a488ff78 Merge "Refactor battery related feature provider" into udc-qpr-dev am: 75af9aa3f5 am: 9736f648de
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23382081

Change-Id: If741f7c37358727bcacf0b880548c28aecaf5f91
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-24 20:18:13 +00:00
Diya Bera
71dd391e4d Fingerprint Error Dialog
Add "Try Again" for UNABLE_TO_PROCESS error. Change default title
string. Custom strings for Settings and Setup.

Bug: 280786940
Test: Try to enroll fingerprint, trigger a corresponding error and check
the error dialog

Change-Id: I5975d169e1d33cff87f58fb8882261bb1bd3520e
2023-05-24 10:15:52 -07:00