Yining Liu
c16c9b2df6
Implement the show sensitive content toggle
...
Implement the show sensitive content only when unlocked toggle on the
notifications on lock screen page. The toggle will become invisible
when the main toggle is unset or when there's no screen locks.
Bug: 367455695
Flag: com.android.server.notification.notification_lock_screen_settings
Test: adb shell settings get secure \
lock_screen_allow_private_notifications <1|0>
Change-Id: I174478540c4cc2e2df7047049671266041dd41cf
2024-12-04 18:53:35 +00:00
Yining Liu
0d75a26a68
Implement the main switch of notifications on lock screen
...
Add the ability of controlling whether to show notifs on the lock
screen (secure setting: lock_screen_show_notifications) to the new
lock screen notification settings page main switch. This switch also
listens to the change of lock_screen_show_notifications to update
its status in case of other places change the value.
Bug: 367455695
Flag: com.android.server.notification.notification_lock_screen_settings
Test: atest LockScreenNotificationsPreferenceControllerTest
Change-Id: Id598d508ac383563a0d9413578251eb22ed4ca90
2024-12-04 18:53:32 +00:00
Yining Liu
9836d6a69a
Add the new settings page for lock screen notifs
...
Add a new empty settings page, which is flag-guarded. When the flag
is disabled, show the original Notifications on lock screen
tri-state switch, otherwise show the new page.
Bug: 367455695
Flag: com.android.server.notification.notification_lock_screen_settings
Test: atest LockScreenNotificationsPreferenceControllerTest
Change-Id: I8a81ad651626f39380767b2c9cfa2f1c19d0e7c5
2024-12-04 00:30:05 +00:00
Treehugger Robot
226c6392ef
[automerger skipped] Merge "Don't let profiles open the UserSettings overflow [DO NOT MERGE]" into sc-v2-dev am: b937941549 -s ours am: cfaac63123 -s ours am: 6f5e87739b -s ours am: e37a2247f1 -s ours am: 955fef7066 -s ours am: c18b719c54 -s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30490209
Change-Id: Ifb221edb8ca25e86b770bb33935bcfbcd871dda8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-12-03 22:26:46 +00:00
Adam Bookatz
f1bac6cb40
[automerger skipped] Don't let profiles open the UserSettings overflow [DO NOT MERGE] am: 4901c86b76 -s ours am: 20bee2e84b -s ours am: dad028a675 -s ours am: 055a2bca93 -s ours am: 351ece5890 -s ours am: da62ab8049 -s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30490209
Change-Id: I27c93df1e14306ed65f8db253b880c7f3db705fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-12-03 22:26:41 +00:00
Treehugger Robot
7025e90068
[automerger skipped] Merge "Don't let profiles open the UserSettings overflow [DO NOT MERGE]" into sc-dev am: ead69f3d43 -s ours am: ad1e470fc0 -s ours am: 2112cc5ef9 -s ours am: 3764a4cb26 -s ours am: 559b96d9b6 -s ours am: 8ab0f1de3c -s ours am: 0c1c752f7d -s ours am: 15fd2598f3 -s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30487387
Change-Id: I60283a3f1015cd4e0158c20685e62d2921d69109
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-12-03 22:26:31 +00:00
Adam Bookatz
dad1ca72b7
[automerger skipped] Don't let profiles open the UserSettings overflow [DO NOT MERGE] am: 44a35ac07b -s ours am: 9d81e7d2e5 -s ours am: d5e5daf68e -s ours am: 80f4a4d681 -s ours am: aa291510b8 -s ours am: 37173a8dfb -s ours am: 6329c66f26 -s ours am: 2a8fa73437 -s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30487387
Change-Id: I75c4e3c61c63b37df66b90b37cbd7a8efdb9e870
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-12-03 22:26:26 +00:00
Treehugger Robot
26d1612761
[automerger skipped] Merge "Don't let profiles open the UserSettings overflow [DO NOT MERGE]" into sc-qpr1-dev am: 8cfbd8aa9b -s ours am: 24dc9f533a -s ours am: 329fd334c3 -s ours am: cf4b80e413 -s ours am: 2060250a81 -s ours am: f371a98737 -s ours am: fe45a10d95 -s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30490208
Change-Id: I73ed2c536f6e9bb150e3e51ec1b710c44f36c0b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-12-03 22:26:14 +00:00
Adam Bookatz
d9163b4ff2
[automerger skipped] Don't let profiles open the UserSettings overflow [DO NOT MERGE] am: 6f1c499e57 -s ours am: 1a45fcee73 -s ours am: 1596e41a75 -s ours am: bb96e81f34 -s ours am: 1db07ae91a -s ours am: 3a58103327 -s ours am: 5e0292de20 -s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30490208
Change-Id: I5551aeb7d20b0d36293e085f4ac627b0f2b5a9ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-12-03 22:26:09 +00:00
Treehugger Robot
0ab2db8c73
[automerger skipped] Merge "Don't let profiles open the UserSettings overflow [DO NOT MERGE]" into sc-v2-dev am: b937941549 -s ours am: cfaac63123 -s ours am: 76c8e3526a -s ours am: ac9402af41 -s ours am: df6770ca14 -s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30490209
Change-Id: I8da7ff34745086719e23b374db74b4ba7fff69de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-12-03 22:25:57 +00:00
Adam Bookatz
4a5163b59f
[automerger skipped] Don't let profiles open the UserSettings overflow [DO NOT MERGE] am: 4901c86b76 -s ours am: 20bee2e84b -s ours am: 9678e0dd04 -s ours am: bfb7b3d085 -s ours am: 87d1e8c818 -s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30490209
Change-Id: I3ebf2cb37375c39836a81fa53b76e6d09ea2c505
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-12-03 22:25:52 +00:00
Treehugger Robot
a7ae258b5c
[automerger skipped] Merge "Don't let profiles open the UserSettings overflow [DO NOT MERGE]" into sc-dev am: ead69f3d43 -s ours am: ad1e470fc0 -s ours am: 2112cc5ef9 -s ours am: 3764a4cb26 -s ours am: a5078949a1 -s ours am: 7d9e99e5b4 -s ours am: 23704b815d -s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30487387
Change-Id: If3514f1234ad035c63de25c10bc7946730a3bac7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-12-03 22:25:41 +00:00
Adam Bookatz
e6c852bb5a
[automerger skipped] Don't let profiles open the UserSettings overflow [DO NOT MERGE] am: 44a35ac07b -s ours am: 9d81e7d2e5 -s ours am: d5e5daf68e -s ours am: 80f4a4d681 -s ours am: 647c3b30a7 -s ours am: a1cf0740a7 -s ours am: 3bbad90ef7 -s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30487387
Change-Id: I4ec0fb1dfa7a3d3f183269ae8ea60e95fcd8cea3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-12-03 22:25:36 +00:00
Treehugger Robot
e77d24c8ed
[automerger skipped] Merge "Don't let profiles open the UserSettings overflow [DO NOT MERGE]" into sc-qpr1-dev am: 8cfbd8aa9b -s ours am: 24dc9f533a -s ours am: 329fd334c3 -s ours am: 6f3dce1580 -s ours am: a0cd22a37e -s ours am: 76d4f7848e -s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30490208
Change-Id: I4bd27654eb323e01287df39e50a6998e46ce1aed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-12-03 22:25:19 +00:00
Adam Bookatz
40a990760f
[automerger skipped] Don't let profiles open the UserSettings overflow [DO NOT MERGE] am: 6f1c499e57 -s ours am: 1a45fcee73 -s ours am: 1596e41a75 -s ours am: 9608452666 -s ours am: 71f3587b1c -s ours am: 51a7545f32 -s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30490208
Change-Id: I0abd81b7629352d24083638887f66c3fcdefb91f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-12-03 22:25:04 +00:00
Treehugger Robot
1b53ae5649
[automerger skipped] Merge "Don't let profiles open the UserSettings overflow [DO NOT MERGE]" into tm-dev am: e0e72a57b7 am: 2b8075716b -s ours am: 157d188e4f -s ours am: 48986e3c4a -s ours am: 97d842131c -s ours am: f52519196e -s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30490211
Change-Id: I76d9ef3535adf091991e2447a5e9f49d87d86481
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-12-03 22:04:19 +00:00
Adam Bookatz
2adcf431fb
[automerger skipped] Don't let profiles open the UserSettings overflow [DO NOT MERGE] am: 31e69deb28 am: 88f8eaecd6 -s ours am: aa78945af2 -s ours am: c05fe256c9 -s ours am: ebea1e6c06 -s ours am: e5e268aea2 -s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30490211
Change-Id: Ie4e63b883fc7f733cd89fee066d18e4dab5f2090
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-12-03 22:04:15 +00:00
Treehugger Robot
c18b719c54
[automerger skipped] Merge "Don't let profiles open the UserSettings overflow [DO NOT MERGE]" into sc-v2-dev am: b937941549 -s ours am: cfaac63123 -s ours am: 6f5e87739b -s ours am: e37a2247f1 -s ours am: 955fef7066 -s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30490209
Change-Id: I17948e06c7cbf1ee26a1ac373921b68612ed3cee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-12-03 22:03:24 +00:00
Adam Bookatz
da62ab8049
[automerger skipped] Don't let profiles open the UserSettings overflow [DO NOT MERGE] am: 4901c86b76 -s ours am: 20bee2e84b -s ours am: dad028a675 -s ours am: 055a2bca93 -s ours am: 351ece5890 -s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30490209
Change-Id: I9076ff9654e562ed3528ff6d56ff024bafb0d9b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-12-03 22:03:21 +00:00
Treehugger Robot
15fd2598f3
[automerger skipped] Merge "Don't let profiles open the UserSettings overflow [DO NOT MERGE]" into sc-dev am: ead69f3d43 -s ours am: ad1e470fc0 -s ours am: 2112cc5ef9 -s ours am: 3764a4cb26 -s ours am: 559b96d9b6 -s ours am: 8ab0f1de3c -s ours am: 0c1c752f7d -s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30487387
Change-Id: I916dac40e5ca3ff3ff672c11425df7e90f76428d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-12-03 22:03:12 +00:00
Adam Bookatz
2a8fa73437
[automerger skipped] Don't let profiles open the UserSettings overflow [DO NOT MERGE] am: 44a35ac07b -s ours am: 9d81e7d2e5 -s ours am: d5e5daf68e -s ours am: 80f4a4d681 -s ours am: aa291510b8 -s ours am: 37173a8dfb -s ours am: 6329c66f26 -s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30487387
Change-Id: If148dd95ddb0438704b99528b6114920a7ff7028
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-12-03 22:03:10 +00:00
Riley Jones
6d1c378972
Merge "Cleaning up quick settings flag in Settings app" into main
2024-12-03 22:03:04 +00:00
Treehugger Robot
fe45a10d95
[automerger skipped] Merge "Don't let profiles open the UserSettings overflow [DO NOT MERGE]" into sc-qpr1-dev am: 8cfbd8aa9b -s ours am: 24dc9f533a -s ours am: 329fd334c3 -s ours am: cf4b80e413 -s ours am: 2060250a81 -s ours am: f371a98737 -s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30490208
Change-Id: Id24b1260a3da1efd04598e59e4a566d3a67ffb34
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-12-03 22:03:01 +00:00
Adam Bookatz
5e0292de20
[automerger skipped] Don't let profiles open the UserSettings overflow [DO NOT MERGE] am: 6f1c499e57 -s ours am: 1a45fcee73 -s ours am: 1596e41a75 -s ours am: bb96e81f34 -s ours am: 1db07ae91a -s ours am: 3a58103327 -s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30490208
Change-Id: I6ac604855e6d04e3140a64b9aec9c860c186ff82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-12-03 22:02:58 +00:00
Treehugger Robot
df6770ca14
[automerger skipped] Merge "Don't let profiles open the UserSettings overflow [DO NOT MERGE]" into sc-v2-dev am: b937941549 -s ours am: cfaac63123 -s ours am: 76c8e3526a -s ours am: ac9402af41 -s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30490209
Change-Id: I73d69ecca907ed437f9c3c42482b7b778ecfae93
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-12-03 22:02:49 +00:00
Adam Bookatz
87d1e8c818
[automerger skipped] Don't let profiles open the UserSettings overflow [DO NOT MERGE] am: 4901c86b76 -s ours am: 20bee2e84b -s ours am: 9678e0dd04 -s ours am: bfb7b3d085 -s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30490209
Change-Id: Ia5b89c436ca478f792b46b0c28282284f724cbf0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-12-03 22:02:46 +00:00
Treehugger Robot
cda553d506
[automerger skipped] Merge "Don't let profiles open the UserSettings overflow [DO NOT MERGE]" into tm-dev am: e0e72a57b7 am: 30d593d55f -s ours am: 16ee9ab16d -s ours am: 51e1fb9f8d -s ours am: 54b99cf7a3 -s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30490211
Change-Id: I93209ac94db64758ead79d6b4f09266dee4bc60c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-12-03 22:02:41 +00:00
Treehugger Robot
23704b815d
[automerger skipped] Merge "Don't let profiles open the UserSettings overflow [DO NOT MERGE]" into sc-dev am: ead69f3d43 -s ours am: ad1e470fc0 -s ours am: 2112cc5ef9 -s ours am: 3764a4cb26 -s ours am: a5078949a1 -s ours am: 7d9e99e5b4 -s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30487387
Change-Id: I7420c523639a49de46b0764ee3104f4d146acfcb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-12-03 22:02:37 +00:00
Adam Bookatz
fba0024a21
[automerger skipped] Don't let profiles open the UserSettings overflow [DO NOT MERGE] am: 31e69deb28 am: 39011f67c4 -s ours am: ce282b133f -s ours am: b27f623acc -s ours am: c9ccb17b7d -s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30490211
Change-Id: Icfb16310bfdb5a92f6b7fdabd93e7503f3d9f675
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-12-03 22:02:36 +00:00
Adam Bookatz
3bbad90ef7
[automerger skipped] Don't let profiles open the UserSettings overflow [DO NOT MERGE] am: 44a35ac07b -s ours am: 9d81e7d2e5 -s ours am: d5e5daf68e -s ours am: 80f4a4d681 -s ours am: 647c3b30a7 -s ours am: a1cf0740a7 -s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30487387
Change-Id: I985c1c0328b386aed3ae8b41499404d4eb824783
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-12-03 22:02:34 +00:00
Treehugger Robot
76d4f7848e
[automerger skipped] Merge "Don't let profiles open the UserSettings overflow [DO NOT MERGE]" into sc-qpr1-dev am: 8cfbd8aa9b -s ours am: 24dc9f533a -s ours am: 329fd334c3 -s ours am: 6f3dce1580 -s ours am: a0cd22a37e -s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30490208
Change-Id: Ibfd0f272de0758d8532bd416ec57c8a82e79b890
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-12-03 22:02:24 +00:00
Adam Bookatz
51a7545f32
[automerger skipped] Don't let profiles open the UserSettings overflow [DO NOT MERGE] am: 6f1c499e57 -s ours am: 1a45fcee73 -s ours am: 1596e41a75 -s ours am: 9608452666 -s ours am: 71f3587b1c -s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30490208
Change-Id: Ia31318a1d0ceb8a045189c78f60d34923e9d0108
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-12-03 22:02:21 +00:00
Treehugger Robot
955fef7066
[automerger skipped] Merge "Don't let profiles open the UserSettings overflow [DO NOT MERGE]" into sc-v2-dev am: b937941549 -s ours am: cfaac63123 -s ours am: 6f5e87739b -s ours am: e37a2247f1 -s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30490209
Change-Id: Ideca8b59f0989b915d45db43840e52d30a1c8c22
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-12-03 22:02:03 +00:00
Adam Bookatz
351ece5890
[automerger skipped] Don't let profiles open the UserSettings overflow [DO NOT MERGE] am: 4901c86b76 -s ours am: 20bee2e84b -s ours am: dad028a675 -s ours am: 055a2bca93 -s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30490209
Change-Id: I70840d2acdf38a659d7eb02426e3b0814277d702
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-12-03 22:01:57 +00:00
Treehugger Robot
0c1c752f7d
[automerger skipped] Merge "Don't let profiles open the UserSettings overflow [DO NOT MERGE]" into sc-dev am: ead69f3d43 -s ours am: ad1e470fc0 -s ours am: 2112cc5ef9 -s ours am: 3764a4cb26 -s ours am: 559b96d9b6 -s ours am: 8ab0f1de3c -s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30487387
Change-Id: Ib739d1caeb4227945b2af18f6147d40a81894205
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-12-03 22:01:41 +00:00
Adam Bookatz
6329c66f26
[automerger skipped] Don't let profiles open the UserSettings overflow [DO NOT MERGE] am: 44a35ac07b -s ours am: 9d81e7d2e5 -s ours am: d5e5daf68e -s ours am: 80f4a4d681 -s ours am: aa291510b8 -s ours am: 37173a8dfb -s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30487387
Change-Id: Ie15340c86d29915400752ed27c74dc05be4795a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-12-03 22:01:36 +00:00
Treehugger Robot
f371a98737
[automerger skipped] Merge "Don't let profiles open the UserSettings overflow [DO NOT MERGE]" into sc-qpr1-dev am: 8cfbd8aa9b -s ours am: 24dc9f533a -s ours am: 329fd334c3 -s ours am: cf4b80e413 -s ours am: 2060250a81 -s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30490208
Change-Id: Ia39669de6a0381b1434a01e9eae57ec53cb9162a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-12-03 22:01:22 +00:00
Adam Bookatz
3a58103327
[automerger skipped] Don't let profiles open the UserSettings overflow [DO NOT MERGE] am: 6f1c499e57 -s ours am: 1a45fcee73 -s ours am: 1596e41a75 -s ours am: bb96e81f34 -s ours am: 1db07ae91a -s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30490208
Change-Id: I50a508b4cdab089a0642ed90016c0235642e4c8a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-12-03 22:01:15 +00:00
Treehugger Robot
b17b1f8f90
[automerger skipped] Merge "Don't let profiles open the UserSettings overflow [DO NOT MERGE]" into tm-dev am: e0e72a57b7 am: 2b8075716b -s ours am: 157d188e4f -s ours am: 48986e3c4a -s ours am: 7045f16fe5 -s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30490211
Change-Id: I5866c774da48a7c2548c8547b2e7317c582ba57e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-12-03 21:43:51 +00:00
Adam Bookatz
32223df703
[automerger skipped] Don't let profiles open the UserSettings overflow [DO NOT MERGE] am: 31e69deb28 am: 88f8eaecd6 -s ours am: aa78945af2 -s ours am: c05fe256c9 -s ours am: 21cddd4272 -s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30490211
Change-Id: If1d7207134e9bd9e92d43c56cf024700a348d868
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-12-03 21:43:44 +00:00
Treehugger Robot
8ea4fc1fae
[automerger skipped] Merge "Don't let profiles open the UserSettings overflow [DO NOT MERGE]" into tm-dev am: e0e72a57b7 am: 30d593d55f -s ours am: 16ee9ab16d -s ours am: e41601298b -s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30490211
Change-Id: I62e09824231e3a87100ab0346187e77d426ee9e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-12-03 21:42:07 +00:00
Adam Bookatz
6f7b8b2501
[automerger skipped] Don't let profiles open the UserSettings overflow [DO NOT MERGE] am: 31e69deb28 am: 39011f67c4 -s ours am: ce282b133f -s ours am: d137054003 -s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30490211
Change-Id: I4ac4e344385474aaa851e2e39e71bd715a10ee64
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-12-03 21:42:00 +00:00
Treehugger Robot
f52519196e
[automerger skipped] Merge "Don't let profiles open the UserSettings overflow [DO NOT MERGE]" into tm-dev am: e0e72a57b7 am: 2b8075716b -s ours am: 157d188e4f -s ours am: 48986e3c4a -s ours am: 97d842131c -s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30490211
Change-Id: I0ad03714dc6e931da63a0803fb9d29fecab30a0f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-12-03 21:41:26 +00:00
Adam Bookatz
e5e268aea2
[automerger skipped] Don't let profiles open the UserSettings overflow [DO NOT MERGE] am: 31e69deb28 am: 88f8eaecd6 -s ours am: aa78945af2 -s ours am: c05fe256c9 -s ours am: ebea1e6c06 -s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30490211
Change-Id: I67ff7bb0df1f4a4b32959835bdd0c54b5208a934
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-12-03 21:41:21 +00:00
Treehugger Robot
ac9402af41
[automerger skipped] Merge "Don't let profiles open the UserSettings overflow [DO NOT MERGE]" into sc-v2-dev am: b937941549 -s ours am: cfaac63123 -s ours am: 76c8e3526a -s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30490209
Change-Id: I0fdd771d59956bbdf7e88e52e2a75e06279a6bdc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-12-03 21:40:47 +00:00
Adam Bookatz
bfb7b3d085
[automerger skipped] Don't let profiles open the UserSettings overflow [DO NOT MERGE] am: 4901c86b76 -s ours am: 20bee2e84b -s ours am: 9678e0dd04 -s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30490209
Change-Id: Iceef742cce37a3badcd35b90ca3f8a18509ba8fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-12-03 21:40:42 +00:00
Treehugger Robot
54b99cf7a3
[automerger skipped] Merge "Don't let profiles open the UserSettings overflow [DO NOT MERGE]" into tm-dev am: e0e72a57b7 am: 30d593d55f -s ours am: 16ee9ab16d -s ours am: 51e1fb9f8d -s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30490211
Change-Id: I6d0a9f429de21240713799e5aa59dcafa97ced52
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-12-03 21:40:30 +00:00
Treehugger Robot
7d9e99e5b4
[automerger skipped] Merge "Don't let profiles open the UserSettings overflow [DO NOT MERGE]" into sc-dev am: ead69f3d43 -s ours am: ad1e470fc0 -s ours am: 2112cc5ef9 -s ours am: 3764a4cb26 -s ours am: a5078949a1 -s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30487387
Change-Id: I882d3de17aa31d3f46ea2624c520baf140447f0e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-12-03 21:40:30 +00:00
Adam Bookatz
c9ccb17b7d
[automerger skipped] Don't let profiles open the UserSettings overflow [DO NOT MERGE] am: 31e69deb28 am: 39011f67c4 -s ours am: ce282b133f -s ours am: b27f623acc -s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30490211
Change-Id: Ia13ada3936a8d44688f4f9c927ba93e4b0be08ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-12-03 21:40:26 +00:00
Adam Bookatz
a1cf0740a7
[automerger skipped] Don't let profiles open the UserSettings overflow [DO NOT MERGE] am: 44a35ac07b -s ours am: 9d81e7d2e5 -s ours am: d5e5daf68e -s ours am: 80f4a4d681 -s ours am: 647c3b30a7 -s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30487387
Change-Id: I4d8196c92c4d1b14adae70e891edf2143730f410
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-12-03 21:40:24 +00:00
