PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
108,284 Commits 1 Branch 0 Tags
6a8f459e6cc3b926ca056de7481f85888bb87c7c
Commit Graph

108284 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
e006e9823d Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I81a6f90e03513ab441888db3316d4b612b3a72ca
 2022-06-11 13:17:41 -07:00
Bill Yi
77b66b7495 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Id13eb722fe69d4c571cfa68c8fe1fa729e218a38
 2022-06-11 13:07:25 -07:00
Bill Yi
5154fc5c35 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I3654d12018957304a0bd3064d9950d284baaf332
 2022-06-11 12:55:04 -07:00
Bill Yi
0157713d52 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I8e4f48ee4f355af084d6a0edcb2d4172246a4a87
 2022-06-11 12:49:13 -07:00
Bill Yi
154b913f4b Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I9332ed519d4fb2a15ad3ba9fcfea68d9ab657ff8
 2022-06-10 21:47:08 -07:00
Bill Yi
f5cfec7f75 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I6e5a4af5147a8e1cdebd5049ad5941ce51442553
 2022-06-10 21:43:26 -07:00
Evan Chen
61ea6782f5 Update AssociationIno creation for Bluetooth test 
Bug: 189250370
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothDetailsCompanionAppsControllerTest
Change-Id: Iebbd2ca754b20d251f7a128bc2c460b4c3093762
Merged-In: Iebbd2ca754b20d251f7a128bc2c460b4c3093762
 2022-06-10 23:03:33 +00:00
TreeHugger Robot
ae6f2b0e94 Merge "Update fingerprint removal dialog strings" into tm-dev am: 1c45e9ad72 am: 45580a02a4 am: 4ab4d68f60 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18736456

Change-Id: I37991dc27e8b3cdf0de9073cffba1d1999ceacde
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-10 22:07:59 +00:00
TreeHugger Robot
b27106a131 Merge "Update fingerprint removal dialog strings" into tm-dev am: 1c45e9ad72 am: 063e34e53c am: 4091170456 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18736456

Change-Id: I35907ff13a355fb36cb7ba520d9c366967d37e0a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-10 22:07:27 +00:00
TreeHugger Robot
9aa37e4434 Merge "Update fingerprint removal dialog strings" into tm-dev am: 1c45e9ad72 am: 063e34e53c am: 5f50ce04f1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18736456

Change-Id: If0c6ecb6ae28407e3f8e975ecc992b7581773454
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-10 22:05:21 +00:00
TreeHugger Robot
4ab4d68f60 Merge "Update fingerprint removal dialog strings" into tm-dev am: 1c45e9ad72 am: 45580a02a4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18736456

Change-Id: Id674f125687fc60af9359a95b2852cbbc33d4a2c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-10 21:32:24 +00:00
TreeHugger Robot
4091170456 Merge "Update fingerprint removal dialog strings" into tm-dev am: 1c45e9ad72 am: 063e34e53c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18736456

Change-Id: Iaa080b1ba55ad24a174edb5907a5b3fe7dd78584
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-10 21:31:32 +00:00
TreeHugger Robot
5f50ce04f1 Merge "Update fingerprint removal dialog strings" into tm-dev am: 1c45e9ad72 am: 063e34e53c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18736456

Change-Id: I03e4dcfe1a635099d1f13026d1d6a9d21b2348a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-10 21:31:05 +00:00
TreeHugger Robot
063e34e53c Merge "Update fingerprint removal dialog strings" into tm-dev am: 1c45e9ad72 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18736456

Change-Id: I48f417627a248636a9aecf0b3a25d9f0ce45eaa5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-10 20:39:13 +00:00
TreeHugger Robot
45580a02a4 Merge "Update fingerprint removal dialog strings" into tm-dev am: 1c45e9ad72 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18736456

Change-Id: Ic7f0628f3ef18ee92733fee88e21242a1424c62a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-10 20:37:28 +00:00
Automerger Merge Worker
12e7db6478 Merge "Merge "[VolumePanel] Fix the Hearable control slice uri parameter" into tm-dev am: fc45c25296 am: f7b4e4adc9" into tm-d1-dev-plus-aosp am: 4b1b519a92 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18638446

Change-Id: I7d6ec073481c07d8e59f61bd10b3a572d793c7ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-10 20:28:51 +00:00
TreeHugger Robot
0e2bc2d45a Merge "[VolumePanel] Fix the Hearable control slice uri parameter" into tm-dev am: fc45c25296 am: 3b2fe3e89e am: 863843c7b0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18638446

Change-Id: Ic9f3f0e2544a456fef1ddf1e7b9d39092535bd6f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-10 20:28:40 +00:00
TreeHugger Robot
f20d28e0c3 Merge "[VolumePanel] Fix the Hearable control slice uri parameter" into tm-dev am: fc45c25296 am: 3b2fe3e89e am: 7fb0500aa8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18638446

Change-Id: I8c69d810b6544dc86f8bf69b6e53214cbd5cc4a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-10 20:27:55 +00:00
TreeHugger Robot
1c45e9ad72 Merge "Update fingerprint removal dialog strings" into tm-dev 2022-06-10 20:09:03 +00:00
Automerger Merge Worker
4b1b519a92 Merge "Merge "[VolumePanel] Fix the Hearable control slice uri parameter" into tm-dev am: fc45c25296 am: f7b4e4adc9" into tm-d1-dev-plus-aosp 2022-06-10 19:58:41 +00:00
TreeHugger Robot
863843c7b0 Merge "[VolumePanel] Fix the Hearable control slice uri parameter" into tm-dev am: fc45c25296 am: 3b2fe3e89e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18638446

