Commit Graph

26528 Commits

Author SHA1 Message Date
Bill Yi
21559f3793 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev 2022-06-10 06:17:14 +00:00
TreeHugger Robot
2b662c5a07 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-06-10 06:08:45 +00:00
Bill Yi
c1ebda67c2 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I3b4ba2fd47b3ab2f58a1eb962a12872f85f224f4
2022-06-09 09:49:56 -07:00
Bill Yi
5391d591c8 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ibb0a9c21fb33588f13b99a46a30dd191e28d587b
2022-06-09 09:45:40 -07:00
Joshua Mccloskey
0295bc2285 Merge "Add functionality to restart fp enrollment." into tm-qpr-dev am: 81224f09e3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18788040

Change-Id: I0188ab24c487cc569645d1b07dbb25c94024df4e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-09 16:09:27 +00:00
Joshua Mccloskey
81224f09e3 Merge "Add functionality to restart fp enrollment." into tm-qpr-dev 2022-06-09 15:37:53 +00:00
Bill Yi
307f491327 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I1c5638e6e3c3eef94aad83f3799058fe9043e77b
2022-06-09 07:35:45 -07:00
Bill Yi
d142ec9f58 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I45c392de92cbb27ed670cb70b657074d0ac762e1
2022-06-09 07:31:39 -07:00
TreeHugger Robot
f700b7398c Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-06-09 02:39:03 +00:00
Joshua McCloskey
0eb278b245 Added consent message for FaceAuth enrollment.
Test: Manual.
Fixes: 234663447
Change-Id: Iefd9b10eb634ed271f57b82e2a40be08dbbc1f61
2022-06-08 22:02:19 +00:00
Bill Yi
d98e536863 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I650e4197e0aff594a172c01f04cffd4092b7467d
2022-06-08 14:12:47 -07:00
Bill Yi
fe71b2e76c Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I4111bd9a5feee6d6a8b5db7861d622ea893515e2
2022-06-08 14:08:50 -07:00
Joshua McCloskey
548f6f36c1 Add functionality to restart fp enrollment.
Test: Tested manually via SUW that restarting enrollment works
as expected.
Test: Tested manually via settings that restarting enrollment
works as expected.
Fixes: 234887288

Change-Id: I815392269da786d2dfd157267919a09281af6277
2022-06-08 21:00:59 +00:00
Joshua McCloskey
77452db3f9 Updated FP enroll confirmation string
Test: Verified correct string shows after FP enrollment.
Fixes: 234183906
Change-Id: I57e7ce836d4dc5ad2caf198aa59738f64dc4c049
2022-06-08 20:59:36 +00:00
Milton Wu
2069d2e17b Update SUW fingerprint string
Bug: 228021544
Test: Check string in SUW flow
Change-Id: Id0729b7f2758e98d53484ffd35282c6423f82262
2022-06-08 07:12:24 +00:00
Avinash Vadlamudi
1ed3556c63 Merge changes from topic "avivadla-ephemeral-guest-ui-fixes-tm-qpr-dev" into tm-qpr-dev am: 26e3744221
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18751036

Change-Id: I1a0e8f88302132e700c9f07b802f44e412ceae1d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-08 04:12:18 +00:00
Avinash Vadlamudi
26e3744221 Merge changes from topic "avivadla-ephemeral-guest-ui-fixes-tm-qpr-dev" into tm-qpr-dev
* changes:
  Rename method for better readability
  Fix the Ephemeral guest mode UI bugs
2022-06-08 04:03:11 +00:00
Bill Yi
e6b9e1fdf5 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I3cdc674297a6f760c146bfd95190496a88309055
2022-06-07 07:29:07 -07:00
Edgar Wang
94a7906033 Merge "Recalculate view's height when tab is selected" into tm-dev am: 1f6334825f am: 47b4c86524 am: 7ab5a44498
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18197509

