Julia Tuttle
7034984e19
Merge "Add FSI toggle to per-app notification settings" into udc-dev am: 28edfb8df9
am: 2474419ac8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22899254
Change-Id: I88fe8929dc6cebc76430d1d810b8714c619d94e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-17 16:33:28 +00:00
Vania Januar
2e8e1339a2
Merge "Disambiguate default notes app user from stylus settings" into udc-qpr-dev
2023-05-17 16:03:20 +00:00
Julia Tuttle
2474419ac8
Merge "Add FSI toggle to per-app notification settings" into udc-dev am: 28edfb8df9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22899254
Change-Id: I2ec0a0f37d2d25c82da35689c2c4af3efcdc7f9f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-17 15:35:26 +00:00
Julia Tuttle
35dae4aefd
Merge "Add FSI toggle to per-app notification settings" into udc-dev am: 28edfb8df9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22899254
Change-Id: Ia5524ccfb7d3eac04f5aa780494f35650824faec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-17 15:31:12 +00:00
Julia Tuttle
28edfb8df9
Merge "Add FSI toggle to per-app notification settings" into udc-dev
2023-05-17 14:48:50 +00:00
Julia Tuttle
6630c852d9
Add FSI toggle to per-app notification settings
...
Bug: 277938609
Test: atest FullScreenIntentPermissionPreferenceControllerTest
Test: # manual, verifying against "Special app access" screen
Change-Id: I9cb0d9bc99ce59a7b0ff6bcd2cab7a3c2d63f45f
2023-05-17 14:30:49 +00:00
Zoey Chen
dfe8a48cab
Merge "[Regional Preference] Set numbering system when select it" into udc-dev am: 74ab90bb53
am: 9752a7be52
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23258700
Change-Id: Ie95a9350cc910aba431e4803b16f063fc32ac8fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-17 11:21:05 +00:00
Zoey Chen
9752a7be52
Merge "[Regional Preference] Set numbering system when select it" into udc-dev am: 74ab90bb53
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23258700
Change-Id: I5d3cda5ac33f624a54ae3c1535575c7b56793e62
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-17 10:43:04 +00:00
Zoey Chen
3ea5aa92d8
Merge "[Regional Preference] Set numbering system when select it" into udc-dev am: 74ab90bb53
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23258700
Change-Id: I359dba215d9ea74e39b528e041c34a2a90d18d05
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-17 10:38:45 +00:00
Zoey Chen
74ab90bb53
Merge "[Regional Preference] Set numbering system when select it" into udc-dev
2023-05-17 09:44:45 +00:00
Zoey Chen
14c81c17ce
[Regional Preference] Set numbering system when select it
...
Should not return original locale, return the locale which is set unicodeLocaleKeyword instead
Bug: 282879594
Bug: 283036197
Test: atest NumberingSystemItemControllerTest
Change-Id: Ic572f20175ea0428be98f30fe865d826b61dcca6
2023-05-17 05:47:53 +00:00
Yanli Wan
98c03bb946
Merge "Start activity from Device Lock APEX if device is provisioned by Device Lock" into udc-dev am: f5ce620937
am: 433d934b89
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23087508
Change-Id: I96a6dfc9fa2697965d3fb1eb1187645283b31fdd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-17 00:21:51 +00:00
Yanli Wan
29a97efcf9
Merge "Start activity from Device Lock APEX if device is provisioned by Device Lock" into udc-dev am: f5ce620937
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23087508
Change-Id: I4e11dc29b4e12e42de3cb55452902224a771c3f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-17 00:19:01 +00:00
Yanli Wan
433d934b89
Merge "Start activity from Device Lock APEX if device is provisioned by Device Lock" into udc-dev am: f5ce620937
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23087508
Change-Id: I05e673c9f6e1db8aabef3a66e9f8c569e96e5850
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-16 23:57:53 +00:00
Yanli Wan
f5ce620937
Merge "Start activity from Device Lock APEX if device is provisioned by Device Lock" into udc-dev
2023-05-16 23:47:46 +00:00
Yuxin Hu
f28b2b4b83
Merge "Toggle switch back when user dismisses dialog by tapping screen" into udc-dev am: 174bd2ab74
am: 0b7a88282d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23220112
Change-Id: Iaa26c0dc435ab9b6f32daa9ce49f88234f349162
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-16 20:08:07 +00:00
Yuxin Hu
9fcd85c5f8
Merge "Toggle switch back when user dismisses dialog by tapping screen" into udc-dev am: 174bd2ab74
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23220112
Change-Id: I6fcae10eabb687454e4611cd29087917c781048e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-16 19:05:13 +00:00
Yuxin Hu
0b7a88282d
Merge "Toggle switch back when user dismisses dialog by tapping screen" into udc-dev am: 174bd2ab74
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23220112
Change-Id: I211c5ae0aa764a885957573622af13be0e288206
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-16 19:04:08 +00:00
Yuxin Hu
174bd2ab74
Merge "Toggle switch back when user dismisses dialog by tapping screen" into udc-dev
2023-05-16 18:24:14 +00:00
Yanli Wan
ad151bf1e7
Start activity from Device Lock APEX if device is provisioned by Device
...
Lock
Bug: 279616148
Test: atest DeviceLockPreferenceControllerTest
Test: Build & test locally
Change-Id: Ieb2ea691136749d034bceb9412744af874d6abb9
2023-05-16 17:03:45 +00:00
Vania Januar
64d64fdd36
Disambiguate default notes app user from stylus settings
...
Users can now select between work or personal notes app to be the app
that opens when the stylus tail button is pressed via a dialog.
Bug: 278555728
Test: StylusDevicesControllerTest
Change-Id: I9c63de6f11deb357b0497c7b972d4ac19b876e1f
2023-05-16 15:57:09 +01:00
Treehugger Robot
218e3151c1
Merge "Limit the optimization mode restore mechanism for specific conditions" into udc-dev am: b2de62c076
am: 87a35ffae5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23241740
Change-Id: I304e73c7cae7c5669694296002916a5601c8b4a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-16 12:25:51 +00:00
Treehugger Robot
1c49e15945
Merge "Limit the optimization mode restore mechanism for specific conditions" into udc-dev am: b2de62c076
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23241740
Change-Id: I6c31dcf53c8a8586028fa5c3cb350c7c947b95b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-16 12:23:14 +00:00
Treehugger Robot
87a35ffae5
Merge "Limit the optimization mode restore mechanism for specific conditions" into udc-dev am: b2de62c076
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23241740
Change-Id: I7515931a772d74ed2bc7f6ab596cad727ebb68c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-16 12:18:56 +00:00
Treehugger Robot
b2de62c076
Merge "Limit the optimization mode restore mechanism for specific conditions" into udc-dev
2023-05-16 11:54:24 +00:00
ykhung
24cbb2c0aa
Limit the optimization mode restore mechanism for specific conditions
...
Limit the app optimization mode restore mechanism is enabled by checking
the isValidToRestoreOptimizationMode() method (default false)
Bug: 280192659
Test: make test RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.fuelgauge.BatteryBackupHelperTest
Change-Id: I90a438a15905578336bc46ec7cd92d3bbe2858b7
2023-05-16 18:40:11 +08:00
YK Hung
784bfcaade
Merge "Add device build information in the backup stage" into udc-dev am: 1d818600a4
am: fad17f0db9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23240826
Change-Id: Ia0e507092addf835e4c931ddd4b01820a313dc00
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-16 06:44:50 +00:00
YK Hung
5956d38f7a
Merge "Add device build information in the backup stage" into udc-dev am: 1d818600a4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23240826
Change-Id: I3773d5d5cd20f2527e32d389479dc798fb86b2ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-16 06:22:36 +00:00
YK Hung
fad17f0db9
Merge "Add device build information in the backup stage" into udc-dev am: 1d818600a4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23240826
Change-Id: I3c91272947fa868bb2ae858115bf0af6440b2b97
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-16 06:06:17 +00:00
YK Hung
1d818600a4
Merge "Add device build information in the backup stage" into udc-dev
2023-05-16 06:03:41 +00:00
TreeHugger Robot
fea14cdaa0
Merge "[Use] Replace settings LocalePreference with androidx LocalePreference" into udc-dev am: ab32753382
am: e51a854b93
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23232981
Change-Id: If0e90b392097e3c3681e62bac0d392bea5f328ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-16 05:00:49 +00:00
TreeHugger Robot
5b26562be8
Merge "[Use] Replace settings LocalePreference with androidx LocalePreference" into udc-dev am: ab32753382
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23232981
Change-Id: Ibf6c8620cbb7eccbeb3df3db47c02782c9a36c1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-16 04:37:03 +00:00
TreeHugger Robot
e51a854b93
Merge "[Use] Replace settings LocalePreference with androidx LocalePreference" into udc-dev am: ab32753382
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23232981
Change-Id: I9ba8cd5db9fbcdbee5e4a9a44c278c13bbe89930
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-16 04:32:37 +00:00
TreeHugger Robot
ab32753382
Merge "[Use] Replace settings LocalePreference with androidx LocalePreference" into udc-dev
2023-05-16 03:51:45 +00:00
ykhung
cad41681d6
Add device build information in the backup stage
...
Insert the device build information in the battery optimization mode
backup stage, such that we can use it to decide whether we should
restore the data in the targeted device or not
Bug: 192523697
Test: make test RunSettingsRoboTests
ROBOTEST_FILTER=com.android.settings.fuelgauge.*
Change-Id: I3ab76e013ea9aca4d336a62e0c7cb6882c5b5085
2023-05-16 11:07:31 +08:00
Yuxin Hu
2cbb587f81
Toggle switch back when user dismisses dialog by tapping screen
...
The reboot dialog can be dismissed when user:
1) Clicks any button on the reboot dialog
2) Taps any screen area outside of reboot dialog
We want to toggle back the "Enable ANGLE" switch
whenever the user chooses to not reboot the device
immetiately.
This change adds the function to toggle the
"Enable ANGLE" switch back when:
1) User clicks "Cancel" on reboot dialog.
2) User taps screen area outside of reboot dialog
to dismiss the reboot dialog.
Bug: b/270994705
Test: m; flash and device can boot.
atest -c GraphicsDriverEnableAngleAsSystemDriverControllerJUnitTest
Change-Id: I84fde5ea5bae9d8793bcef30f4c37d832152ae43
2023-05-16 01:58:25 +00:00
TreeHugger Robot
8d01fc110b
Merge "Fix FaceUpdater.enroll unit test fail in aosp" into udc-dev am: 92e760861d
am: c59fbb1d28
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23155080
Change-Id: I0d7a7380fc36fb1870b8931fcc64616ec9d7fe56
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-16 01:21:45 +00:00
TreeHugger Robot
e12013a755
Merge "Fix FaceUpdater.enroll unit test fail in aosp" into udc-dev am: 92e760861d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23155080
Change-Id: I0d76d4228b2ff45202fc428626c0677d87176aec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-16 00:41:13 +00:00
TreeHugger Robot
c59fbb1d28
Merge "Fix FaceUpdater.enroll unit test fail in aosp" into udc-dev am: 92e760861d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23155080
Change-Id: Ie1f2632f9e3a6825b856555e3aadd8cd81bbcd90
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-16 00:40:48 +00:00
TreeHugger Robot
92e760861d
Merge "Fix FaceUpdater.enroll unit test fail in aosp" into udc-dev
2023-05-15 23:56:06 +00:00
Behnam Heydarshahi
f07e023302
Remove volume_separate_notification flag
...
Fully enable the feature
Bug: b/255363741, b/38477228
Test: make DEBUG_ROBOLECTRIC=1 ROBOTEST_FILTER="NotificationVolumePreferenceControllerTest|SeparateRingVolumePreferenceControllerTest|RingerModeAffectedPreferenceControllerTest|SoundSettingsTest" RunSettingsRoboTests -j40
Change-Id: Iec490fc254f71b6461dbf9f9beb4a11645a4a497
2023-05-15 21:19:26 +00:00
ykhung
41e31530cf
Remove useless optimization mode backup for FULL_POWER_LIST am: 2c125d29a3
am: 7a343c34d9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23240822
Change-Id: I2677dea8712a8dbe39521d709c50137fe567e4cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-15 18:15:43 +00:00
ykhung
7a343c34d9
Remove useless optimization mode backup for FULL_POWER_LIST am: 2c125d29a3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23240822
Change-Id: I5e0eefdb421970cc0c405666db0e8b629e2423e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-15 17:36:41 +00:00
ykhung
852e9908ad
Remove useless optimization mode backup for FULL_POWER_LIST am: 2c125d29a3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23240822
Change-Id: I3b954248d7edcdb0f3b909ccdc3e2c64c2b1ff04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-15 17:35:49 +00:00
ykhung
2c125d29a3
Remove useless optimization mode backup for FULL_POWER_LIST
...
Remove the useless backup for the FULL_POWER_LIST, since we will not use
it to restore data, only backup the optimization_mode_list is enough
Test: presubmit
Bug: 192523697
Change-Id: I95f1f41732b8aff090e8b722896d153f6181a6ac
2023-05-15 23:45:16 +08:00
ykhung
55ef64a3c8
Disable the optimization mode preference if the app is not settable am: 5cd3a7298e
am: d056edc15c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23235859
Change-Id: I2520f65c4290bbb113bca305e7f84eb0844e3da4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-15 13:21:25 +00:00
ykhung
d056edc15c
Disable the optimization mode preference if the app is not settable am: 5cd3a7298e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23235859
Change-Id: I9d81ec00c5f5df7771f28f6bdc4775b7fdba987e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-15 12:43:08 +00:00
ykhung
094281617f
Disable the optimization mode preference if the app is not settable am: 5cd3a7298e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23235859
Change-Id: Ic7eb5e46f65c782b0f8922464a126f39c31dd3fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-15 12:39:04 +00:00
ykhung
5cd3a7298e
Disable the optimization mode preference if the app is not settable
...
https://screenshot.googleplex.com/BbQyEv6YCjPVwUF (allowlist)
https://screenshot.googleplex.com/3hTb8TQwGMQqcwS
https://screenshot.googleplex.com/6hdTAT2yNFucD9N (system app)
https://screenshot.googleplex.com/77T5JyAD5nZJpDT (normal app)
Fix: 281566984
Test: make test RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.fuelgauge.*
Change-Id: If7aa4b61bc806daa570187da24b7f454cd069dec
2023-05-15 09:32:09 +00:00
Treehugger Robot
9cb3635c45
Merge "Add allowlist mechanism for battery optimization mode" into udc-dev am: 2b91f1a4cb
am: 14ebb061bc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23216878
Change-Id: I87f6c1ccb62fb8a36260c812ab59e71a39532c07
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-15 08:51:54 +00:00