Bill Yi
a5dc181d3c
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: eec083c169
-s ours am: 1ff28d9c1a
-s ours am: 0cc5a16f95
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24069363
Change-Id: I256036c7c7001598553dbfc71110de9316ef4437
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-14 19:53:14 +00:00
Bill Yi
f74197dd3c
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: eec083c169
-s ours am: 1ff28d9c1a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24069363
Change-Id: I76ada29d9bf6a54fb64e16c35fba28c1200c8461
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-14 19:32:45 +00:00
Bill Yi
0cc5a16f95
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: eec083c169
-s ours am: 1ff28d9c1a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24069363
Change-Id: Icaf934d95d7072cbd9e4163c592f62efe523a3b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-14 19:32:22 +00:00
Bill Yi
9785c80168
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3d999ce533
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24068200
Change-Id: I61ee6c3d5277ec175c863db02356fdad27ce0afc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-14 18:48:32 +00:00
Bill Yi
1ff28d9c1a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: eec083c169
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24069363
Change-Id: I2de227d48fb0409fb88f5b4dac8eb2c42482edbe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-14 18:45:03 +00:00
Zoey Chen
4900bcfa5c
[Language] Should show confirm dialog when deleting the system language
...
and making the second language automatically become the system language
Bug: 286508825
Test: make RunSettingsRoboTests -j128 ROBOTEST_FILTER=LocaleListEditorTest
Change-Id: I556eecc9eec1ddcdb8947d5ba69d0db2c016e33c
2023-07-14 16:06:40 +00:00
Shivangi Dubey
32d914ea56
Merge "Add 'Stay unlocked on fold' toogle to settings" into udc-qpr-dev am: 8c68b0e7e2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23832963
Change-Id: I1bd342d5e2649e13734aa504f461bf12a141c819
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-14 14:22:00 +00:00
Shivangi Dubey
8c68b0e7e2
Merge "Add 'Stay unlocked on fold' toogle to settings" into udc-qpr-dev
2023-07-14 13:35:55 +00:00
Zoey Chen
088bb6a35e
[Language] Do not back to previous page if dialog is displaying.
...
Bug: 288827218
Test: make RunSettingsRoboTests -j128 ROBOTEST_FILTER=LocaleDialogFragmentTest
Change-Id: I914b1e1d96aacf5369e5149f34968ef625548525
2023-07-14 09:05:10 +00:00
Vincent Wang
291714418c
Fix enroll introduction page was not closed in background
...
Bug: 291023102
Test: 1. Launch FingerprintEnrollFindSensor and back to introducntion
2. Go to home screen
3. Launch FingerprintEnrollFindSensor from recent app
4. Check if FingerprintEnrollFindSensor is stopped
5. make RunSettingsRoboTests -j96 ROBOTEST_FILTER=com.android.settings.biometrics.fingerprint
Change-Id: I65504f663340a0e66d1f8bcd2e7d4b3659282884
2023-07-14 07:49:41 +00:00
Xinyi Mao
a5e2586018
Merge "Add 25% and 75% lines to improve the readability of the battery level as a short-term fix." into udc-qpr-dev am: 6c12390bab
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24037114
Change-Id: Ia9abd00ab92335a2752b053e06861e2cedcf0b57
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-14 07:07:56 +00:00
Xinyi Mao
6c12390bab
Merge "Add 25% and 75% lines to improve the readability of the battery level as a short-term fix." into udc-qpr-dev
2023-07-14 06:31:30 +00:00
mxyyiyi
881d625b25
Add 25% and 75% lines to improve the readability of the battery level as a short-term fix.
...
[Screenshot]
Before: https://screenshot.googleplex.com/5WDToTZsRcosbjC
After: https://screenshot.googleplex.com/C4XJ4Mnigxa27gq
Bug: 260498797
Fix: 260498797
Test: Manual
Change-Id: I08c8ec3b2868c59d341ce34d93b6e010e3440cf5
2023-07-14 13:51:56 +08:00
Chaohui Wang
512caa568a
[BT] Correct the filter when addCachedDevices
...
In Change Ia9750adb6b4c1424d084381e9d7c2ca8e7912391, addCachedDevices()
becomes async, but the filter is set outside of addCachedDevices(),
which makes the filter not apply to addCachedDevices().
Direct pass the filter to addCachedDevices() to fix this issue.
Also migrate the test to Kotlin so we can test coroutine.
Fix: 289876965
Test: manual - check BT pairing page
Test: m RunSettingsRoboTests
Change-Id: I95b16840881747ec9f69e5cd778e456bcc8a7626
(cherry picked from commit 8dd32ab07d
)
Merged-In: I95b16840881747ec9f69e5cd778e456bcc8a7626
2023-07-14 05:40:03 +00:00
Treehugger Robot
486451e9cf
Merge "Fix testUidCache_switchLocale_shouldCleanCache in BatteryEntryTest" into udc-qpr-dev am: b544871b38
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24002332
Change-Id: I67b7e296e56e50c9745ca36e5994f06663ccb56d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-14 05:14:04 +00:00
Chun-Wei Wang
4fbf549bdf
Merge "Re-enable most tests" into udc-qpr-dev am: a671c3014e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24059806
Change-Id: Iea86a42398e88a5ef39fd26c7cac566f78b67017
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-14 05:12:40 +00:00
Treehugger Robot
b544871b38
Merge "Fix testUidCache_switchLocale_shouldCleanCache in BatteryEntryTest" into udc-qpr-dev
2023-07-14 04:29:02 +00:00
Bill Yi
3f21bb3ba0
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I1d4a3c3a0dcb4669918482a2b0022f1eedd37f75
2023-07-13 21:22:04 -07:00
Chun-Wei Wang
a671c3014e
Merge "Re-enable most tests" into udc-qpr-dev
2023-07-14 03:52:01 +00:00
Peiyong Lin
7da022c74c
Merge "Add warning on enabling ANGLE." into udc-qpr-dev am: e8e302b551
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24041836
Change-Id: I4055ff6b3712b7c9029555b3259ce888ca40f976
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-14 01:45:39 +00:00
Chun-Wei Wang
d155195c6b
Remove invalid test
...
1. Remove the invalid test
Per ag/23288037, the feature is now always available
2. Rename
processAndValidatePasswordRequirements_autoPinEnabled_defaultPinMinimumLength
Bug: 291146670
Test: atest ChooseLockPasswordTest
Change-Id: If96ac99aa1a98636a14017c880892436767c4a41
2023-07-14 01:25:09 +00:00
Chun-Wei Wang
d72b22e1e1
Remove invalid test
...
The auto pin confirm feature is now always available (ag/23288037).
The test is no longer valid.
Bug: 291146670
Test: atest ChooseLockPasswordTest
Change-Id: I45ab17cf3833e0fc8cad5679d6ef19957a2f60b7
2023-07-14 01:24:08 +00:00
Peiyong Lin
e8e302b551
Merge "Add warning on enabling ANGLE." into udc-qpr-dev
2023-07-14 00:28:03 +00:00
Bill Yi
eec083c169
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ifa6d29ecf5518b91b6439055fa684e371c0dcc5f
2023-07-13 17:14:07 -07:00
Bill Yi
2764a59fac
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I77ce443619168d050a0da92c30f51199b412566d
2023-07-13 17:12:30 -07:00
Bill Yi
3d999ce533
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I731e98ceaf81340bfa91fa5d63a09e5f95a7cc56
2023-07-13 17:06:52 -07:00
Bill Lin
f0278e6835
Merge "Update screen lock and biometrics options in order" into udc-qpr-dev am: 8ea74c3d76
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23896224
Change-Id: Ia5ee770bc367d6dc30610dbdc4582d343a28df32
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-14 00:01:30 +00:00
Bill Lin
8ea74c3d76
Merge "Update screen lock and biometrics options in order" into udc-qpr-dev
2023-07-13 23:18:19 +00:00
Chun-Wei Wang
203906516e
Re-enable most tests
...
Most tests are still successful. We don't want to impact
too much test coverage by disabling all tests.
Bug: 291146670
Test: atest ChooseLockPasswordTest --rerun-until-failure 50
Change-Id: Ia8266dc5d44ea9271a28e1bee80c3855b3c2d52b
2023-07-13 23:14:38 +00:00
Treehugger Robot
7faa1585e7
Merge "Extend resource OWNERS exemption to other res folders (res-product). " into main am: 24db817a65
am: 70b29d5f28
am: ec8e7816f3
am: 28ac723a78
am: d47f3a29ed
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2597316
Change-Id: I93a5e747f801c38480dc5c4bc377327dc190ac8d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-13 01:41:56 +00:00
Treehugger Robot
d47f3a29ed
Merge "Extend resource OWNERS exemption to other res folders (res-product). " into main am: 24db817a65
am: 70b29d5f28
am: ec8e7816f3
am: 28ac723a78
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2597316
Change-Id: Id22ac8a944c8b1c166f003b6b15ff964aff6f934
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-13 00:55:29 +00:00
Treehugger Robot
28ac723a78
Merge "Extend resource OWNERS exemption to other res folders (res-product). " into main am: 24db817a65
am: 70b29d5f28
am: ec8e7816f3
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2597316
Change-Id: Id4d95b64251fb2a1c7f63c24d670befeb737a4dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-13 00:09:29 +00:00
Treehugger Robot
ec8e7816f3
Merge "Extend resource OWNERS exemption to other res folders (res-product). " into main am: 24db817a65
am: 70b29d5f28
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2597316
Change-Id: Ie0040ddf4b2acfa4769da3bf3d49178ae4ac3873
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-12 23:26:36 +00:00
Treehugger Robot
70b29d5f28
Merge "Extend resource OWNERS exemption to other res folders (res-product). " into main am: 24db817a65
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2597316
Change-Id: If8911bebafd144d8870dd7c2b8afc7e5820eca31
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-12 22:40:10 +00:00
Treehugger Robot
24db817a65
Merge "Extend resource OWNERS exemption to other res folders (res-product). " into main
2023-07-12 22:03:16 +00:00
Bill Yi
0e6c0d2d1d
[automerger skipped] Merge "Merge TQ3A.230705.001 to aosp-main - DO NOT MERGE" into main am: d4c0315d66
-s ours am: e70f33f687
-s ours am: 5775318d2a
-s ours am: 39051efb1a
-s ours am: 5a6cd5cd20
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2654586
Change-Id: I60a17e85256614a87c66bde67eb704da830e687f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-12 18:29:14 +00:00
Bill Yi
5376a5e9dd
[automerger skipped] Merge TQ3A.230705.001 to aosp-main - DO NOT MERGE am: 05c15f8e73
-s ours am: 3e01c01021
-s ours am: e3c746ddf6
-s ours am: 44f02c0e0d
-s ours am: 5fc5560df0
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2654586
Change-Id: Ida7831e83ad6332a4cebbce619299cd113e80257
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-12 18:28:51 +00:00
Peiyong Lin
39eb3a5ad0
Add warning on enabling ANGLE.
...
Enabling ANGLE on incompatible devices may cause some applications to
crash, add a warning.
Bug: b/287909344
Test: atest SettingsRoboTests:GraphicsDriverEnableAngleAsSystemDriverControllerTest
Change-Id: I4f856ee1912a59052a6aaf7dff087ce1b649935e
2023-07-12 18:10:03 +00:00
Bill Yi
5a6cd5cd20
[automerger skipped] Merge "Merge TQ3A.230705.001 to aosp-main - DO NOT MERGE" into main am: d4c0315d66
-s ours am: e70f33f687
-s ours am: 5775318d2a
-s ours am: 39051efb1a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2654586
Change-Id: I34f36acb735d8113f8c4a090762e85aaea21afba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-12 17:43:28 +00:00
Bill Yi
5fc5560df0
[automerger skipped] Merge TQ3A.230705.001 to aosp-main - DO NOT MERGE am: 05c15f8e73
-s ours am: 3e01c01021
-s ours am: e3c746ddf6
-s ours am: 44f02c0e0d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2654586
Change-Id: Iec90f8c9bad69d47d720373bc687fc10f7f4cfa3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-12 17:43:06 +00:00
Bill Yi
39051efb1a
[automerger skipped] Merge "Merge TQ3A.230705.001 to aosp-main - DO NOT MERGE" into main am: d4c0315d66
-s ours am: e70f33f687
-s ours am: 5775318d2a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2654586
Change-Id: Ib9e65be40690b44601a26774cff27e0b451d4140
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-12 17:21:41 +00:00
Bill Yi
44f02c0e0d
[automerger skipped] Merge TQ3A.230705.001 to aosp-main - DO NOT MERGE am: 05c15f8e73
-s ours am: 3e01c01021
-s ours am: e3c746ddf6
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2654586
Change-Id: I585c4dc6f77fb8fa7155f6e2c67457382c8dff4f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-12 17:21:20 +00:00
Joshua Mccloskey
95e8ee658b
[automerger skipped] Merge "Moving FingerprintSettings to Kotlin" into udc-qpr-dev am: b1aaa313ef
-s ours
...
am skip reason: Merged-In I8eb5c30e6f2e92c256ae7c257a9d560439ba418f with SHA-1 2f46489926
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23334106
Change-Id: I7e88c5c9dd105c0e9f043dedaa95575cc53e5610
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-12 17:03:11 +00:00
Joshua McCloskey
09bf6f6347
[automerger skipped] Moving FingerprintSettings to Kotlin am: b7f0d7a8ff
-s ours
...
am skip reason: Merged-In I8eb5c30e6f2e92c256ae7c257a9d560439ba418f with SHA-1 2f46489926
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23334106
Change-Id: I9596c36ecb3f12e0d4361f145d1bd015cdf4c40d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-12 17:03:07 +00:00
Joshua Mccloskey
b1aaa313ef
Merge "Moving FingerprintSettings to Kotlin" into udc-qpr-dev
2023-07-12 17:01:36 +00:00
Bill Yi
5775318d2a
[automerger skipped] Merge "Merge TQ3A.230705.001 to aosp-main - DO NOT MERGE" into main am: d4c0315d66
-s ours am: e70f33f687
-s ours
...
am skip reason: Merged-In I2d14107a37340b8b34ae71c67f7f705a272324b9 with SHA-1 c61819e807
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2654586
Change-Id: I6b15c3c2777a61dd408c3b6a360be5c9a4c54d22
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-12 14:51:57 +00:00
Bill Yi
e3c746ddf6
[automerger skipped] Merge TQ3A.230705.001 to aosp-main - DO NOT MERGE am: 05c15f8e73
-s ours am: 3e01c01021
-s ours
...
am skip reason: Merged-In I2d14107a37340b8b34ae71c67f7f705a272324b9 with SHA-1 c61819e807
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2654586
Change-Id: I83b68f5f60d2bbc6b650637be81a80208cc71508
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-12 14:51:36 +00:00
Bill Yi
e70f33f687
[automerger skipped] Merge "Merge TQ3A.230705.001 to aosp-main - DO NOT MERGE" into main am: d4c0315d66
-s ours
...
am skip reason: Merged-In I2d14107a37340b8b34ae71c67f7f705a272324b9 with SHA-1 c61819e807
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2654586
Change-Id: Ib15065dff3e0f03f45cfc124711808f32e6d2096
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-12 14:10:45 +00:00
Bill Yi
3e01c01021
[automerger skipped] Merge TQ3A.230705.001 to aosp-main - DO NOT MERGE am: 05c15f8e73
-s ours
...
am skip reason: Merged-In I2d14107a37340b8b34ae71c67f7f705a272324b9 with SHA-1 c61819e807
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2654586
Change-Id: I6db943e35499a5b56c80a8277af182085ae0ff4d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-12 14:10:24 +00:00
Bill Yi
d4c0315d66
Merge "Merge TQ3A.230705.001 to aosp-main - DO NOT MERGE" into main
2023-07-12 13:38:40 +00:00