Change-Id: I80e67d73410150349c3501001c3b8d2252dfe4be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-10 19:58:38 +00:00
TreeHugger Robot
7fb0500aa8 Merge "[VolumePanel] Fix the Hearable control slice uri parameter" into tm-dev am: fc45c25296 am: 3b2fe3e89e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18638446

Change-Id: I14e635b309b81f636043f550e01e185c4839dd31
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-10 19:58:36 +00:00
TreeHugger Robot
661c13a194 Merge "[VolumePanel] Fix the Hearable control slice uri parameter" into tm-dev am: fc45c25296 am: f7b4e4adc9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18638446

Change-Id: If4f9c33086ac7d1041e073a63214c33390b575ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-10 19:58:33 +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
TreeHugger Robot
3b2fe3e89e Merge "[VolumePanel] Fix the Hearable control slice uri parameter" into tm-dev am: fc45c25296 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18638446

Change-Id: I11486349b04ce9af7004e6761e6d419e4892baf4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-10 18:56:02 +00:00
TreeHugger Robot
f7b4e4adc9 Merge "[VolumePanel] Fix the Hearable control slice uri parameter" into tm-dev am: fc45c25296 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18638446

Change-Id: I6c28e8ad8fc8e97cf1f6c5c290562f7b6dda4821
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-10 18:54:24 +00:00
Milton Wu
75d49b02bc Merge "Update SUW fingerprint string" into tm-qpr-dev 2022-06-10 17:33:44 +00:00
TreeHugger Robot
fc45c25296 Merge "[VolumePanel] Fix the Hearable control slice uri parameter" into tm-dev 2022-06-10 17:25:25 +00:00
Joshua Mccloskey
ee1b2589ec Merge "Updated FP enroll confirmation string" into tm-dev am: 75313dcb5d am: 06b76edbb7 am: e634c8e1ed 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18801434

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

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

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

Change-Id: I7797f6c9d3a139374b211855c1bedfda9393046b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-10 17:04:03 +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
6f430f8e66 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: I61bb8dcd5fb07d4493bfe6f140008e2567e923cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-10 16:37:36 +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
9f1af4fc86 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: Idb03b051753fa418e8ffb40d6f2fbc1a7d7db287
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-10 16:29:07 +00:00
Joshua Mccloskey
06b76edbb7 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: I024b04ef4f87b923ff48d09fcf88036f7b51b89c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-10 16:27:59 +00:00
Joshua Mccloskey
52450aaa17 Merge "Added consent message for FaceAuth enrollment." into tm-d1-dev 2022-06-10 16:06:17 +00:00
Joshua Mccloskey
75313dcb5d Merge "Updated FP enroll confirmation string" into tm-dev 2022-06-10 16:05:31 +00:00
TreeHugger Robot
664882ad8e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 2b662c5a07 -s ours am: 999a23bee0 -s ours am: 579cdfb0a8 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18818927

Change-Id: I4a022cb6d72789a0accda59ba71b4cc59e2942bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-10 07:37:37 +00:00
Bill Yi
78f220eba8 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5391d591c8 -s ours am: 16761c0f92 -s ours am: ca3537a81e -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18818927

Change-Id: I1dbe6c3e89701c74c494487617ed86f7c5d78c83
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-10 07:37:33 +00:00
TreeHugger Robot
95f865c789 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 71826af4fb -s ours am: 3b34105f01 -s ours am: 772ae4174e -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18818504

Change-Id: I7237ff4f9f469ec33c4a01200af128413ead5334
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-10 07:37:25 +00:00
Bill Yi
4835ec5d28 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c1ebda67c2 -s ours am: b807236c50 -s ours am: 26d9456296 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18818504

Change-Id: I4725a02f665e6b759eb13149fd7daf258d7c7400
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-10 07:37:11 +00:00
Automerger Merge Worker
06908e191a Merge changes from topic "am-1b5ff54850484f67a65c2bda86eb0cf0" into tm-qpr-dev-plus-aosp 
* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 2b662c5a07 -s ours am: ee896b46e1 -s ours am: 05d57094a6 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5391d591c8 -s ours am: 6a5ff2d6a9 -s ours am: 0aa65938ba -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 71826af4fb -s ours am: 1175da33ce -s ours am: 5bc97b815c -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c1ebda67c2 -s ours am: 5c0212eab6 -s ours am: e64846d166 -s ours
 2022-06-10 07:36:03 +00:00
TreeHugger Robot
76a3494ee9 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 2b662c5a07 -s ours am: ee896b46e1 -s ours am: 3bf9830e4f -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18818927

Change-Id: I53ffa4eaa9cb1c3b262cc0ae4af71147f3e5c6f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-10 07:35:17 +00:00
TreeHugger Robot
c4141b38c2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 2b662c5a07 -s ours am: ee896b46e1 -s ours am: 05d57094a6 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18818927

Change-Id: I500a32dba0ab3770f7083b311df01f4d5e3640bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-10 07:35:17 +00:00
Bill Yi
b9e43fd0ee [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5391d591c8 -s ours am: 6a5ff2d6a9 -s ours am: 2ed856f004 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18818927

Change-Id: If2e520f9cf323ed0dd6e4c4aabdfa279e0cf46cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-10 07:35:11 +00:00