Change-Id: I957fd8fde3ae1865148de0fdd7c6d32b9bb79217
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-07 05:12:17 +00:00
Edgar Wang
0d22bf453d Merge "Recalculate view's height when tab is selected" into tm-dev am: 1f6334825f am: 025baa318b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18197509

Change-Id: I56e33ea1e76d0426f15816862464a81d36934848
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-07 04:58:38 +00:00
Edgar Wang
7ab5a44498 Merge "Recalculate view's height when tab is selected" into tm-dev am: 1f6334825f am: 47b4c86524
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18197509

Change-Id: I3d2bdadb80d2a1189e8e7e69d883ac2f4763bbd9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-07 04:58:36 +00:00
Edgar Wang
47b4c86524 Merge "Recalculate view's height when tab is selected" into tm-dev am: 1f6334825f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18197509

Change-Id: I0f6f87246effdc808b77726a0519d4b063ef4fba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-07 04:41:48 +00:00
Edgar Wang
025baa318b Merge "Recalculate view's height when tab is selected" into tm-dev am: 1f6334825f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18197509

Change-Id: I831063be158b5097e3cc82e8d5db767676096811
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-07 04:40:14 +00:00
Edgar Wang
1f6334825f Merge "Recalculate view's height when tab is selected" into tm-dev 2022-06-07 04:17:39 +00:00
Alice Kuo
b8b79e0574 Unify the LE audio string and refine the layout to put LE audio switch together am: ed1a79a97e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18740332

Change-Id: I2200a81b0d63cc690b475e5eed43e6f3e9f49ffe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-07 04:00:24 +00:00
Alice Kuo
b045c57fe6 Add LE Audio feature switcher in the developer option menu am: 948b7cb959
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18740331

Change-Id: Ia0fa92a5061bdb75a648dbb3d8db9fd2bcbdb1a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-07 04:00:22 +00:00
TreeHugger Robot
671c65235c Merge changes I0ea498d2,I2d650eb3,I8adcf27e into tm-d1-dev
* changes:
  Grey out LE audio offload switcher as LE audio isn't enabled/supported
  Unify the LE audio string and refine the layout to put LE audio switch together
  Add LE Audio feature switcher in the developer option menu
2022-06-07 03:37:21 +00:00
Alice Kuo
ed1a79a97e Unify the LE audio string and refine the layout to put LE audio switch together
Screenshot: https://screenshot.googleplex.com/A6PwLhscRUypgYK

Bug: 233018305
Bug: 233005340
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothLeAudioPreferenceControllerTest
Test: switch LE audio feature, and check LE audio functionality status
Change-Id: I2d650eb315790c3efc7510d9e125aeaf4464cda6
Merged-In: I2d650eb315790c3efc7510d9e125aeaf4464cda6
(cherry picked from commit b13abc03dd)
2022-06-07 09:39:25 +08:00
Alice Kuo
948b7cb959 Add LE Audio feature switcher in the developer option menu
Add a switcher to enable/disable LE audio feature. The switcher could be
enabled by setprop ro.bluetooth.leaudio_offload.supported=true

screenshot: https://screenshot.googleplex.com/6aGP664S9PX5EMS

Bug: 233018305
Bug: 233005340
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothLeAudioPreferenceControllerTest
Test: switch LE audio feature, and check LE audio functionality status
Change-Id: I8adcf27edd1438df445d32fca93f35ff5020a3b3
Merged-In: I8adcf27edd1438df445d32fca93f35ff5020a3b3
(cherry picked from commit 0d11fd07e7)
2022-06-07 09:36:15 +08:00
TreeHugger Robot
18675f81a0 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev 2022-06-06 18:47:52 +00:00
TreeHugger Robot
95b4c4798d Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2022-06-06 18:42:20 +00:00
TreeHugger Robot
059271dcc4 Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2022-06-06 18:42:20 +00:00
TreeHugger Robot
cad01723c0 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-06-06 18:40:47 +00:00
Treehugger Robot
b7cb8d2e21 Merge changes I0ea498d2,I2d650eb3,I8adcf27e am: 2bec16eda0 am: 4494e0fcfe am: 0570287625 am: c5c6474b70
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2115174

