PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
145,086 Commits 1 Branch 0 Tags
d989dc5c36c1be15e4298628f33aefda6d46875c
Commit Graph

145086 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam Bookatz
b27f623acc [automerger skipped] Don't let profiles open the UserSettings overflow [DO NOT MERGE] am: 31e69deb28 am: 39011f67c4 -s ours am: ce282b133f -s ours 
am skip reason: contains skip directive

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

Change-Id: Ie73c0dba1dc75919124507639ba9533f63449fb2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-12-03 21:03:48 +00:00
Treehugger Robot
48986e3c4a [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 skip reason: contains skip directive

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

Change-Id: Ide88e9d56a9b3d3afdba7f190aa32ac62d7d1eb1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-12-03 20:53:27 +00:00
Adam Bookatz
c05fe256c9 [automerger skipped] Don't let profiles open the UserSettings overflow [DO NOT MERGE] am: 31e69deb28 am: 88f8eaecd6 -s ours am: aa78945af2 -s ours 
am skip reason: contains skip directive

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

Change-Id: I38882aa6e84344d8cfd054e54a20d38b8d0176d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-12-03 20:53:19 +00:00
Treehugger Robot
fc6c9000f2 [automerger skipped] Merge "Don't let profiles open the UserSettings overflow [DO NOT MERGE]" into tm-qpr-dev am: f07deaf5b4 -s ours am: e716dcdb41 -s ours am: 168447a4d1 -s ours 
am skip reason: contains skip directive

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

Change-Id: Ib9210dda165d949c13f540b52df336793f85ca9f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-12-03 20:39:33 +00:00
Adam Bookatz
5ae1733738 [automerger skipped] Don't let profiles open the UserSettings overflow [DO NOT MERGE] am: 9882f43d9c -s ours am: 662804b142 -s ours am: 233da90ddd -s ours 
am skip reason: contains skip directive

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

Change-Id: I18671fcc7fc245b82a9b2f6da0f66977e598aff0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-12-03 20:39:29 +00:00
Treehugger Robot
c05527c1fe [automerger skipped] Merge "Don't let profiles open the UserSettings overflow [DO NOT MERGE]" into udc-dev am: 31af2ff68c am: 00bc2566b2 -s ours 
am skip reason: Merged-In I5e4c095cda3e19fa5c63c2c550a526f5da8ec5c1 with SHA-1 a2f5c08370 is already in history

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

Change-Id: I5c5cc671aea82f5878031928ae9a2570a221c331
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-12-03 20:39:18 +00:00
Adam Bookatz
7ac148bf27 [automerger skipped] Don't let profiles open the UserSettings overflow [DO NOT MERGE] am: 6e413c4cff am: 22fe77ca00 -s ours 
am skip reason: Merged-In I5e4c095cda3e19fa5c63c2c550a526f5da8ec5c1 with SHA-1 a2f5c08370 is already in history

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

Change-Id: I7db5d19a559e3240b0bfbbffe896064b3dd56f7f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-12-03 20:39:14 +00:00
Treehugger Robot
16ee9ab16d [automerger skipped] Merge "Don't let profiles open the UserSettings overflow [DO NOT MERGE]" into tm-dev am: e0e72a57b7 am: 30d593d55f -s ours 
am skip reason: contains skip directive

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

Change-Id: I48b5c04894f5c2ceb8164c181892adc8e5351e60
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-12-03 20:39:11 +00:00
Treehugger Robot
cfaac63123 [automerger skipped] Merge "Don't let profiles open the UserSettings overflow [DO NOT MERGE]" into sc-v2-dev am: b937941549 -s ours 
am skip reason: contains skip directive

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

Change-Id: I2cf72fe9d591a6944472a201a95a8e6767916b45
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-12-03 20:39:09 +00:00
Adam Bookatz
ce282b133f [automerger skipped] Don't let profiles open the UserSettings overflow [DO NOT MERGE] am: 31e69deb28 am: 39011f67c4 -s ours 
am skip reason: contains skip directive

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

Change-Id: Ib9f2c8e53f359470546344aebd9ee6f482eff4b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-12-03 20:39:06 +00:00
Adam Bookatz
20bee2e84b [automerger skipped] Don't let profiles open the UserSettings overflow [DO NOT MERGE] am: 4901c86b76 -s ours 
am skip reason: contains skip directive

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

Change-Id: I951c78b82f0f8ffa45ca75f0f50f1bb7b45b672c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-12-03 20:39:04 +00:00
Treehugger Robot
619edad4b4 [automerger skipped] Merge "Don't let profiles open the UserSettings overflow [DO NOT MERGE]" into tm-qpr-dev am: f07deaf5b4 -s ours am: e716dcdb41 -s ours am: f7d9702392 -s ours 
am skip reason: contains skip directive

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

Change-Id: I7af8b945a99bcfb722faa75474e685018a1f15dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-12-03 20:38:54 +00:00
Treehugger Robot
3764a4cb26 [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 skip reason: contains skip directive

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

Change-Id: I4f9affde15cd4ed99d18ca92661dc6269f3c5285
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-12-03 20:38:53 +00:00
Adam Bookatz
7d7acf08ec [automerger skipped] Don't let profiles open the UserSettings overflow [DO NOT MERGE] am: 9882f43d9c -s ours am: 662804b142 -s ours am: e08637ef82 -s ours 
am skip reason: contains skip directive

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

Change-Id: I826ad535c744aa60f9a2413dd1beb4f13c785f2b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-12-03 20:38:50 +00:00
Adam Bookatz
80f4a4d681 [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 skip reason: contains skip directive

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

Change-Id: Ie26bb795e1b0a2ae6e8e8e7a2d7a2db4245b9e8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-12-03 20:38:47 +00:00
Treehugger Robot
44d9cb0910 [automerger skipped] Merge "Don't let profiles open the UserSettings overflow [DO NOT MERGE]" into udc-dev am: 31af2ff68c am: 23621ee8d7 -s ours 
am skip reason: contains skip directive

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

Change-Id: Icede7f8636ffbb8dede4fe089490ed82813cefdd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-12-03 20:38:37 +00:00
Treehugger Robot
329fd334c3 [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 skip reason: contains skip directive

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

Change-Id: Id24190cf6ed3742f08b7ec721565d397eb11985b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-12-03 20:38:36 +00:00
Adam Bookatz
546c146603 [automerger skipped] Don't let profiles open the UserSettings overflow [DO NOT MERGE] am: 6e413c4cff am: eb1e5320e7 -s ours 
am skip reason: contains skip directive

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

Change-Id: I297ff55867091c5619e8edff45834f38caeaa4da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-12-03 20:38:31 +00:00
Adam Bookatz
1596e41a75 [automerger skipped] Don't let profiles open the UserSettings overflow [DO NOT MERGE] am: 6f1c499e57 -s ours am: 1a45fcee73 -s ours 
am skip reason: contains skip directive

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

Change-Id: I5f08938878d15cd7643146bd5879b65716c3b817
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-12-03 20:38:29 +00:00
Treehugger Robot
157d188e4f [automerger skipped] Merge "Don't let profiles open the UserSettings overflow [DO NOT MERGE]" into tm-dev am: e0e72a57b7 am: 2b8075716b -s ours 
am skip reason: Merged-In I5e4c095cda3e19fa5c63c2c550a526f5da8ec5c1 with SHA-1 9882f43d9c is already in history

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

Change-Id: I66801867f8f150d4b06e78ad7d2c95fe2184f9cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-12-03 20:37:51 +00:00
Adam Bookatz
aa78945af2 [automerger skipped] Don't let profiles open the UserSettings overflow [DO NOT MERGE] am: 31e69deb28 am: 88f8eaecd6 -s ours 
am skip reason: Merged-In I5e4c095cda3e19fa5c63c2c550a526f5da8ec5c1 with SHA-1 9882f43d9c is already in history

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

Change-Id: Ic4da3cf7abf3928136a9d365179dd216b02fb61a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-12-03 20:37:47 +00:00
Treehugger Robot
168447a4d1 [automerger skipped] Merge "Don't let profiles open the UserSettings overflow [DO NOT MERGE]" into tm-qpr-dev am: f07deaf5b4 -s ours am: e716dcdb41 -s ours 
am skip reason: contains skip directive

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

Change-Id: I8a90cf6f4f1191ec7f4c6fb82756f50513d089a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-12-03 20:26:23 +00:00
Adam Bookatz
233da90ddd [automerger skipped] Don't let profiles open the UserSettings overflow [DO NOT MERGE] am: 9882f43d9c -s ours am: 662804b142 -s ours 
am skip reason: contains skip directive

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

Change-Id: I0e31735acbe6d5934aad1351281f75d4284733a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-12-03 20:26:18 +00:00
Matthew DeVore
607b01760f TopologyScale: limit vertical padding 
In the original design, we don't allow the vertical padding to be more
than the tallest display block on the top or bottom. This patch simply
applies that strategy that was in the design.

Test: TopologyScaleTest
Bug: b/352648432
Flag: com.android.settings.flags.display_topology_pane_in_display_list
Change-Id: Icd3e0c93e4201d8251de0be4ca636352115c657d
 2024-12-03 20:22:38 +00:00
Treehugger Robot
b937941549 Merge "Don't let profiles open the UserSettings overflow [DO NOT MERGE]" into sc-v2-dev 2024-12-03 20:21:34 +00:00
Treehugger Robot
f7d9702392 [automerger skipped] Merge "Don't let profiles open the UserSettings overflow [DO NOT MERGE]" into tm-qpr-dev am: f07deaf5b4 -s ours am: e716dcdb41 -s ours 
am skip reason: contains skip directive

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

Change-Id: Ib8f7572d0568fb93d202d4b0bddb9240cd9aa951
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-12-03 20:16:59 +00:00
Adam Bookatz
e08637ef82 [automerger skipped] Don't let profiles open the UserSettings overflow [DO NOT MERGE] am: 9882f43d9c -s ours am: 662804b142 -s ours 
am skip reason: contains skip directive

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

Change-Id: I2ee2217d634e0bf32eabd3baefe75b41ac8ea082
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-12-03 20:16:56 +00:00
Treehugger Robot
23621ee8d7 Merge "Don't let profiles open the UserSettings overflow [DO NOT MERGE]" into udc-dev am: 31af2ff68c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30489978

Change-Id: I30d38cb18cc432cee02aaf338332cb82394af4bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-12-03 20:16:45 +00:00
Treehugger Robot
2112cc5ef9 [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 skip reason: contains skip directive

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

Change-Id: Ic50acb869e087908f40a44f2701d1a7c6c7a96d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-12-03 20:16:44 +00:00
Treehugger Robot
354153e762 [automerger skipped] Merge "Don't let profiles open the UserSettings overflow [DO NOT MERGE]" into udc-qpr-dev am: ed4d949e5a -s ours 
am skip reason: contains skip directive

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

Change-Id: I4f08805058acc10aff0a41dd3ac3628cf7967c99
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-12-03 20:16:43 +00:00
Adam Bookatz
eb1e5320e7 Don't let profiles open the UserSettings overflow [DO NOT MERGE] am: 6e413c4cff 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30489978

Change-Id: I793ddf2e961045cf0da2e569f55fe8cf8da02aed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-12-03 20:16:41 +00:00
Adam Bookatz
d5e5daf68e [automerger skipped] Don't let profiles open the UserSettings overflow [DO NOT MERGE] am: 44a35ac07b -s ours am: 9d81e7d2e5 -s ours 
am skip reason: contains skip directive

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

Change-Id: I1a9ae19f5ecee037bbb6e471ce175c1b4a53643e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-12-03 20:16:38 +00:00
Adam Bookatz
e19a7ebefc [automerger skipped] Don't let profiles open the UserSettings overflow [DO NOT MERGE] am: a2f5c08370 -s ours 
am skip reason: contains skip directive

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

Change-Id: I67cadd71b4b12de528cd7ef6a192ec77ada34a3f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-12-03 20:16:36 +00:00
Treehugger Robot
24dc9f533a [automerger skipped] Merge "Don't let profiles open the UserSettings overflow [DO NOT MERGE]" into sc-qpr1-dev am: 8cfbd8aa9b -s ours 
am skip reason: contains skip directive

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

Change-Id: Ied614224826efe4e3dda2bcc6b4b9b3e8b704905
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-12-03 20:16:18 +00:00
Adam Bookatz
1a45fcee73 [automerger skipped] Don't let profiles open the UserSettings overflow [DO NOT MERGE] am: 6f1c499e57 -s ours 
am skip reason: contains skip directive

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

Change-Id: Ic6bdcdeaea0d4e7074f4469281126d33315abc58
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-12-03 20:16:11 +00:00
Treehugger Robot
2b8075716b Merge "Don't let profiles open the UserSettings overflow [DO NOT MERGE]" into tm-dev am: e0e72a57b7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30490211

Change-Id: Icc114cca75791a256df51901f55242478fb7554c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-12-03 20:16:10 +00:00
Adam Bookatz
88f8eaecd6 Don't let profiles open the UserSettings overflow [DO NOT MERGE] am: 31e69deb28 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30490211

Change-Id: Ide60dc82191b736ae1d1906d0b6ecd9808c7bc1e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-12-03 20:16:05 +00:00
Treehugger Robot
30d593d55f Merge "Don't let profiles open the UserSettings overflow [DO NOT MERGE]" into tm-dev am: e0e72a57b7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30490211

Change-Id: Ia080e518c2170904c52fde02403ee63c9b55e8d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-12-03 20:15:52 +00:00
Treehugger Robot
ad1e470fc0 [automerger skipped] Merge "Don't let profiles open the UserSettings overflow [DO NOT MERGE]" into sc-dev am: ead69f3d43 -s ours 
am skip reason: Merged-In I5e4c095cda3e19fa5c63c2c550a526f5da8ec5c1 with SHA-1 6f1c499e57 is already in history

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

Change-Id: I061448f1d049252139864636361c59710659f2ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-12-03 20:15:42 +00:00
Adam Bookatz
9d81e7d2e5 [automerger skipped] Don't let profiles open the UserSettings overflow [DO NOT MERGE] am: 44a35ac07b -s ours 
am skip reason: Merged-In I5e4c095cda3e19fa5c63c2c550a526f5da8ec5c1 with SHA-1 6f1c499e57 is already in history

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

Change-Id: Ic5289feb780f3de57608de58b86d7250da337727
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-12-03 20:15:39 +00:00
Adam Bookatz
39011f67c4 Don't let profiles open the UserSettings overflow [DO NOT MERGE] am: 31e69deb28 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30490211

Change-Id: Iaa3e5c9dc2b5d0f677391e0b56c0c905cb553118
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-12-03 20:15:37 +00:00
Treehugger Robot
e716dcdb41 [automerger skipped] Merge "Don't let profiles open the UserSettings overflow [DO NOT MERGE]" into tm-qpr-dev am: f07deaf5b4 -s ours 
am skip reason: contains skip directive

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

Change-Id: If436584157bac594504bc26ff60373850b9468d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-12-03 20:15:13 +00:00
Adam Bookatz
662804b142 [automerger skipped] Don't let profiles open the UserSettings overflow [DO NOT MERGE] am: 9882f43d9c -s ours 
am skip reason: contains skip directive

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

Change-Id: I738257055d7155884ff8524f46d1edb25dda1dfc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-12-03 20:15:08 +00:00
Treehugger Robot
00bc2566b2 Merge "Don't let profiles open the UserSettings overflow [DO NOT MERGE]" into udc-dev am: 31af2ff68c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30489978

Change-Id: I24391d248a2af734c39f1a9aa5ece22203bdb23c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-12-03 20:15:03 +00:00
Adam Bookatz
22fe77ca00 Don't let profiles open the UserSettings overflow [DO NOT MERGE] am: 6e413c4cff 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30489978

Change-Id: Ic8113dd1061984e51174b779f6d6e74dfc2a091a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-12-03 20:14:59 +00:00
Treehugger Robot
8cfbd8aa9b Merge "Don't let profiles open the UserSettings overflow [DO NOT MERGE]" into sc-qpr1-dev 2024-12-03 19:57:12 +00:00
Treehugger Robot
31af2ff68c Merge "Don't let profiles open the UserSettings overflow [DO NOT MERGE]" into udc-dev 2024-12-03 19:52:15 +00:00
Treehugger Robot
ed4d949e5a Merge "Don't let profiles open the UserSettings overflow [DO NOT MERGE]" into udc-qpr-dev 2024-12-03 19:51:15 +00:00
Treehugger Robot
f07deaf5b4 Merge "Don't let profiles open the UserSettings overflow [DO NOT MERGE]" into tm-qpr-dev 2024-12-03 19:51:15 +00:00
Bill Yi
cbed4b18cb Merge "Import translations. DO NOT MERGE ANYWHERE" into main 2024-12-03 19:46:35 +00:00