Commit Graph

122780 Commits

Author SHA1 Message Date
Matías Hernández
ddbd590054 [automerger skipped] Settings: don't try to allow NLSes with too-long component names am: b88fbf932a am: 42afd3c182 -s ours am: 9dbcbfaa12 -s ours
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 027f0a46ae is already in history

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

Change-Id: Ib95833caa889adc369770b1fe1a4c8407db10a0d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-29 01:42:51 +00:00
Matías Hernández
9dbcbfaa12 [automerger skipped] Settings: don't try to allow NLSes with too-long component names am: b88fbf932a am: 42afd3c182 -s ours
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 027f0a46ae is already in history

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

Change-Id: Idd23bcdf229afda6451ad92e7c13cb7410d5a869
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-29 00:57:12 +00:00
Matías Hernández
42afd3c182 Settings: don't try to allow NLSes with too-long component names am: b88fbf932a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23728493

Change-Id: I3228d4d29e905c0481fe1637580aaf2caaab9cc9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-29 00:15:34 +00:00
Grace Cheng
f73f073643 Merge "Fix NPE in updateAddPreference" into udc-dev am: 25b489e212
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23667755

Change-Id: I691796e372f65ffec44954a850d462f796c19f82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-28 18:36:58 +00:00
Grace Cheng
25b489e212 Merge "Fix NPE in updateAddPreference" into udc-dev 2023-06-28 17:41:13 +00:00
Matías Hernández
0d21526217 Merge "Settings: don't try to allow NLSes with too-long component names" into udc-dev am: 4d34eb2c7a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23726247

Change-Id: I1e1dbbdf2b1834da763835c1bbcd263cdb27eb09
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-28 17:10:34 +00:00
Matías Hernández
4d34eb2c7a Merge "Settings: don't try to allow NLSes with too-long component names" into udc-dev 2023-06-28 16:42:13 +00:00
Xin Li
bcc898dbed [automerger skipped] Merge "Merge Android 13 QPR3" am: 65c31baf7f -s ours am: c61819e807 -s ours am: 164acf327a -s ours
am skip reason: Merged-In I11e6110ba0b640be8b373d9afd45f806c005b05f with SHA-1 45918b72bf is already in history

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

Change-Id: Idb89b852b5efc879a47552fdab0ca72a8169a756
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-27 00:34:24 +00:00
Xin Li
8244a2aeb4 [automerger skipped] Merge Android 13 QPR3 am: 3e6b213e75 -s ours am: ba9cb49565 -s ours am: e7ba843385 -s ours
am skip reason: Merged-In I11e6110ba0b640be8b373d9afd45f806c005b05f with SHA-1 45918b72bf is already in history

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

Change-Id: I10491b313218cc917510d28164cf1758adbab070
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-27 00:32:37 +00:00
Xin Li
164acf327a [automerger skipped] Merge "Merge Android 13 QPR3" am: 65c31baf7f -s ours am: c61819e807 -s ours
am skip reason: Merged-In I11e6110ba0b640be8b373d9afd45f806c005b05f with SHA-1 45918b72bf is already in history

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

Change-Id: Id8b3ff644094f429231676ca4b4aa34a23ac4062
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-26 23:12:11 +00:00
Xin Li
e7ba843385 [automerger skipped] Merge Android 13 QPR3 am: 3e6b213e75 -s ours am: ba9cb49565 -s ours
am skip reason: Merged-In I11e6110ba0b640be8b373d9afd45f806c005b05f with SHA-1 45918b72bf is already in history

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

Change-Id: I539ae150f02bd6b5d03249c043cefc8323a31dec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-26 23:10:28 +00:00
Xin Li
c61819e807 [automerger skipped] Merge "Merge Android 13 QPR3" am: 65c31baf7f -s ours
am skip reason: Merged-In I11e6110ba0b640be8b373d9afd45f806c005b05f with SHA-1 45918b72bf is already in history

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

Change-Id: I2d14107a37340b8b34ae71c67f7f705a272324b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-26 22:59:27 +00:00
Xin Li
ba9cb49565 [automerger skipped] Merge Android 13 QPR3 am: 3e6b213e75 -s ours
am skip reason: Merged-In I11e6110ba0b640be8b373d9afd45f806c005b05f with SHA-1 45918b72bf is already in history

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

Change-Id: I86a2ecc0803fdf920a6a10367d7eb0f9d06b6807
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-26 22:57:43 +00:00
Xin Li
65c31baf7f Merge "Merge Android 13 QPR3" 2023-06-26 22:29:52 +00:00
TreeHugger Robot
60f8d67f1d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 85a90ef00b -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib0d7180f1f7dc67744917dcbeb953b11d7f8b060
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-24 03:15:06 +00:00
Bill Yi
6cb8b3b00c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 374a3112e3 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I66740e6fc05874d959352ffbedafe8e277ef5eb6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-24 03:14:51 +00:00
TreeHugger Robot
85a90ef00b Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev 2023-06-24 02:45:00 +00:00
Bill Yi
e4a787f1f0 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e2abc0ab7a -s ours am: 392e63d166 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2fff5fc42e5787b7774bb6d8f52655c5da4c6d6c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-24 01:21:06 +00:00
Bill Yi
5f53b4c10e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 364eb998be -s ours am: aa006392a2 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0c3014ba4a7077e4873486aa345607ff9c2a04cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-24 00:16:48 +00:00
Bill Yi
e1dc1a0748 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e2abc0ab7a -s ours am: a35176545a -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib8e27273935ec71cdba18eca0bffe96f26397ce4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-24 00:13:26 +00:00
Bill Yi
392e63d166 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e2abc0ab7a -s ours
am skip reason: subject contains skip directive

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

