Commit Graph

29375 Commits

Author SHA1 Message Date
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
4e65ffbd96 Merge "Add more search terms for WPP" into udc-dev am: 2484fa72d6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23436100

Change-Id: I44db076e1a03d58e69d1311da4cc6ecbc74830f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-31 22:34:45 +00:00
TreeHugger Robot
2484fa72d6 Merge "Add more search terms for WPP" into udc-dev 2023-05-31 22:02:49 +00:00
TreeHugger Robot
74a7b4016e Merge "Import translations. DO NOT MERGE ANYWHERE" 2023-05-31 19:16:40 +00:00
TreeHugger Robot
6e08712d65 Merge "Import translations. DO NOT MERGE ANYWHERE" 2023-05-31 19:16:40 +00:00
Treehugger Robot
12f8414700 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod 2023-05-31 16:53:38 +00:00
TreeHugger Robot
c2a92b394e Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev 2023-05-31 16:52:26 +00:00
TreeHugger Robot
fef0572018 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev 2023-05-31 16:52:26 +00:00
Treehugger Robot
5445cfaca3 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod 2023-05-31 16:48:50 +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
Bill Yi
017be7f59b Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: If326973a21a295d42748d30e05a40f931c7efe27
2023-05-29 05:20:31 -07:00
Bill Yi
2073d76f8e Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I43598773d5ebbf8a07b670d92f987af92c1760ea
2023-05-29 05:17:33 -07:00
Bill Yi
ac9067d1cb Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I7cd9f3982c8ddf5832ef56410c12f33b351d42cb
2023-05-29 05:15:19 -07:00
Bill Yi
9b9b56de09 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I449a70434b8159ca38dc0456b8f2d6a36af14a0c
2023-05-29 05:13:24 -07:00
Bill Yi
2bcb8c25fd Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ib310d2df9ad9db0645aeea62d9ee37c758ebe03c
2023-05-29 00:55:43 -07:00
Bill Yi
e841794da4 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I82e853e8a4336fd40b50451a83a435740719a87b
2023-05-29 00:52:42 -07:00
Hao Dong
7ced7a7cbd Merge "Fix Fingerprint enrollment UI when display size is largest." into udc-qpr-dev am: 6cb1f9401d am: 81587b1864
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23418521

Change-Id: I47013f77ec1436048a41afbba34bdb4eeaa6ac6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-27 00:32:26 +00:00
Hao Dong
81587b1864 Merge "Fix Fingerprint enrollment UI when display size is largest." into udc-qpr-dev am: 6cb1f9401d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23418521

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

Change-Id: I93be3c2d16321bacec5253332a6dc83e4e0b2f75
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-26 23:02:34 +00:00
Julia Reynolds
6ff2b3296c Merge "Revert "Update theme for ChannelPanelActivity"" into udc-dev am: 3ab478416d am: 19c2f617aa am: d9cc409fca
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23451739

Change-Id: I548af73340c2a3a3d5c8e32c85e39289859e7ba7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-26 23:02:09 +00:00
Treehugger Robot
83e13d5cec Merge "Shorten the Accessibility shortcut tutorial string for button settings." 2023-05-26 21:06:53 +00:00
Hao Dong
6cb1f9401d Merge "Fix Fingerprint enrollment UI when display size is largest." into udc-qpr-dev 2023-05-26 20:35:34 +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
Julia Reynolds
f27723619a Merge "Revert "Update theme for ChannelPanelActivity"" into udc-dev am: 3ab478416d am: 19c2f617aa
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23451739

Change-Id: Id39f2abef660120d8dfd2904af5b27d41ac5b38e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-26 20:19:48 +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
TreeHugger Robot
6e9b0d97da 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: I150a607f7d37f89224ab2aa0aadad7d2242ecbff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-26 20:17:40 +00:00
Julia Reynolds
4ebb8712d5 Merge "Revert "Update theme for ChannelPanelActivity"" into udc-dev am: 3ab478416d am: d94d3eb622
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23451739

Change-Id: Ic152cf64d0dcbf3f25bcb5c132097dc8302ea757
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-26 20:17:34 +00:00
Julia Reynolds
d9cc409fca Merge "Revert "Update theme for ChannelPanelActivity"" into udc-dev am: 3ab478416d am: 19c2f617aa
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23451739

Change-Id: Ic06bc743e3903e60b8e1bcdb67ed655518df4fca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-26 20:17:23 +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
TreeHugger Robot
1efd1f6d3c Merge "Update bad calibration error message" into udc-dev am: 1df5ad89ee
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23452010

Change-Id: I3c68a806fa8849b68f0e853a181d3f2859e485a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-26 19:13:08 +00:00
TreeHugger Robot
1df5ad89ee Merge "Update bad calibration error message" into udc-dev 2023-05-26 18:59:46 +00: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
Julia Reynolds
19c2f617aa Merge "Revert "Update theme for ChannelPanelActivity"" into udc-dev am: 3ab478416d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23451739

Change-Id: I2fa505654e3e7efdec2457cedb7773df9894d737
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-26 18:52:29 +00: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
Julia Reynolds
3ab478416d Merge "Revert "Update theme for ChannelPanelActivity"" into udc-dev 2023-05-26 16:46:50 +00:00
Julia Reynolds
bbef903b88 Revert "Update theme for ChannelPanelActivity"
This reverts commit 41eeb31b20.

Reason for revert: b/284380876

Change-Id: Ia06bf047db187091753e560f70427abb5b26378a
2023-05-26 15:32:08 +00: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
6a6e3b848b Merge "Move unrestricted data summary to DataSaverController" into udc-qpr-dev am: 97963e8389
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23442437

Change-Id: Ic6338fc2c629944f4c8baf560becec13e63db03f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-26 07:55:20 +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
Hao Dong
2eadf68438 Fix Fingerprint enrollment UI when display size is largest.
1. Remove land/udfps_enroll_enrolling and use the default land layout
instead. Swap header and content when necessary to avoid overlap.
2. Add UdfpsEnrollEnrollingView.java

Test: manual test - 1. Set system display and font size largest
	            2. Launch fingerprint enrollment and check UI.
Test: atest FingerprintEnrollEnrollingTest
Bug: 269060514
Bug: 283169056
Change-Id: Ifbe6c92c4213979952f2f89a1cd595c9c4bff6ec
2023-05-25 21:54:07 +00: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
8163f3d93b Merge "Add a footer message for battery cycle count" into udc-qpr-dev am: 810659f82d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23419678

Change-Id: I906471b83c8554e65de2ba3d4e34468cdb6a5c02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-25 06:23:46 +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
e196e903b3 Fingerprint Error Dialog am: 71dd391e4d am: 565ce9eaae am: f868f3fdda
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23378197

Change-Id: Ic2e7cbf81d6893d3a6f921c808374e4327718ea4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-24 21:22:03 +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