Treehugger Robot
f81b9cd75a
Merge "Fix text color contrast issue on Caption size and style screen" into main
2024-01-13 05:13:20 +00:00
Chun-Ku Lin
0552c18287
Fix text color contrast issue on Caption size and style screen
...
Use the same textAppearance as the one defined in
preset_picker_item.xml, which is used by the Edge type dialog on the
same screen and doesn't have text color contrast issue.
Bug: 319742556
Flag: EXEMPT (simple bug fix)
Test: Manually by using Accessibility Scanner
Change-Id: If078ce1daf8ba0b3cb6ffef860ff39e995d7446a
2024-01-12 23:32:52 +00:00
Hakjun Choi
6a29eb7b15
Merge "Filter out satellite plmn when in SAT mode" into main
2024-01-12 22:11:48 +00:00
Pawan Wagh
2d284d98bb
Merge changes from topic "16k_dev_ui" into main am: 052a1658e4
am: 7b96c4e57b
am: 2d70fb39af
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2775987
Change-Id: I003f73b3e398f536e6afaaf93e2adb9da11fa7ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-01-12 21:34:02 +00:00
Pawan Wagh
7516944287
Show progress bar till the applyPayload returns am: 9be05afc88
am: 0aebae8d79
am: 7dcfe67cae
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2766345
Change-Id: I4433a73f30d21629558b18716e7972acc4e46d5a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-01-12 21:33:55 +00:00
Pawan Wagh
8a1cebc72a
Call update engine to apply payload am: 008842edeb
am: d2110a76a7
am: ba35fbc238
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2756951
Change-Id: I4efedc488fdf5f73ead41781ebf3d4eb33f0b78b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-01-12 21:33:49 +00:00
Pawan Wagh
7e2249a7dd
Developer option for booting with 16K pages am: 8996ca9768
am: acd2de2533
am: 8e5eff37a9
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2705817
Change-Id: Icaca8a91a01be73cdda9d61e2a2fbb6c82534a47
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-01-12 21:33:41 +00:00
Bill Yi
8ed3172ea5
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: acdbb25cd7
-s ours am: aa1f04042b
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25869875
Change-Id: Ic4989b70be4924c251e6670e13457cbeab1758a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-01-12 21:25:48 +00:00
Pawan Wagh
2d70fb39af
Merge changes from topic "16k_dev_ui" into main am: 052a1658e4
am: 7b96c4e57b
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2775987
Change-Id: I0dd9f6b90752512b0b74a9d2222d188665fb1e4f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-01-12 21:25:10 +00:00
Pawan Wagh
7dcfe67cae
Show progress bar till the applyPayload returns am: 9be05afc88
am: 0aebae8d79
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2766345
Change-Id: Ibaf92a15e52ad5e7f1834210196c94d521ad90d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-01-12 21:25:06 +00:00
Pawan Wagh
ba35fbc238
Call update engine to apply payload am: 008842edeb
am: d2110a76a7
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2756951
Change-Id: I2e0013a3f62fa945005f6ceaf2ff3ca184c2ba8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-01-12 21:25:02 +00:00
Pawan Wagh
8e5eff37a9
Developer option for booting with 16K pages am: 8996ca9768
am: acd2de2533
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2705817
Change-Id: I8882b9feb7b34567de5f8a65d8932dac42446529
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-01-12 21:24:56 +00:00
Bill Yi
e84b7a4306
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9a5a8054b8
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25869874
Change-Id: I3ecccec7f15bf0dffbac919f1b2d76b0b0cc62bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-01-12 20:23:00 +00:00
Treehugger Robot
50e4741b60
Merge "Add auto lock preference inside private space settings" into main
2024-01-12 20:17:59 +00:00
Bill Yi
aa1f04042b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: acdbb25cd7
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25869875
Change-Id: Iabc4018006534088dafb0c09a955f5226cb39e29
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-01-12 20:12:51 +00:00
Bill Yi
4df36e6583
Merge "Import translations. DO NOT MERGE ANYWHERE" into main
2024-01-12 20:12:50 +00:00
Pawan Wagh
7b96c4e57b
Merge changes from topic "16k_dev_ui" into main am: 052a1658e4
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2775987
Change-Id: I2d074f6bd19c6957659b018af8736c076b95047b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-01-12 19:51:17 +00:00
Pawan Wagh
0aebae8d79
Show progress bar till the applyPayload returns am: 9be05afc88
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2766345
Change-Id: I713b313d751c063cea3835c7396859f40a61645d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-01-12 19:51:13 +00:00
Pawan Wagh
d2110a76a7
Call update engine to apply payload am: 008842edeb
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2756951
Change-Id: I21c7ec553c2a9276df3f9b352ad3f106f816a3bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-01-12 19:51:09 +00:00
Pawan Wagh
acd2de2533
Developer option for booting with 16K pages am: 8996ca9768
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2705817
Change-Id: I28136f884536a8bbf5aa10cd04ab597595e9f223
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-01-12 19:51:02 +00:00
Pawan Wagh
052a1658e4
Merge changes from topic "16k_dev_ui" into main
...
* changes:
Publish update info via SystemUpdateManager
Show progress bar till the applyPayload returns
Call update engine to apply payload
Developer option for booting with 16K pages
2024-01-12 19:42:36 +00:00
josephpv
099ae32943
Add auto lock preference inside private space settings
...
This includes below changes
- Adds perference for Auto Lock settings inside private space settings page.
- Feaure is behind flag
android.multiuser.support_autolock_for_private_space
Screenshots:
go/ss/ZCaYGWMDdH8bQNz.png
go/ss/AxnD8DviiT5hhkW.png
go/ss/9TMYmacyiVhyexB.png
go/ss/6SzhkGfTbDYVUVE.png
Bug: 312893140
Test: atest AutoLockPreferenceControllerTest, atest AutoLockPreferenceControllerTest
Change-Id: I95beb9d71c709002e17307e612c60b2f5087290b
2024-01-12 19:12:30 +00:00
Chris Antol
5245ebfd4a
Merge "Prevent the disabling of specified apps" into main
2024-01-12 18:54:58 +00:00
Pawan Wagh
905b78e4a5
Publish update info via SystemUpdateManager
...
When 16K OTA is applied, this info would need to be published
to a SystemUpdateManager so that we don't clobber the updates with
other pending updates. Similarly, Fetch the pending update info from
SystemUpdateManager before applying update.
Test: m Settings && adb install -r $ANDROID_PRODUCT_OUT/system_ext/priv-app/Settings/Settings.apk
Bug: 302391134
Bug: 295035851
Change-Id: I4998122942d7f2defd69bc34474230c8aea3c25a
2024-01-12 17:33:56 +00:00
Becca Hughes
42bcdcfdfd
Merge "Make provider icon sizes consistent" into main
2024-01-12 17:23:03 +00:00
Pawan Wagh
9be05afc88
Show progress bar till the applyPayload returns
...
Displaying a progress bar till the applyPayload from update_engine
returns.
Test: m Settings && adb install -r $ANDROID_PRODUCT_OUT/system_ext/priv-app/Settings/Settings.apk
Bug: 295035851
Bug: 298214075
Change-Id: Ic8cf4df700505e7f10185ee0f08225411c6621e5
2024-01-12 17:14:03 +00:00
Pawan Wagh
008842edeb
Call update engine to apply payload
...
Calling update engine to apply payload provided from boot_otas and
reboot on success. Updating different dialogues for 4k prompt.
Test: m Settings && adb install -r $ANDROID_PRODUCT_OUT/system_ext/priv-app/Settings/Settings.apk
Test: make RunSettingsRoboTests ROBOTEST_FILTER=Enable16kPagesPreferenceControllerTest
Bug: 295573133
Change-Id: Iab90a2c2fae5f6aefce95b2306db91c7b056d9f7
2024-01-12 17:13:31 +00:00
Pawan Wagh
8996ca9768
Developer option for booting with 16K pages
...
Adding developer option to boot with 16K compatible kernel. Adding
resources, layouts and dialog classes for 16k option. This needs
to integrated with update engine to make OTA switch happen.
Test: m Settings && adb install -r $ANDROID_PRODUCT_OUT/system_ext/priv-app/Settings/Settings.apk
Bug: 295035851
Bug: 294614538
Change-Id: I3a24fed059eee99407e3486a7254285e0e4a251c
2024-01-12 16:51:16 +00:00
Becca Hughes
7dca691308
Make provider icon sizes consistent
...
Fixes an issue where the icons under "additional providers"
are not the same size. Also, fixes the unit tests for
CredentialManagerPreferenceController.
https://hsv.googleplex.com/4797855484084224
Test: unit tests and manual on device tests
Bug: 278772478
Change-Id: I88d8694189a7529ccc2d92bf1b74bb5bf2268f46
2024-01-12 16:19:47 +00:00
Fan Wu
6f20548c55
Merge "Remove unnecessary custom shadow of android.system.Os" into main
2024-01-12 10:48:14 +00:00
Nikhil Kumar
87f5264823
Merge "Toast warning message when non-admin user tries to open dev options." into main
2024-01-12 10:43:32 +00:00
Edgar Wang
07ea6d6e21
Merge "Update Personal dictionary layout to fix A11y issue" into main
2024-01-12 10:23:46 +00:00
Mark Kim
f47bc45a3b
Merge "Show restoring toast message only after Play Store responded successfully" into main
2024-01-12 09:00:46 +00:00
Fan Wu
23d57e8c8a
Remove unnecessary custom shadow of android.system.Os
...
Bug: 319052511
Test: atest SettingsRoboTests
Change-Id: Ie551e6f3b3884a505f60acc5874b439010d43533
2024-01-12 07:52:21 +00:00
Yiyi Shen
10fa20446c
Merge "[Audiosharing] Update the volume control registration flow." into main
2024-01-12 07:47:54 +00:00
SongFerng Wang
45ea69c925
Merge "Add the String of dual sim onboarding" into main
2024-01-12 07:01:50 +00:00
Fan Wu
2db3415b2e
Merge "Update ShadowContentResolver to extend from the official shadow package. Also removes redundant API" into main
2024-01-12 07:01:24 +00:00
Yiyi Shen
389ab6a6ef
[Audiosharing] Update the volume control registration flow.
...
Based on the framework API redesign, we will start/stop the volume control callback registration when user enter/leave the volume control page.
We will temporarily keep a map of the device to volume map and use the
volume value to set the initial state of the volume progress bar if it is valid.
If the volume value is null or invalid, we will read the music stream
volume from the audio manager to set the initial state.
Test: manual
Bug: 305620450
Change-Id: Iee3fba39af388782ac3498cb1610b248ced22c3c
2024-01-12 06:35:24 +00:00
Mark Kim
043c06fabd
Show restoring toast message only after Play Store responded
...
successfully
Test: n/a
Bug: 317130255
Change-Id: I4250689f761c86655861c0d04cd1d67e4407c5e3
2024-01-12 05:36:05 +00:00
SongFerngWang
0a7fb7fec3
Add the String of dual sim onboarding
...
Bug: 318310357
Bug: 298898436
Bug: 298891941
Test: Build pass
Change-Id: I0096c4238b3aab199b553775ae4812240b4bde87
2024-01-12 13:18:31 +08:00
Treehugger Robot
baa3893b0e
Merge "Update shadow class method name" into main
2024-01-12 04:25:44 +00:00
Mark Kim
ee1491c811
Merge "Get and save app label before archiving the app" into main
2024-01-12 04:12:29 +00:00
Fan Wu
48bb9fe8e2
Update ShadowContentResolver to extend from the official shadow package. Also removes redundant API
...
Bug: 319052511
Test: atest SettingsRoboTests
Change-Id: I88ccbb5ca8c239f42c8bc6bb3a875bb4c503bdc9
2024-01-12 11:40:16 +08:00
Bill Yi
acdbb25cd7
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: If73569771424eaeb9341c61542af25645b96c4d7
2024-01-11 19:00:07 -08:00
Bill Yi
e98378f080
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Id0ec173803e3ca774d9eec5874bcbba2f3bba8dd
2024-01-11 18:58:21 -08:00
Bill Yi
9a5a8054b8
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I1e7abc10279e262f9e8faac753cf3cdf0ae46d91
2024-01-11 18:54:53 -08:00
Zhen Zhang
bd9f09003e
Update shadow class method name
...
The method name was updated in ag/25864369
Bug: 302296979
Test: atest SettingsRoboTests
Change-Id: Ib3fa0f6e36135831e2ece6e483f3a8c089ffc076
2024-01-11 15:27:04 -06:00
Nikhil Kumar
1a115d3ea0
Toast warning message when non-admin user tries to open dev options.
...
Developer Settings are only accessible for the Admin users. Added a new toast warning message to be displayed when a non-admin user tries to open the Developer options.
Bug: 259941142
Test: Manually verfied by tapping on the USB debugging option from a Secondary user.
Change-Id: Ibd1b8e19d9130982982ee13ac98cbc1d8f5b8835
2024-01-11 16:27:07 +00:00
Jan Tomljanovic
a01eee9bd2
Merge "Protect "Lock after timeout" page with an auth challenge." into main
2024-01-11 15:32:30 +00:00
Hani Kazmi
4e0fc12d05
Merge "Enable ECM restrictions for Usage Access and Device Admin" into main
2024-01-11 13:26:43 +00:00