Commit Graph

123146 Commits

Author SHA1 Message Date
Matías Hernández
8109b4b3a3 [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: I7ac7386d74b026e6bc2716172fbf551df7b9f98f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-29 02:03:50 +00:00
Matías Hernández
cbaad821d6 [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: I7b766fb853e2cb4a4648f86e8c66b89303922f32
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-29 01:41:53 +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
279e4c77f0 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: I4d1d06bcff647eec3e10fa99636f301563e05ab6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-28 18:40:35 +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
143d105dc9 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: I4ab7053bffc4268cf1d0d2be5e7dbec5ba5f65d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-28 17:15:07 +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
Bill Yi
616457304e Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod 2023-06-24 17:35:14 +00:00
TreeHugger Robot
636d316e57 [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: I04eb5c9acd3f70f435e503f968d79548c93de350
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-24 03:19:37 +00:00
Bill Yi
f5b3ef4010 [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: I9c4945e08d5f23f2cca89bf427ed163eb87c8f31
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-24 03:19:28 +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
0676acb354 [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: I491567c8910ba71c883470e476ad627923be5af0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-24 00:09:24 +00:00
Bill Yi
b85ab40772 [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: Ibefe2f9d9e0eacc90a16d7ec2bace8601971b584
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-24 00:07:00 +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
137f4ad8fb Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ia4bd85ca02e780613b9973b4dc188e6b761972e5
2023-06-23 06:27:11 -07: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
71efddfbbb [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: I1f2a7f5f4f64f91190a8e92147f73cc703e1d5df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-23 00:07:42 +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
5387a2592d [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: I2fb55e1434c6cc76fa9aeae230289366f1e5c268
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-22 08:12:13 +00:00
Bill Yi
abf0fe2412 [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: I368a0cb1d703f7eac6885eb25a3100c3f5647e55
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-22 08:11:59 +00:00
Bill Yi
185e62a7cc [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: I213c1f6e40d389518168239295dd845a13caaa53
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-22 08:11:41 +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
a9dd669426 [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: I2b716efcee23ef5b13c685e9e4ac2ac9e0a7509d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 20:36:05 +00:00
Bill Yi
1c7d5a2a6c [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: I69966b3b7a359c89f5e5cf0252ade5fb4c004b73
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 20:35:59 +00:00
Bill Yi
b14edb9c5d [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: If33f1daa16456ec7ebb8f1b544ec2e949c6114e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 20:35: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
9d95faadcf [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: Ida72cb381d7846e1a5a2ff4d62b790d15ffbc8c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 06:36:34 +00:00
Bill Yi
99d855e12d [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: Ib7dd3dbbf533a171c6a8ce4a782ed34583a27b07
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 06:36:29 +00:00
Bill Yi
31eb96784f [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: If611b97ae73bba5cf7a1db9cacb0cedf4c966781
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 06:36:04 +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
2390428dd8 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: Iaf0c32fc2ff4450dadc2256601d6966e5bd73d76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-20 17:06:19 +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
YK Hung
0d8db71d44 Merge "Update tablet help article link (1/2)" into udc-dev am: a4f67e02c8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23695285

Change-Id: I3158ea89ef2804c5a9878ff27db5b9b4466e0644
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-20 07:05:48 +00:00
YK Hung
a4f67e02c8 Merge "Update tablet help article link (1/2)" into udc-dev 2023-06-20 06:34:46 +00:00
Matías Hernández
b88fbf932a 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
Merged-In: Ifc048311746c027e3683cdcf65f1079d04cf7c56
2023-06-19 09:57:23 +00:00
Julia Tuttle
b23136041d Fix colors in importance and conversation priority preferences
This would have been simpler and faster, but the ChannelPanelActivity
was giving me a context where Material colors always inflated in light
theme even if the device was in dark theme, so I had to work around it.

On the plus side, whoever next needs to change these colors will find
them neatly organized in themes.xml!

Bug: 284380876
Test: manual
Change-Id: I2eee877fe44d307a96d60168d0317444ff002669
2023-06-16 19:17:09 +00:00