Commit Graph

145008 Commits

Author SHA1 Message Date
mxyyiyi
7ce71c7619 [ExpressiveBattery] Replace LayoutPreference with IntroPreference.
Use IntroPreference to show apps' icon and label in
(1) App info > App battery usage page
(2)App info > App battery usage > Allow background usage

Bug: 349652542
Test: visual
Flag: EXEMPT flag by System prop
Change-Id: I44f3369e48f073d98455fcab3ccd10ffecdb8d66
2024-12-04 17:38:42 +08:00
Chaohui Wang
8043fba40b [automerger skipped] Merge "[Safer intents] App Time Spent Preference" into udc-dev am: 0691d3040b am: 3c8101a303 -s ours am: 169fa08b6d -s ours
am skip reason: Merged-In I2af7b53a75fe5c6915dd9781406039822789c18c with SHA-1 87dbf9c4b8 is already in history

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

Change-Id: Ic92023981923006ae0b4cf87fb75e2a68fd0ba74
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-12-04 02:58:29 +00:00
Chaohui Wang
169fa08b6d [automerger skipped] Merge "[Safer intents] App Time Spent Preference" into udc-dev am: 0691d3040b am: 3c8101a303 -s ours
am skip reason: Merged-In I2af7b53a75fe5c6915dd9781406039822789c18c with SHA-1 87dbf9c4b8 is already in history

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

Change-Id: I6d243e343e2dab99e14e6459e882db36b1fc9dbd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-12-04 02:34:07 +00:00
Chaohui Wang
b6675ea4a8 [automerger skipped] Merge "[Safer intents] App Time Spent Preference" into udc-dev am: 0691d3040b am: a8e4522f8c -s ours
am skip reason: Merged-In I2af7b53a75fe5c6915dd9781406039822789c18c with SHA-1 87dbf9c4b8 is already in history

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

Change-Id: I2e3e5543d1b687850f1ccf4a8dd0421c7cdcaa99
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-12-04 02:33:48 +00:00
Chaohui Wang
0767df6b14 [automerger skipped] Merge "[Safer intents] App Time Spent Preference" into udc-qpr-dev am: d5881e2dfc -s ours
am skip reason: Merged-In I2af7b53a75fe5c6915dd9781406039822789c18c with SHA-1 426cbd623d is already in history

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

Change-Id: Ib657a5efe5fa00b58ee18f2d360b9d992284deb1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-12-04 02:11:40 +00:00
Chaohui Wang
8de4d17c92 [automerger skipped] [Safer intents] App Time Spent Preference am: 87dbf9c4b8 -s ours
am skip reason: Merged-In I2af7b53a75fe5c6915dd9781406039822789c18c with SHA-1 426cbd623d is already in history

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

Change-Id: I8c4a37b76b359b54b97f913facc2d8c994f1340b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-12-04 02:11:35 +00:00
Chaohui Wang
a8e4522f8c Merge "[Safer intents] App Time Spent Preference" into udc-dev am: 0691d3040b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30341738

Change-Id: I2cb164d28c75c4de511c18548130835570a170c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-12-04 02:11:14 +00:00
Chaohui Wang
3c8101a303 Merge "[Safer intents] App Time Spent Preference" into udc-dev am: 0691d3040b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30341738

