Bill Yi
c92c6e34c1
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2764a59fac
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24069343
Change-Id: Ifc82f6a2eec8f46c13fc78c1437ac43d1e9bacfd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-14 20:22:39 +00:00
Bill Yi
8ca09218bc
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: eec083c169
-s ours am: 1ff28d9c1a
-s ours am: 7131bb93ed
-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: I3f883969d73efbb4dc454da891ce68d23c03c2a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-14 20:17:29 +00:00
Bill Yi
c69e38797c
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: eec083c169
-s ours am: 1ff28d9c1a
-s ours am: f74197dd3c
-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: I16f112e03059f2b5baeac6193dd0df51260e4827
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-14 20:17:24 +00:00
Bill Yi
208c74fa3c
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3d999ce533
-s ours am: 9785c80168
-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: Ia0076063f02d3590ccfb5f3ee2f6cc605d60b6bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-14 19:58:36 +00:00
Bill Yi
2531d5736b
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev
2023-07-14 19:57:27 +00:00
Bill Yi
48a4220539
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3d999ce533
-s ours am: 9785c80168
-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: I9dd85745bea993a78a31216e7db061dacf2f7a12
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-14 19:57:15 +00:00
Bill Yi
1e86da303c
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3d999ce533
-s ours am: 9785c80168
-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: I0890d4e15c37c5f22cfe1a5c72bfa46d1e6512d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-14 19:57:10 +00:00
Bill Yi
80172630a4
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev
2023-07-14 19:56:04 +00:00
Bill Yi
797d51f7cb
[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: I0ca5a27e7529091f53433b4195f9ef6c74906d19
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-14 19:55:21 +00:00
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
7131bb93ed
[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: I178b993290ac43617e178dd015a832ed50f2619e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-14 19:32:21 +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
Bill Yi
95f180d6f5
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4304a67102
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24075122
Change-Id: I264d49059457201582c1ec8ea6296eb74d4eea18
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-14 18:36:24 +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
Chaohui Wang
0b48ffdd6e
Merge "Remove context from powerUsageFeatureProvider" into main
2023-07-14 08:36:27 +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
891cb2acb4
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
am: a5e2586018
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24037114
Change-Id: I0d8e4445a1a55ecc58c428dde05fb69cc35e9583
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-14 07:45:52 +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
Treehugger Robot
3b7abccc6e
Merge "Fix testUidCache_switchLocale_shouldCleanCache in BatteryEntryTest" into udc-qpr-dev am: b544871b38
am: 486451e9cf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24002332
Change-Id: I470e36951003125f6a97dca2c71d655b2904abcd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-14 06:16:48 +00:00
Chun-Wei Wang
e0c2d574a7
Merge "Re-enable most tests" into udc-qpr-dev am: a671c3014e
am: 4fbf549bdf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24059806
Change-Id: I354313db70332a413b80431d3337ace97da80514
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-14 06:15:43 +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
Bill Yi
9fd352f12f
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I1ce687c28620f4880b1d170c913f5a456797f129
2023-07-13 21:19:38 -07:00
Bill Yi
4304a67102
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I9ba5bbbdfad59efc65dc654e13dcb881948a2653
2023-07-13 21:11:32 -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
b6c849e27c
Merge "Add warning on enabling ANGLE." into udc-qpr-dev am: e8e302b551
am: 7da022c74c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24041836
Change-Id: Ieb4d272ea6870e24f50aea7f4b40a5672638ef3c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-14 02:32:01 +00:00
Bill Lin
88bc013487
Merge "Update screen lock and biometrics options in order" into udc-qpr-dev am: 8ea74c3d76
am: f0278e6835
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23896224
Change-Id: I470152428e4fe0ecf1fc9e8f3d499fca89d114db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-14 02:06:19 +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
Pavel Grafov
735f8ee883
Merge "Set profile pattern visibility controller in xml" into main
2023-07-13 10:11:48 +00:00
Treehugger Robot
07e0e5c86f
Merge "Extend resource OWNERS exemption to other res folders (res-product). " into main am: 24db817a65
am: 70b29d5f28
am: ec8e7816f3
am: 28ac723a78
am: d47f3a29ed
am: 7faa1585e7
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2597316
Change-Id: I679c8773a5347910209fabb09f03cdf86f796091
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-13 03:29:57 +00:00