Bill Yi
e3372c4cda
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I4ac92be0e614f3f9ab28ba368696d4e396920831
2024-02-07 15:18:42 -08:00
Weng Su
f8aff71fda
[automerger skipped] [conflict] [RESTRICT AUTOMERGE] Restrict WifiDialogActivity am: aabb15de74
am: a71eb50f99
am: 2a9ea31fb5
-s ours am: a10cad4433
-s ours am: fe96539f5e
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26131297
Change-Id: I5ecac8ff46ac26963a6ce21a136adbbb55926424
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-02-05 07:07:05 +00:00
Weng Su
fe96539f5e
[automerger skipped] [conflict] [RESTRICT AUTOMERGE] Restrict WifiDialogActivity am: aabb15de74
am: a71eb50f99
am: 2a9ea31fb5
-s ours am: a10cad4433
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26131297
Change-Id: I1ba1c842165d3f1b4607139f482c7550f26e25ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-02-05 06:22:00 +00:00
Weng Su
a10cad4433
[automerger skipped] [conflict] [RESTRICT AUTOMERGE] Restrict WifiDialogActivity am: aabb15de74
am: a71eb50f99
am: 2a9ea31fb5
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26131297
Change-Id: I3177d414de61d78210c1912866373de83c95c2ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-02-05 05:40:32 +00:00
Weng Su
76e4fde650
[automerger skipped] [RESTRICT AUTOMERGE] Restrict WifiDialogActivity am: aabb15de74
am: fa691e2a57
-s ours am: c95682730b
-s ours am: a9da905a3e
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26058111
Change-Id: Ibd5f19f6b8310a88dcd3f0b0baec9633b116cad2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-02-05 01:06:55 +00:00
Weng Su
a9da905a3e
[automerger skipped] [RESTRICT AUTOMERGE] Restrict WifiDialogActivity am: aabb15de74
am: fa691e2a57
-s ours am: c95682730b
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26058111
Change-Id: Ie1e2a71e090cd73e1f002a634440d8047a862d52
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-02-05 00:23:27 +00:00
Weng Su
83a895fe12
[RESTRICT AUTOMERGE] Restrict WifiDialogActivity am: a0409e582c
am: b33f9b8f8a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26069282
Change-Id: Ie7548054d0a3a63086427b9398e8dd16d84fafd6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-02-05 00:03:58 +00:00
Weng Su
2a9ea31fb5
[conflict] [RESTRICT AUTOMERGE] Restrict WifiDialogActivity am: aabb15de74
am: a71eb50f99
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26058111
Change-Id: I24369d8ac4ea5ab7bcd699444fdbd086997685b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-02-04 23:55:44 +00:00
Weng Su
c95682730b
[automerger skipped] [RESTRICT AUTOMERGE] Restrict WifiDialogActivity am: aabb15de74
am: fa691e2a57
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26058111
Change-Id: Ib0a1e348dbe49db3cf9187915521f1cc0a7c75a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-02-04 23:44:27 +00:00
Weng Su
b33f9b8f8a
[RESTRICT AUTOMERGE] Restrict WifiDialogActivity am: a0409e582c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26069282
Change-Id: I95a273524cc758ed7abe08b76ae4b2631a850ff8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-02-04 23:20:04 +00:00
Weng Su
a71eb50f99
[RESTRICT AUTOMERGE] Restrict WifiDialogActivity am: aabb15de74
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26058111
Change-Id: I29aa05d1b2b3aa43c53d83578fa03be3938bb083
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-02-04 22:59:57 +00:00
Weng Su
fa691e2a57
[RESTRICT AUTOMERGE] Restrict WifiDialogActivity am: aabb15de74
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26058111
Change-Id: I47c5b50adad57423c0c3359c751dd89e51203316
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-02-04 22:59:44 +00:00
Bill Yi
dc549ff191
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev
2024-02-01 13:20:30 +00:00
Bill Yi
e1a2a0f164
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: If98d3ff31e422f5e52d27f3faafb57402c3a7427
2024-01-31 00:51:05 -08:00
Bill Yi
e99d19cd85
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ia6925d0bfc9475932b9a441d7619bc888836583c
2024-01-31 00:47:49 -08:00
Weng Su
a0409e582c
[RESTRICT AUTOMERGE] Restrict WifiDialogActivity
...
- Don't show WifiDialogActivity if user has DISALLOW_ADD_WIFI_CONFIG
Bug: 299931761
Flag: None
Test: manual test with TestDPC
atest -c SettingsRoboTests:WifiDialogActivityTest
Merged-In: Icbb8f45922ded163208976be9c2816060dcf09f1
Change-Id: Icbb8f45922ded163208976be9c2816060dcf09f1
(cherry picked from commit 51fa3d798a
)
2024-01-30 21:23:08 +00:00
Weng Su
aabb15de74
[RESTRICT AUTOMERGE] Restrict WifiDialogActivity
...
- Don't show WifiDialogActivity if user has DISALLOW_ADD_WIFI_CONFIG
Bug: 299931761
Flag: None
Test: manual test with TestDPC
atest -c SettingsRoboTests:WifiDialogActivityTest
Merged-In: Icbb8f45922ded163208976be9c2816060dcf09f1
Change-Id: Icbb8f45922ded163208976be9c2816060dcf09f1
(cherry picked from commit 51fa3d798a
)
2024-01-31 05:03:19 +08:00
Bill Yi
3a826215dc
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev
2024-01-28 21:47:00 +00:00
Bill Yi
1bd5f53e95
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I27ed3d245273b235527cbc3cbe03e21606d03407
2024-01-24 21:45:56 -08:00
Bill Yi
1f768f6a25
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I87f330f554976c401e0182499ba26e44e8d59475
2024-01-24 21:42:42 -08:00
Bill Yi
adf8dd9584
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I116a1a451f7717639fb76e6f2b66258858f36aca
2024-01-18 11:51:28 -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
SongFerng Wang
e51d8515c0
Using ACTION_SIM_CARD_STATE_CHANGED to detect simSlotMapping is complete
...
Sometime modem can't return the GET_SIM_STATUS immediately, so that the settings send the sim switching too early after simSlotMapping.
Bug: 291733084
Change-Id: If547c8b02020bc86c83915334e29945176a4ee9f
Test: tester will test it manually.
(cherry picked from commit ba2a86ad9f
)
2024-01-05 03:38:30 +00:00
Bill Yi
8842653554
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev
2024-01-04 00:10:27 +00:00
Bill Yi
7fc1fb810b
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I3529df91c2d48ac11fec8f8755dfb3c6faad7a60
2024-01-02 14:37:53 -08:00
Bill Yi
8c0acadf03
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ie43dc95d487e328a20d88df957d9239a6cbf4bfa
2024-01-02 14:35:04 -08:00
Bill Yi
2a63e773ce
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev
2023-12-27 22:26:10 +00:00
Bill Yi
2b26b470ec
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev
2023-12-27 22:26:10 +00:00
Bill Yi
7d62083085
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Idf84f378f3b906951a36c3c61ef7e9da9dbd9092
2023-12-26 16:29:46 -08:00
Bill Yi
fa1bfc7d04
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: If2aa5e6d3d7c3c72f973ab142ac09dccfa4703ef
2023-12-26 16:26:50 -08:00
Bill Yi
7af5937f90
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I21ddd8b4ba7ef60791f304d38a466d80d6ec3073
2023-12-26 16:23:29 -08:00
Bill Yi
063e533a49
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev
2023-12-15 18:18:42 +00:00
Bill Yi
2300cd1453
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I7b88806e0d579e17355af3107724987fb657faf9
2023-12-13 16:21:13 -08:00
Bill Yi
4e9cfebc93
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: If08f28f0fb48e5969968d05b1533e89892dc64dc
2023-12-13 16:18:14 -08:00
Bill Yi
f07dacd7f4
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: If70d2c088105c88880860b4283014a43522b2db9
2023-12-05 13:11:59 -08:00
Chaohui Wang
b731e63096
Check isSimHardwareVisible earlier
...
In SimEidPreferenceController, to reduce flaky on no SIM devices.
Bug: 304560734
Test: manual - on "About phone / tablet" page
Test: unit test
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:8b7e6c28bcef0788b4fc637af16dcaef32a16c14 )
Merged-In: I07ae9b785d0fbe24a866883080a466a2110ca68f
Change-Id: I07ae9b785d0fbe24a866883080a466a2110ca68f
2023-12-04 10:10:29 +00:00
Chaohui Wang
d3cc9b20e4
Async load eid in SimEidPreferenceController
...
Avoid data loading in getAvailabilityStatus() to prevent ANR, override
updateNonIndexableKeys() for search availability.
Fix: 304560734
Test: manual - on "About phone" page
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:b6e44ce818a5284a612a31e0d451a33f9e1ce93e )
Merged-In: I9994abf3787f5db0edc71ff48d08e549a4b70bf7
Change-Id: I9994abf3787f5db0edc71ff48d08e549a4b70bf7
2023-12-04 07:53:34 +00:00
Bill Yi
5c3d71154e
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Iad5b125cb9a7b90beda38d098f5853c2868f5227
2023-11-29 18:31:38 -08:00
Bill Yi
1c2f669606
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I32c505e31630b342cada77404500d3a8c9ca00c9
2023-11-21 10:55:32 -08:00
Bill Yi
2f2335e4e1
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I5b1510979bad1842d72eac9481d15ac8a37f5474
2023-11-14 20:06:52 -08:00
Bill Yi
e58050c2f5
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I7e48f165a79129fe82b622fdd0be2df01d985ef4
2023-11-13 13:26:59 -08:00
Bill Yi
913dde2150
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Id459e11b40f4e38754131c386adce24711f3ca4e
2023-11-09 16:06:54 -08:00
Valentin Iftime
a909f5627e
[automerger skipped] Validate ringtone URIs before setting am: 7ba175eaeb
am: 236f1a0f17
am: 623d966fac
am: a4a9b9f0e7
am: fa932686c5
am: 179f53c651
am: b36b1dab96
am: ef71596281
-s ours am: abab7c6611
-s ours am: 4a10216008
-s ours
...
am skip reason: Merged-In Ib266b285a3a1c6c5265ae2321159e61e08e349f6 with SHA-1 1876c44991
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24956689
Change-Id: I7b77ec4017c879007eb3704a0757bf5eeb6d068e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-09 02:32:46 +00:00
Valentin Iftime
54ce00ac77
[automerger skipped] Validate ringtone URIs before setting am: 7ba175eaeb
am: 236f1a0f17
am: 623d966fac
am: a4a9b9f0e7
am: fa932686c5
am: 179f53c651
am: 676debfb2b
-s ours am: 0f9f4aa4c7
-s ours am: 3b7f364020
-s ours
...
am skip reason: Merged-In Ib266b285a3a1c6c5265ae2321159e61e08e349f6 with SHA-1 1876c44991
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24956689
Change-Id: Ie0b6a85be3bac050ef54120553c1ff110d8b2058
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-09 02:32:26 +00:00
Valentin Iftime
4a10216008
[automerger skipped] Validate ringtone URIs before setting am: 7ba175eaeb
am: 236f1a0f17
am: 623d966fac
am: a4a9b9f0e7
am: fa932686c5
am: 179f53c651
am: b36b1dab96
am: ef71596281
-s ours am: abab7c6611
-s ours
...
am skip reason: Merged-In Ib266b285a3a1c6c5265ae2321159e61e08e349f6 with SHA-1 1876c44991
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24956689
Change-Id: I40859abfad0ebff485c3780b02c73f88b0c6e3fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-09 01:56:23 +00:00
Valentin Iftime
3b7f364020
[automerger skipped] Validate ringtone URIs before setting am: 7ba175eaeb
am: 236f1a0f17
am: 623d966fac
am: a4a9b9f0e7
am: fa932686c5
am: 179f53c651
am: 676debfb2b
-s ours am: 0f9f4aa4c7
-s ours
...
am skip reason: Merged-In Ib266b285a3a1c6c5265ae2321159e61e08e349f6 with SHA-1 1876c44991
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24956689
Change-Id: Iec7962e031ddd6181abd60cb53e5d15da5a85e01
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-09 01:55:59 +00:00
Valentin Iftime
abab7c6611
[automerger skipped] Validate ringtone URIs before setting am: 7ba175eaeb
am: 236f1a0f17
am: 623d966fac
am: a4a9b9f0e7
am: fa932686c5
am: 179f53c651
am: b36b1dab96
am: ef71596281
-s ours
...
am skip reason: Merged-In Ib266b285a3a1c6c5265ae2321159e61e08e349f6 with SHA-1 1876c44991
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24956689
Change-Id: Ie8a878b641e67f39e0f2cb418bedbd0a04b477a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-09 01:50:11 +00:00
Valentin Iftime
0f9f4aa4c7
[automerger skipped] Validate ringtone URIs before setting am: 7ba175eaeb
am: 236f1a0f17
am: 623d966fac
am: a4a9b9f0e7
am: fa932686c5
am: 179f53c651
am: 676debfb2b
-s ours
...
am skip reason: Merged-In Ib266b285a3a1c6c5265ae2321159e61e08e349f6 with SHA-1 1876c44991
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24956689
Change-Id: I7e62bc8bfcbf3ccb2e9721972fe1ac9527e1e2c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-09 01:22:34 +00:00
Valentin Iftime
ef71596281
Validate ringtone URIs before setting am: 7ba175eaeb
am: 236f1a0f17
am: 623d966fac
am: a4a9b9f0e7
am: fa932686c5
am: 179f53c651
am: b36b1dab96
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24956689
Change-Id: Iaa3e61923eddada09aa19b61428ee60630b57cf1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-09 01:18:09 +00:00
Valentin Iftime
676debfb2b
Validate ringtone URIs before setting am: 7ba175eaeb
am: 236f1a0f17
am: 623d966fac
am: a4a9b9f0e7
am: fa932686c5
am: 179f53c651
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24956689
Change-Id: I6ebd0e328707728c0eaeb49a3e8207a6fce41578
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-09 00:34:52 +00:00