Commit Graph

10747 Commits

Author SHA1 Message Date
Joshua McCloskey
4be235f6a8 Added face unicorn strings am: 66211d15bf am: 909913ffc1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18916254

Change-Id: I30ce8688e2a51a3748559dbf5c29a8c0779a52ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-16 03:17:24 +00:00
Joshua McCloskey
909913ffc1 Added face unicorn strings am: 66211d15bf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18916254

Change-Id: Ia1006b9a2e9dc4f2264cf0be47b7e087216c30aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-16 03:01:36 +00:00
Joshua McCloskey
66211d15bf Added face unicorn strings
Test: Manual.
Fixes: 234663447
Change-Id: I57f0b52f645655647db38c58da2c158e63221c18
2022-06-15 21:07:16 +00:00
Milton Wu
b6fbd10af4 Merge "Update SUW fingerprint string" into tm-qpr-dev am: 75d49b02bc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18753041

Change-Id: I61ce4d033c1f4cfa57347ad781c2ecbce4da20de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-10 19:40:24 +00:00
Milton Wu
75d49b02bc Merge "Update SUW fingerprint string" into tm-qpr-dev 2022-06-10 17:33:44 +00:00
Joshua Mccloskey
74d3ba859f Merge "Updated FP enroll confirmation string" into tm-dev am: 75313dcb5d am: 02f0255b7a am: 62db0f71bc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18801434

Change-Id: Ide094dbadfbaa9fcbb5aefbf8c31523ae00d0184
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-10 17:03:54 +00:00
Joshua Mccloskey
d32a6c0512 Merge "Added consent message for FaceAuth enrollment." into tm-d1-dev am: 52450aaa17 am: 4d48d8266d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18802135

Change-Id: I2a53040c4a9a4afee0815c2791a2d381b3dfa993
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-10 17:03:11 +00:00
Joshua Mccloskey
62db0f71bc Merge "Updated FP enroll confirmation string" into tm-dev am: 75313dcb5d am: 02f0255b7a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18801434

Change-Id: I034b937a7e24f0af32f2f7371a0b0711dfa19bfc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-10 16:37:30 +00:00
Joshua Mccloskey
02f0255b7a Merge "Updated FP enroll confirmation string" into tm-dev am: 75313dcb5d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18801434

Change-Id: I2424dc5d7377fd8f86f6d7d6c0dc14dfc274425d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-10 16:29:29 +00:00
Joshua Mccloskey
4d48d8266d Merge "Added consent message for FaceAuth enrollment." into tm-d1-dev am: 52450aaa17
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18802135

Change-Id: I12156eb5416d5e7a30454ccffe32d6bdbb248e5f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-10 16:29:13 +00: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
Joshua McCloskey
0eb278b245 Added consent message for FaceAuth enrollment.
Test: Manual.
Fixes: 234663447
Change-Id: Iefd9b10eb634ed271f57b82e2a40be08dbbc1f61
2022-06-08 22:02:19 +00: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
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
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
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
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
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
Betty Chang
d131bdfbec Merge "[LE Audio] Broadcast Sink UI" am: e3295efcd0
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2113244

Change-Id: I4d58377302a60869bce6cd4d2a70a6f61d35e752
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 04:01:11 +00:00
Chaohui Wang
6c090486a0 Merge "Clean up DarkUIInfoDialogFragment" into tm-dev am: 9ada0accef am: 7c74b9ba19 am: c47291950d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18669107

Change-Id: I4d3edbf2d143de3bd7f37203438542389b72fb23
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-01 13:24:00 +00:00
Chaohui Wang
c47291950d Merge "Clean up DarkUIInfoDialogFragment" into tm-dev am: 9ada0accef am: 7c74b9ba19
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18669107

Change-Id: I9d987aa0747b3b5079a64623ee187a0398a4e84e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-01 13:02:56 +00:00
Chaohui Wang
0480f2f311 Merge "Clean up DarkUIInfoDialogFragment" into tm-dev am: 9ada0accef am: c308cad5c4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18669107

Change-Id: If9f224daecaa5a10d250656880f68bab30b8f537
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-01 13:02:51 +00:00
Chaohui Wang
7c74b9ba19 Merge "Clean up DarkUIInfoDialogFragment" into tm-dev am: 9ada0accef
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18669107

Change-Id: I493a08683c8f5ae0998f04fdcb987aead4d3fe5c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-01 12:39:08 +00:00
Chaohui Wang
c308cad5c4 Merge "Clean up DarkUIInfoDialogFragment" into tm-dev am: 9ada0accef
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18669107