Change-Id: Iaed38eeb96a64f84330b2115372c8bd7a5728d6c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-12-04 02:09:43 +00:00
Jacky Wang
29a901743f Merge "[Catalyst] Refine WifiSwitchPreference" into main 2024-12-04 01:42:50 +00:00
Jin Jeong
7975c1c217 Merge "New System API to launch SIM Preference in Setting" into main 2024-12-04 01:31:58 +00:00
Chaohui Wang
d5881e2dfc Merge "[Safer intents] App Time Spent Preference" into udc-qpr-dev 2024-12-04 01:27:30 +00:00
Chaohui Wang
0691d3040b Merge "[Safer intents] App Time Spent Preference" into udc-dev 2024-12-04 01:27:28 +00:00
Treehugger Robot
70e95a24f2 [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: 4b46ccbb01 -s ours am: e0f038e080 -s ours
am skip reason: contains skip directive

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

Change-Id: I062a91855e4adbcf1ec14a51dfed0f9a7da3073c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-12-03 23:15:15 +00:00
Adam Bookatz
60e00b25b2 [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: 5f3b94784d -s ours am: 5f1ee315ea -s ours
am skip reason: contains skip directive

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

Change-Id: Ic7e8380d78a2f1b06c97793b022f4c69f5641423
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-12-03 23:15:10 +00:00
Treehugger Robot
6b8544ba4b [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: c5f6c73e35 -s ours am: e481c7e5ef -s ours
am skip reason: contains skip directive

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

Change-Id: I0d7b3872440245d09af38eab2c6dbc0353ba13d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-12-03 23:14:59 +00:00
Adam Bookatz
546a0b6e05 [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: 0fdc0440e7 -s ours am: c68f235125 -s ours
am skip reason: contains skip directive

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

Change-Id: Ic75ead993ee434fe26794fe9cb5e03e0c2f57490
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-12-03 23:14:55 +00:00
Treehugger Robot
3153825c8e [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: a0094fdcc6 -s ours am: c454b40019 -s ours
am skip reason: contains skip directive

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

Change-Id: I31d05034a94f92c7a19a893ee5faca25d70ea0fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-12-03 23:14:44 +00:00
Adam Bookatz
8f7b4af086 [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: 226634c104 -s ours am: f06fc9edd7 -s ours
am skip reason: contains skip directive

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

Change-Id: Idb1ed51395a67955a4f15b06a1f1baf8663b6f5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-12-03 23:14:39 +00:00
Treehugger Robot
dc44f1d26c [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: f6b7dbd34f -s ours am: db4d5eb010 -s ours
am skip reason: contains skip directive

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

Change-Id: I4f1e5b965d18c67723703f621ab5987fbc657364
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-12-03 23:14:27 +00:00
Adam Bookatz
705f381d56 [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: 0fd038d3a2 -s ours am: c5cb31c0fa -s ours
am skip reason: contains skip directive

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

Change-Id: I571544598b2ef65fb29fd1e295c44bc4071652e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-12-03 23:14:23 +00:00
Treehugger Robot
1488927710 [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: 3910f63d05 -s ours am: 656bb6d927 -s ours
am skip reason: contains skip directive

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

Change-Id: I8a206f683b7a6613dbdaca0c3944c0dc71257e32
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-12-03 23:14:12 +00:00
Adam Bookatz
bed7be6261 [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: 50a9158019 -s ours am: 7ee9c00352 -s ours
am skip reason: contains skip directive

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

Change-Id: Id857c4897dcbd896d1047aa68b75e76d160d72cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-12-03 23:14:08 +00:00
Treehugger Robot
e3c301a492 [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: f619b55b25 -s ours am: ac2f435940 -s ours
am skip reason: contains skip directive

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

Change-Id: Iad87c572513eda2f7a1ba6ec3b8ff6556342f9d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-12-03 23:13:53 +00:00
Adam Bookatz
71f70da687 [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: bd3fbd5d19 -s ours am: 956fed579c -s ours
am skip reason: contains skip directive

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

Change-Id: I636d49d3e7f6520c8a20ef1a660d69197df7aef7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-12-03 23:13:49 +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
e0f038e080 [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: 4b46ccbb01 -s ours
am skip reason: contains skip directive

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

Change-Id: If3ae95173e3a277226a799c177a1af18e22bf70f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-12-03 22:26:40 +00:00
Adam Bookatz
5f1ee315ea [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: 5f3b94784d -s ours
am skip reason: contains skip directive

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

Change-Id: I6db700458189d1b1d200454df517ef62e4d0c00b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-12-03 22:26:37 +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
Treehugger Robot
e481c7e5ef [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: c5f6c73e35 -s ours
am skip reason: contains skip directive

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

Change-Id: I18962c4804de97b845d07780da27e88da6ad5d23
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-12-03 22:26:27 +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
Adam Bookatz
c68f235125 [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: 0fdc0440e7 -s ours
am skip reason: contains skip directive

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

Change-Id: Ie91a5e3644c86996f7481068412512a18b97de5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-12-03 22:26:24 +00:00
Treehugger Robot
c454b40019 [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: a0094fdcc6 -s ours
am skip reason: contains skip directive

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

Change-Id: Ic0de4b5ff95fa0ce601af91e73d82bcedab115f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-12-03 22:26:14 +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
f06fc9edd7 [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: 226634c104 -s ours
am skip reason: contains skip directive

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

Change-Id: I7047c0dd10504b48f88ef8b04cac84b28950c46d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-12-03 22:26:10 +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
db4d5eb010 [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: f6b7dbd34f -s ours
am skip reason: contains skip directive

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

Change-Id: I691986191ae35005ddc6abc91ae2f323d31da4e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-12-03 22:26:00 +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
c5cb31c0fa [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: 0fd038d3a2 -s ours
am skip reason: contains skip directive

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

Change-Id: I2a57d0ab7aaeb202d89d5b6cd34fad8804d116e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-12-03 22:25:55 +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
656bb6d927 [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: 3910f63d05 -s ours
am skip reason: contains skip directive

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

Change-Id: I8036c7ca5606e19248f1af623c9f0d478253f5e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-12-03 22:25:45 +00:00
Adam Bookatz
7ee9c00352 [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: 50a9158019 -s ours
am skip reason: contains skip directive

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

Change-Id: I39a166b5863b2e11fbd33925009fcb6f9f0c3461
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-12-03 22:25:41 +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
ac2f435940 [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: f619b55b25 -s ours
am skip reason: contains skip directive

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

Change-Id: Id517bb805cfab1d323ef55c87c3f759a862f852e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-12-03 22:25:29 +00:00
Adam Bookatz
956fed579c [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: bd3fbd5d19 -s ours
am skip reason: contains skip directive

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

Change-Id: I9ca7ffc835f6ec3053bf55c6cc010fe406541443
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-12-03 22:25:23 +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
4b46ccbb01 [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: I7cba4d7e0084d5b4cfda1aaa0cba3204141867c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-12-03 22:12:54 +00:00
Adam Bookatz
5f3b94784d [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: Iff03e82fc30728c0d4f9c746fc6371b686902529
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-12-03 22:12:50 +00:00