Change-Id: I853a031bccb32b7086892e93b062fc1a8624c894
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-24 00:12:13 +00:00
Bill Yi
aa006392a2 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 364eb998be -s ours
am skip reason: subject contains skip directive

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

Change-Id: If37e1601cb241afb5cdcba0673da2576acdeb7f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-23 23:23:16 +00:00
Bill Yi
a35176545a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e2abc0ab7a -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4dacd8d123551565d05bcdb7444b33051e1a74ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-23 23:19:35 +00:00
Bill Yi
e2abc0ab7a Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ia036b42598639dac49342562f238cb378b3f6091
2023-06-22 22:06:04 -07:00
Bill Yi
374a3112e3 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I4477e0289b2b1cc331320e550cef7f74ec2af74e
2023-06-22 22:02:27 -07:00
Bill Yi
364eb998be Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I9aa9cc04f3cff9f455ced6d6fe8b384c4954b21f
2023-06-22 21:57:59 -07:00
Bill Yi
ced4e8df8b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 24a7a54341 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I28473ca95c4f26f45811162685f95dfad0d1c57e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-23 00:07:56 +00:00
Bill Yi
24a7a54341 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I8fceb2c2cb46e03d76cab54b1348030cf61b788c
2023-06-22 10:35:13 -07:00
TreeHugger Robot
1485ceaf97 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 3f85afaad5 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I17a6c8a571b4a0b7d943dfd710cde0f18d03da39
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-22 08:09:42 +00:00
Bill Yi
422c0622e8 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 65122fc3d2 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib724a8c68b2b9ec7fb438719c227094605d3efac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-22 08:09:30 +00:00
Bill Yi
121dcd4d85 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 588001801a -s ours
am skip reason: subject contains skip directive

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

Change-Id: I14a0dc3b2435e511beec62e65281374249e704f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-22 08:09:10 +00:00
TreeHugger Robot
3f85afaad5 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev 2023-06-22 07:13:52 +00:00
Bill Yi
65122fc3d2 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Iaff205a3b097d4239074e483525f0ab12f97d493
2023-06-21 16:33:47 -07:00
Bill Yi
588001801a Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ic6f318bc10b367849754f16f9c02a9aa75a24b74
2023-06-21 16:32:09 -07:00
Xin Li
3e6b213e75 Merge Android 13 QPR3
Bug: 275386652
Merged-In: I11e6110ba0b640be8b373d9afd45f806c005b05f
Change-Id: I885fdb1d60c595314c9f3ed229dc030a75edab00
2023-06-21 15:16:07 -07:00
Bill Yi
196592ee78 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: bfde831c44 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7b5c0743698cc167f7852176ed4f619cb515902b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 20:39:03 +00:00
Bill Yi
1ca0379e99 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6072ca10ec -s ours
am skip reason: subject contains skip directive

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

Change-Id: I626aca749292a50a5c1eb0755d4801cefd85ca0e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 20:38:58 +00:00
Bill Yi
e6bbf4c0ab [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b37162ce4a -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic1355b8c0575e2d4cae4a1ebe2284d4fcbca5009
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 20:38:47 +00:00
Bill Yi
bfde831c44 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev 2023-06-21 19:19:29 +00:00
Matías Hernández
027f0a46ae Settings: don't try to allow NLSes with too-long component names
* NotificationAccessConfirmationActivity (triggered through CompanionDeviceManager) -> Don't show the dialog, bail out early similarly to other invalid inputs.
* NotificationAccessSettings (from Special App Access) -> No changes, but use the canonical constant now.
* ApprovalPreferenceController (used in NotificationAccessDetails) -> Disable the toggle, unless the NLS was previously approved (in which case it can still be removed).

Fixes: 260570119
Fixes: 286043036
Test: atest + manually
Change-Id: Ifc048311746c027e3683cdcf65f1079d04cf7c56
2023-06-21 17:02:32 +02:00
Bill Yi
6072ca10ec Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I8c5e78d87373a142a4082f9081a28027d239af45
2023-06-21 07:16:56 -07:00
Bill Yi
b37162ce4a Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ia31b10a26fde9ae0f51940ad59e4746ead5fa70b
2023-06-21 07:15:19 -07:00
Treehugger Robot
3cc206bb14 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 8e3c231438 -s ours
am skip reason: subject contains skip directive

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

Change-Id: If6db3e162b26a8ab0355ba8c39834756850a89f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 06:36:44 +00:00
Bill Yi
c8daf1ce7c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dd95a8a7c8 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0b4e859b86c5039e4aebd961d5e0fd476c73cf4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 06:36:41 +00:00
Bill Yi
9c5a967922 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d0213cd684 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ieabe6679580ea0eb03115372f46ec06be1925f5b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 06:36:15 +00:00
Treehugger Robot
8e3c231438 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev 2023-06-21 06:19:35 +00:00
Bill Yi
dd95a8a7c8 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I3c3068ef9ae4cfd121798c3247328a8ebaadf22a
2023-06-20 19:30:31 -07:00
Bill Yi
d0213cd684 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I7725eba9eba2160e5a330d92a312f45d677b91a7
2023-06-20 19:28:50 -07:00
Julia Tuttle
ee0d1171aa Merge "Fix colors in importance and conversation priority preferences" into udc-dev am: bd74e47e5e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23690613

Change-Id: Ieaf111aae95150c6c7480ee0693478be934d6353
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-20 17:06:47 +00:00
Julia Tuttle
bd74e47e5e Merge "Fix colors in importance and conversation priority preferences" into udc-dev 2023-06-20 16:21:01 +00:00