Matías Hernández
a7c84f7fea
[automerger skipped] Settings: don't try to allow NLSes with too-long component names am: f0367c98d0
am: 5985612633
am: 95fbc856ad
-s ours am: 8c1394e58e
-s ours am: df3f3ff5c2
-s ours am: a590ecb718
-s ours
...
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 b88fbf932a
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23712724
Change-Id: I1525edf18add89b923bd149762dfe8f914c44f92
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-29 13:03:53 +00:00
Matías Hernández
a590ecb718
[automerger skipped] Settings: don't try to allow NLSes with too-long component names am: f0367c98d0
am: 5985612633
am: 95fbc856ad
-s ours am: 8c1394e58e
-s ours am: df3f3ff5c2
-s ours
...
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 b88fbf932a
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23712724
Change-Id: Iab97bd80d0e4ed0fa4391efc43a05f23f8095f91
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-29 12:22:27 +00:00
Matías Hernández
df3f3ff5c2
[automerger skipped] Settings: don't try to allow NLSes with too-long component names am: f0367c98d0
am: 5985612633
am: 95fbc856ad
-s ours am: 8c1394e58e
-s ours
...
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 b88fbf932a
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23712724
Change-Id: I635acdf5b2b37d084c6e43a33fa3406402b49177
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-29 11:40:04 +00:00
Matías Hernández
8c1394e58e
[automerger skipped] Settings: don't try to allow NLSes with too-long component names am: f0367c98d0
am: 5985612633
am: 95fbc856ad
-s ours
...
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 b88fbf932a
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23712724
Change-Id: I729b32b7ace1c1679c14ed555fd7d87e8d86f72d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-29 10:52:31 +00:00
Matías Hernández
95fbc856ad
Settings: don't try to allow NLSes with too-long component names am: f0367c98d0
am: 5985612633
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23712724
Change-Id: Ic711190cfc7ce3437e324a96d97c628b52d48480
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-29 10:13:23 +00:00
Matías Hernández
5985612633
Settings: don't try to allow NLSes with too-long component names am: f0367c98d0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23712724
Change-Id: I51744909a3ef6fcb1406dcc24d857d9b9eb88057
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-29 09:29:06 +00:00
Matías Hernández
ebf5c0c4d5
[automerger skipped] Settings: don't try to allow NLSes with too-long component names am: b88fbf932a
am: 7847d336d9
am: 253f948aad
-s ours am: e385aee1cd
-s ours
...
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 b88fbf932a
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23728493
Change-Id: I5da632c6ad796aaa2c66a1ff6f43ea8422123af8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-29 01:42:41 +00:00
Matías Hernández
c77688932e
[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: I9e948c70d90a7c3b91035d908752eb3ee9faf052
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-29 01:42:17 +00:00
Matías Hernández
e385aee1cd
[automerger skipped] Settings: don't try to allow NLSes with too-long component names am: b88fbf932a
am: 7847d336d9
am: 253f948aad
-s ours
...
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 b88fbf932a
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23728493
Change-Id: Iddc7166a9254597a82d5a19f144429e712faec14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-29 01:41:21 +00:00
Matías Hernández
253f948aad
Settings: don't try to allow NLSes with too-long component names am: b88fbf932a
am: 7847d336d9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23728493
Change-Id: I84d8aa08502725d1e24d80946884eb8cab9287ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-29 00:59:57 +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
7847d336d9
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: Ib235490bd7dc40a1d5146cdb8ea20abed4406996
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-29 00:16:39 +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
add8f5cda2
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: Icaadc6f5a6c0711bf4122706363c82753a93869c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-28 18:39:15 +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
57739acf63
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: I4d187c9a398bf713519c8cc2c335ab1d2c2bd645
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-28 17:14:40 +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
TreeHugger Robot
949bb6d631
[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: I15565e6fd2315993e6fdd375e1069a2f60b12b00
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-24 03:19:26 +00:00
Bill Yi
4438349c54
[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: I33cc8a0a77a663bac76fae5fa568ffc5a4956325
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-24 03:19:13 +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
c02897d6a9
[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: If25ef7cfa3408e664db2f506304d2c8ec7a665b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-24 00:10:27 +00:00
Bill Yi
6dd5206cab
[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: I43e0811d69dd11fb179f4bb5ba187df146ee20c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-24 00:06:41 +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
000297ad9a
[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: I4d9440a38e60d8fb826e1caeeeb5661b01eb9529
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-23 00:07:18 +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
78a32c7356
[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: I445eea06270f50a1abb08f9679d3f331031e096f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-22 08:12:09 +00:00
Bill Yi
de521fb53b
[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: I14c4576863c97d3be64c38f91da093b98b8698a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-22 08:11:56 +00:00
Bill Yi
029261778c
[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: Ie5f2127333c621a9c00421b76d95cd68f1f79dee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-22 08:11:37 +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
Bill Yi
f40225f1e1
[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: Ie011ba7a5d738ccb6f09eb99619292e6aa83a380
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-21 20:38:30 +00:00
Bill Yi
1d4c5c240c
[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: I121c518a3b86727ace4ffabd7586846225347332
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-21 20:38:24 +00:00
Bill Yi
6b8b091653
[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: Ie238c049642fb1e34b01e0d81cdc94b37e9cf009
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-21 20:38:13 +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
8287f6dd2e
[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: I7a4e67426ddf14b771962c356e1a629a12401934
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-21 06:37:02 +00:00
Bill Yi
6ddbc5e6be
[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: I7c9097d1415a6163ad859ea747049eeaec25861e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-21 06:36:56 +00:00
Bill Yi
3ecb491af2
[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: I333952a9b0a5ee8f37b620f38a122f9bde4d5125
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-21 06:36:31 +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
4e6fecc6d7
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: I70c6b9024fe1cbb7cf37bfea71225a8bebe5df50
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-20 17:06:04 +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