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

145181 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Magno
8839335d58 Customize the availability of Testing Settings Menu 
Add the possibility to disable the Testing Settings Menu
(secret code *#*#4636#*#*) on user builds.

Bug: 306338055
Test: atest TestingSettingsBroadcastReceiverTest
Flag: NA
No-Typo-Check: trivial
Change-Id: I451f094864bd9a0ad8086e9646e2d666ab2388dc
 2024-12-04 11:23:25 +00:00
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
Treehugger Robot
aa7fd384d9 Merge "Fix crash due to resource not found." into main 2024-12-04 08:02:41 +00:00
SongFerng Wang
2950121243 Merge "Skip the notification when the userId is not main" into main 2024-12-04 07:06:55 +00:00
Lorenzo Lucena Maguire
56e536f4d9 Merge changes from topic "DoubleTapPowerButtonGestureSystemSettings" into main 
* changes:
  Create Double Tap Power Illustrations based on target action
  Support wallet launch in Double Tap Power Gesture Settings
  Rename Double Tap Power To Open Camera Gesture Xml
  Refactor DoubleTapPowerPreferenceController
  Create Double Tap Power For Wallet Launch Preference Controller
  Create Double Tap Power Gesture For Camera Preference Controller
  Create Double Tap Power Gesture Main Switch Preference Controller
  Create DoubleTapPowerSettingsUtils
 2024-12-04 06:19:12 +00:00
tomhsu
f0e06b6cab Fix crash due to resource not found. 
Flag: EXEMPT bug fix
Fix: b/382071330
Test: atest pass.
Change-Id: I18ddeea7a9d077444838f39b07ffb2ebc5eb974d
 2024-12-04 05:47:42 +00: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
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
Daniel Norman
5862b31f21 Updates A11y Shortcut animations to not loop in code. 
Continuously repeated animations go against accessibility guidelines
to avoid unstoppable motion.

The animation files themselves have been updated to loop twice
so that the user can still see the animation temporarily.
The loop restarts if the user exits and enters the page again.

Bug: 370661517
Flag: EXEMPT minor bugfix with resource changes
Test: Manually observe animations
Change-Id: I52348a094680ef345bf8c2b12ab91c9406bf5cb4
 2024-12-04 00:14:09 +00:00
Lorenzo Lucena Maguire
18d0d26395 Create Double Tap Power Illustrations based on target action 
Creates illustration for when double tap power gesture is set to open
wallet and preference controller to alternate illustration based on gesture
target action

Android Settings Feature Request: b/380287172

Test: atest DoubleTapPowerIllustrationPreferenceControllerTest
Test: manually verified illustration corresponds to selected target
action
Bug: 381789181
FLAG: android.service.quickaccesswallet.launch_wallet_option_on_power_double_tap

Change-Id: Id73a38e09bd72856d46d74f04c0c0d2b3f989929
 2024-12-03 23:44:22 +00:00
Lorenzo Lucena Maguire
d3af193384 Support wallet launch in Double Tap Power Gesture Settings 
Modify Double Tap Power Gesture Settings screen to be able to set the
gesture to launch the wallet.

If the feature flag is disabled, the
Double Tap Power Gesture Settings screen defaults to the current
screen ("Quickly open camera"), which only provides the option to open the camera upon detecting the
gesture.

If the feature flag is enabled, the Double Tap Power Gesture Settings
screen defaults to the new "Double Tap Power Button" screen, which
provides the option to open the camera, the wallet, or neither upon
detecting the gesture.

Android Settings Feature Request: b/380287172

Bug: 378131008
Test: manual tested screen alternates based on feature flag
Test: atest DoubleTapPowerSettingsTest
Test: atest DoubleTapPowerPreferenceControllerTest
Test: atest DoubleTapPowerToOpenCameraPreferenceControllerTest
FLAG: android.service.quickaccesswallet.launch_wallet_option_on_power_double_tap

Change-Id: I1fc05ab3cfee2e86a80a1756655c368aae16747c
 2024-12-03 23:44:22 +00:00
Lorenzo Lucena Maguire
406a01dfab Rename Double Tap Power To Open Camera Gesture Xml 
Rename double_tap_power_settings.xml to
double_tap_power_to_open_camera_settings.xml

Android Settings Feature Request: b/380287172

Bug: 381554683
Test: atest DoubleTapPowerSettingsTest
Flag: android.service.quickaccesswallet.launch_wallet_option_on_power_double_tap
Change-Id: I6ff3c0384602a5f0eeeafcc560e7854af8480f99
 2024-12-03 23:44:22 +00:00
Lorenzo Lucena Maguire
75536b091f Refactor DoubleTapPowerPreferenceController 
DoubleTapPreferenceController was previously used as the controller for
the "Quickly open camera" entry in the "System > Gestures"  screen and as the controller for
the toggle in the ["System > Gestures > Quickly open camera" screen.

This CL separates the DoubleTapPowerPreferenceController into two new
controllers to handle each case:
- Double Tap Power Preference Controller to control the "Quickly open camera" entry
- Double Tap Power To Open Camera Preference Controller to control the
  gesture's enable/disable toggle.

Android Settings Feature Request: b/380287172

Bug: 381499912
Test: atest DoubleTapPowerPreferenceControllerTest
Test: atest DoubleTapPowerToOpenCameraPreferenceControllerTest
FLAG: android.service.quickaccesswallet.launch_wallet_option_on_power_double_tap
Change-Id: I73fc7d97e1e330163858a60a4ba9a63bd9b5574f
 2024-12-03 23:44:22 +00:00
Lorenzo Lucena Maguire
235556daeb Create Double Tap Power For Wallet Launch Preference Controller 
Create preference controller for radio button to select wallet launch as
target action for Double Tap Power Button gesture.

Android Settings Feature Request: b/380287172

Bug: 379308160
Test: atest DoubleTapPowerForWalletLaunchPreferenceControllerTest
FLAG: android.service.quickaccesswallet.launch_wallet_option_on_power_double_tap
Change-Id: Ib1629996401ea88aeec2831a55fdc9f2ad9dcd5e
 2024-12-03 23:44:22 +00:00
Lorenzo Lucena Maguire
7e6e2b81c2 Create Double Tap Power Gesture For Camera Preference Controller 
Create Preference controller to select camera launch as a target action
for the Double Tap Power Button gesture.

Android Settings Feature Request: b/380287172

Bug: 379309894
Test: atest DoubleTapPowerForCameraLaunchPreferenceControllerTest
FLAG: android.service.quickaccesswallet.launch_wallet_option_on_power_double_tap
Change-Id: I3b6b90177293066b04f9f4eb0139f8ac3b3812b0
 2024-12-03 23:44:22 +00:00
Lorenzo Lucena Maguire
260f37f849 Create Double Tap Power Gesture Main Switch Preference Controller 
Create Preference controller for main switch to enable/disable double
tap power gesture

Android Settings Feature Request: b/380287172

Bug: 378131071
Test: atest DoubleTapPowerMainSwitchPreferenceControllerTest
FLAG: android.service.quickaccesswallet.launch_wallet_option_on_power_double_tap
Change-Id: I6205805768d917521b7d9c8ff074678ef5c36a46
 2024-12-03 23:44:22 +00:00
Lorenzo Lucena Maguire
c09909489f Create DoubleTapPowerSettingsUtils 
Create Utils class to store common methods used by Preference
controllers

Android Settings Feature Request: b/380287172

Bug: 378130789
Test: atest DoubleTapPowerSettingsUtilsTest
FLAG: android.service.quickaccesswallet.launch_wallet_option_on_power_double_tap
Change-Id: I0bd47579bd3c8163e2e48ac572577c72f2aab785
 2024-12-03 23:44:22 +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