Change-Id: I2b28f1f5052b553accc273ac356bd47ea832e805
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-01 12:37:45 +00:00
changbetty
a7b89ba24b [LE Audio] Broadcast Sink UI
- Add dialog for Broadcast and find broadcast source

 - Add Activity for find broadcast source

Bug: 228274114
Test: Manual test
Change-Id: I830efc3514fc42aaa4e53f491ed3a7459bd9bb41
Merged-In: I830efc3514fc42aaa4e53f491ed3a7459bd9bb41
2022-06-01 06:40:07 +00:00
Alice Kuo
0d11fd07e7 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
2022-05-31 18:11:58 +08:00
Chaohui Wang
75e4028b3e Clean up DarkUIInfoDialogFragment
The usage of this dialog is removed in
Change Ie2cf147de53385ae0c626c8472306f1b85317686

But this dialog is created (but not show) in DarkUIPreferenceController
each time dark mode toggle is turned on by user.

So clean this up.

Fix: 234419979
Test: make Settings
Change-Id: Icdc9d7a4fb77dc8b2a3f1a9d8e3f40fc0af4917d
2022-05-31 17:58:05 +08:00
menghanli
c17018fdbf Polish reset display size and text dialog content am: 51a056ec32
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18659331

Change-Id: I08cd1e9467a0713b41a6d86b45e46cce6c571258
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-31 07:39:23 +00:00
menghanli
51a056ec32 Polish reset display size and text dialog content
Use "tablet" for tablet devices; use "phone" for default

Bug: 233985662
Test: Manual testing
Change-Id: I24e54315414502dc61efb733bbf697783b1de87a
2022-05-30 23:54:09 +00:00
Hank Sheng
73f37d3f3a Merge "Create the glifv4 theme and set to glifv4 theme when the themestring is glifv4." into tm-dev am: 3dfcc708aa am: 349b36bb91 am: 55e4e5d0e3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18579898

Change-Id: I41379defe421d7b41dee13b88a2b67bca951f6d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-27 06:03:25 +00:00
Hank Sheng
55e4e5d0e3 Merge "Create the glifv4 theme and set to glifv4 theme when the themestring is glifv4." into tm-dev am: 3dfcc708aa am: 349b36bb91
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18579898

Change-Id: Ifcef39885b565fbbdc950fe43c6b26d57e2bdcfa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-27 05:48:57 +00:00
Hank Sheng
3e3978ce80 Merge "Create the glifv4 theme and set to glifv4 theme when the themestring is glifv4." into tm-dev am: 3dfcc708aa am: 0c8e9b6510
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18579898

Change-Id: I4f7589d5d38f61098468d37ad242b73f8af796c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-27 05:48:36 +00:00
Hank Sheng
349b36bb91 Merge "Create the glifv4 theme and set to glifv4 theme when the themestring is glifv4." into tm-dev am: 3dfcc708aa
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18579898

Change-Id: Id2d1766f508dd02f8412131c25f12f82d92a3833
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-27 05:48:03 +00:00
Hank Sheng
0c8e9b6510 Merge "Create the glifv4 theme and set to glifv4 theme when the themestring is glifv4." into tm-dev am: 3dfcc708aa
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18579898

Change-Id: Id4abc52bcccaec23a580f757b345c7d763ed1a3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-27 05:46:43 +00:00
SongFerng Wang
ed0f3c60ec Merge "Settings: Change array resource sim_color_light to an integer array" 2022-05-27 05:12:32 +00:00
Amy Hsu
bfaf38ccb9 Merge "[ScreenResolutionController] UI string update" into tm-d1-dev am: eca20b0820 am: 7af580d08b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18603826

Change-Id: I8baddc41e02614de807e48614c06d6d862cf6dea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-27 00:53:24 +00:00
Amy Hsu
2897d2fa42 Merge "[ScreenResolutionController] UI string update" into tm-d1-dev am: eca20b0820
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18603826

Change-Id: Id18e737daee4dd59b79662ac1b23ca114e0af275
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-27 00:39:20 +00:00
Amy Hsu
7af580d08b Merge "[ScreenResolutionController] UI string update" into tm-d1-dev am: eca20b0820
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18603826

Change-Id: I74384b25ead713af83acc06434d57ae3214739fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-27 00:39:16 +00:00
Xupei Li
05301c7d1a Settings: Change array resource sim_color_light to an integer array
* It should be an integer array because its items are all color reference, and I found that the translations of this resource can lead to not show SIM color in languages other than English.

Change-Id: I6264abdfd0a49119e0170ae5c4bec437ad4c9e8f
2022-05-26 07:17:58 +00:00