Julia Tuttle
e7eb3ab983
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: I8d705d71901d00877f9b51faebf7810a18aa20e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-17 16:37:32 +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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
2150660ddc
Merge "Add allowlist mechanism for battery optimization mode" into udc-dev am: 2b91f1a4cb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23216878
Change-Id: Id149ac65a51676e1622a023ab3159ea2c0ecc731
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-15 08:31:04 +00:00
Treehugger Robot
2b91f1a4cb
Merge "Add allowlist mechanism for battery optimization mode" into udc-dev
2023-05-15 07:43:05 +00:00
Zoey Chen
0d1638c3d3
[Use] Replace settings LocalePreference with androidx LocalePreference
...
Bug: 263861083
Test: atest and manual test
Change-Id: I7af48074278df0b12c83500f0d2b61eb279e70be
2023-05-15 07:28:05 +00:00
ykhung
0cd24adec5
Add allowlist mechanism for battery optimization mode
...
Add a mechanism to add package name into the allowlist to avoid users
change the battery optimization modes for specific apps in the list
https://screenshot.googleplex.com/8hrHCcTh5bNYXqp
Bug: 281566984
Test: make test RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.fuelgauge.*
Change-Id: I8efa6a55646d761f5bee3667a59b38ab68c74bc1
2023-05-15 14:28:49 +08:00
YK Hung
a8830ef203
Merge "Update battery health state intent (2/3)" into udc-dev am: 83de631175
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22741222
Change-Id: Idc66a34c67b4ae570a6167c0704a25303a2629dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-15 03:42:48 +00:00
YK Hung
83de631175
Merge "Update battery health state intent (2/3)" into udc-dev
2023-05-15 03:27:44 +00:00
Milton Wu
abfb8a5e9d
Fix FaceUpdater.enroll unit test fail in aosp
...
Ignore related tests
Bug: 281627891
Test: atest FaceUpdaterTest
Change-Id: I028a7dd7fd2e56889ac27051678ca954c896da20
2023-05-14 02:57:05 +00:00
Peter Zhang
60069d3039
Merge "Add logging when a group tile with PreferenceCategory widget is added to the screen" into udc-d1-dev
2023-05-12 16:22:38 +00:00
Peter Zhang
04545138c7
Merge "Add the support of preference group / category to the Settings Tile API" into udc-d1-dev
2023-05-12 16:09:34 +00:00
Jason Hsu
782ad66ab1
Merge "Move 'Audio Output' to Accessibility hearing device page" into udc-dev am: 181cfa3aa5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157344
Change-Id: I1abbb60af43135718426d349427738d95808ff50
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-12 14:23:10 +00:00
Jason Hsu
181cfa3aa5
Merge "Move 'Audio Output' to Accessibility hearing device page" into udc-dev
2023-05-12 14:20:23 +00:00
Treehugger Robot
a823380436
Merge "Update battery settings remaining time format" into udc-dev am: e99f757f60
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23199829
Change-Id: I78e897de5a2198f21de61422b88adbc4cf7aa34b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-12 12:43:30 +00:00
Peter Zhang
f6a267bd36
Add logging when a group tile with PreferenceCategory widget is added to
...
the screen
Test: robotest, manual
Bug: 281517110
Change-Id: I4de1938bdeea003c70e5c554e988a97b762f7f81
2023-05-12 14:41:32 +02:00
Peter Zhang
baeca6fb53
Add the support of preference group / category to the Settings Tile API
...
Test: robotest, manual
Bug: 281517110
Change-Id: Ie36b0b3eb8ed80766efa050f1f0aee1f784a5949
2023-05-12 14:40:41 +02:00
Treehugger Robot
e99f757f60
Merge "Update battery settings remaining time format" into udc-dev
2023-05-12 12:29:14 +00:00
Peter Zhang
5b81bbfd02
Merge "Render an additional icon to the tappable tiles with pending intents" into udc-d1-dev
2023-05-12 12:12:21 +00:00
Peter Zhang
15a11c4123
Merge "Expand SettingsLib ProviderTile to support non-switch type of Preferences" into udc-d1-dev
2023-05-12 12:08:00 +00:00
Oli Thompson
787a054c93
Merge "Update Work profile settings" into udc-dev
2023-05-12 11:05:57 +00:00
Wesley Wang
77deb463a0
Update battery settings remaining time format
...
- Update the remaining time format to align with status bar
- Remove unused test case since no more less than 7 or 15 remaining time
case for battery settings
screenshots:
https://screenshot.googleplex.com/8jPYPj7yznGFU4b.png
https://screenshot.googleplex.com/5GYXA2tusSUVmVQ.png
https://screenshot.googleplex.com/3EnB3ejAxAzP28q.png
https://screenshot.googleplex.com/5jeUxwBEyHotf9d.png
Bug: 281685505
Test: make SettingsLibRoboTests
Change-Id: If33e1828582845f78d8ef666c2b74ab5bba22357
2023-05-12 11:05:05 +00:00
jasonwshsu
212470d0a6
Move 'Audio Output' to Accessibility hearing device page
...
* Extract the common part into HearingAidHelper.
* Remove abstract getHearingDevice(). Change to get the hearing device when needed.
* Move several classes from Bluetooth into Accessibility
Bug: 281783079
Test: make RunSettingsRoboTests ROBOTEST_FILTER="(HearingDeviceAudioRoutingBasePreferenceControllerTest|AccessibilityHearingAidPreferenceControllerTest|HearingAidHelperTest|HearingAidAudioRoutingPreferenceControllerTest|HearingDeviceCallRoutingPreferenceControllerTest)"
Change-Id: I79049107409b7086c6dcc8d48a6323e171ed1535
2023-05-12 13:46:53 +08:00
Tom Hsu
0af8c60342
Merge "[Settings] Avoid to unregister wrong observer" into udc-dev
2023-05-12 05:16:28 +00:00