Change-Id: Ia4544fef9ee7d7428d9c430da2b68fb2c820538d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 08:07:06 +00:00
Treehugger Robot
c5c6474b70 Merge changes I0ea498d2,I2d650eb3,I8adcf27e am: 2bec16eda0 am: 4494e0fcfe am: 0570287625
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2115174

Change-Id: I9381f259b1956819177266a2073d711bf6bcb260
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 07:53:07 +00:00
Treehugger Robot
0570287625 Merge changes I0ea498d2,I2d650eb3,I8adcf27e am: 2bec16eda0 am: 4494e0fcfe
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2115174

Change-Id: I29df0438b0286cd08ecf714585d60bf234985321
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 07:38:18 +00:00
Treehugger Robot
4494e0fcfe Merge changes I0ea498d2,I2d650eb3,I8adcf27e am: 2bec16eda0
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2115174

Change-Id: Ia42f377f4688deb033a87d7ea47e9c4194980517
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 06:52:27 +00:00
Hugh Chen
858e6ff3d5 RESTRICT AUTOMERGE Implement advanced vpn ui in vpn settings
Bug: 220684478
Test: atest -c VpnSettingsTest

Change-Id: If89de16d02cb8b1f387b8f388f8fcf82ad39066b
2022-06-06 06:37:26 +00:00
Treehugger Robot
2bec16eda0 Merge changes I0ea498d2,I2d650eb3,I8adcf27e
* changes:
  Grey out LE audio offload switcher as LE audio isn't enabled/supported
  Unify the LE audio string and refine the layout to put LE audio switch together
  Add LE Audio feature switcher in the developer option menu
2022-06-06 06:37:11 +00:00
Bill Yi
88b4a11c90 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I81fb26845d241e6c415fb5e57c8a96622c01e4bc
2022-06-05 21:57:47 -07:00
Bill Yi
71660567f7 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I5c968be7dc8df7de1548f9e84940619e2dfa970e
2022-06-05 21:54:11 -07:00
Bill Yi
aa1b476569 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ic528a7fd27a359811be598d1b08467ee883e7b1a
2022-06-04 01:05:23 -07:00
Bill Yi
4889e1a48d Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I7b312aeda8014e69b1cfdb82adc97f992d7350ab
2022-06-04 01:01:47 -07:00
Bill Yi
d3dc439a10 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Idbd661c3b6a62971ef7ee40430437aac416cccdc
2022-06-04 00:58:31 -07:00
Bill Yi
2b6409fe37 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I6476c920020034a0b118ca3d73a10860cd178f51
2022-06-04 00:51:40 -07:00
Bill Yi
84bcd60145 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I978c036f5c669aea8730d5975e3a12f8f91b5bd7
2022-06-04 00:50:18 -07:00
Bill Yi
71c19fea50 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-06-03 18:27:21 +00:00
Bill Yi
1217038cc5 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-06-03 18:27:21 +00:00
Avinash Vadlamudi
d23aba7042 Fix the Ephemeral guest mode UI bugs
- Update the user-icon size to 40dp to align with add-icon size
- Remove the guestInfo preference and add the infoText as the summary for the guestExit preference and fix UserSettingsTest

Bug: 231592331
Test: Manual test, atest SettingsRoboTests
Change-Id: I2591bc19a7b2381d1842f0b28ab8fa19c15c19b8
(cherry picked from commit 9cf1d188a2)
2022-06-03 10:58:54 +00:00
Alice Kuo
b13abc03dd Unify the LE audio string and refine the layout to put LE audio switch together
Screenshot: https://screenshot.googleplex.com/A6PwLhscRUypgYK

Bug: 233018305
Bug: 233005340
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothLeAudioPreferenceControllerTest
Test: switch LE audio feature, and check LE audio functionality status
Change-Id: I2d650eb315790c3efc7510d9e125aeaf4464cda6
2022-06-03 11:52:50 +08:00