Chaohui Wang
092668676a
Limit wifi item edit content's max length to 500
...
Bug: 293199910
Test: manual - on "Add network"
Merged-In: I303b8c6e0f3c3a1174a047ba98f302042e5db9ae
Change-Id: I303b8c6e0f3c3a1174a047ba98f302042e5db9ae
(cherry picked from commit 855053ca41
)
2024-05-28 10:41:48 +00:00
Bill Yi
f24ce25bf0
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I0d49889374971412df625e1bfc1a65de6842f44d
2024-05-27 22:02:05 -07:00
Jason Chiu
8bdbb580da
Replace getCallingActivity() with getLaunchedFromPackage()
...
getLaunchedFromPackage() reports who launched this Activity or built
PendingIntent used to launch it, whereas getCallingActivity() reports
who will get result of Activity.
Bug: 316891059
Test: robotest, manual
Change-Id: If97018c2741caef622f0596bbfeaa42ef1788b78
Merged-In: If97018c2741caef622f0596bbfeaa42ef1788b78
(cherry picked from commit ddc11bc03a
)
2024-05-28 02:40:04 +00:00
Bill Yi
a11d3f5527
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ic053db3d0f3738da4064fa0a9e165cc7d23f7038
2024-05-23 21:20:51 -07:00
Treehugger Robot
81c59a0158
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod
2024-05-22 17:43:54 +00:00
Bill Yi
a2ab468c05
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Iec619125c681e660b3e1b268207e946aa9df13df
2024-05-21 06:56:51 -07:00
Bill Yi
6b307af577
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I031113a5593e3f5e3ef35bd0e5318abf14e3d415
2024-05-21 06:55:26 -07:00
Treehugger Robot
c98da894f0
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod
2024-05-13 18:28:11 +00:00
Bill Yi
163789e60e
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ib3d12bcc4aa3efbcab08a95474711bd73f1c3448
2024-05-12 17:24:24 -07:00
Bill Yi
75a4637eba
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I1d6f65dc534d84befba2f14868ec94f2d9b83962
2024-05-12 17:22:52 -07:00
Bill Yi
6cacee0ce4
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I22cc98432c61957dfc19658420aa8a4174fab55d
2024-05-07 17:57:36 -07:00
Bill Yi
1d686943a3
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod
2024-05-03 23:24:26 +00:00
Bill Yi
903dd6c8a2
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ie51aea579d0254db21ebae51a7354eaa5392e2cd
2024-05-03 07:00:31 -07:00
Bill Yi
a3bc754019
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ib9d7e360a7317037c69207731b0616ba2277a1fb
2024-05-03 06:59:04 -07:00
Bill Yi
058348474d
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Iac6ff76b8df06e6ea3037acc1b0d0ff8a4db3a29
2024-04-28 19:37:08 -07:00
Treehugger Robot
962fd16b95
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod
2024-04-26 23:03:43 +00:00
Bill Yi
4d0305f4d9
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ia39d6ecc18e4d74f279cc56d32f62fef51f803b8
2024-04-25 17:31:43 -07:00
Bill Yi
c594852361
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I2e472a2fc8fea0698577f3be1856120282709faa
2024-04-25 17:30:20 -07:00
Bill Yi
bf184534f5
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I9a4e2efaecb33609fdba57b66fe69e6c639c73f0
2024-04-22 01:20:55 -07:00
Bill Yi
1e60ade37f
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I7cdbc3f87bf136fc25dcac0979d7bda194a78348
2024-04-18 22:21:10 -07:00
Bill Yi
1b10cde727
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod
2024-04-16 18:20:34 +00:00
Bill Yi
1550742adf
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ia1a2162c398a61ac17bd03dbb8ef71c07c87905f
2024-04-15 17:16:46 -07:00
Bill Yi
451d90c8b5
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I57d8e9f09cf42e3ab75181bfc6409334fba8c29c
2024-04-15 17:15:07 -07:00
Treehugger Robot
5ef10b2975
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod
2024-04-11 17:26:34 +00:00
Bill Yi
f855da2413
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I8917daa052c0502868a8f65e70fa96c2994f70ca
2024-04-10 20:28:05 -07:00
Bill Yi
80d2d9b9e3
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ib34986fb5c66ecbbd5d8438b4f21c251b2a8df03
2024-04-10 20:26:39 -07:00
Weng Su
8695639429
[automerger skipped] [conflict] [RESTRICT AUTOMERGE] Restrict WifiDppConfiguratorActivity am: 254ba087c2
am: 3d6b2b688e
am: 981673f940
-s ours am: 1112a774e0
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26838814
Change-Id: I0039d044f1164349132f2cdc969d2930d708c566
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-04-05 17:11:31 +00:00
Weng Su
1112a774e0
[automerger skipped] [conflict] [RESTRICT AUTOMERGE] Restrict WifiDppConfiguratorActivity am: 254ba087c2
am: 3d6b2b688e
am: 981673f940
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26838814
Change-Id: I074db2071f87741f334c35459655b1946d92339a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-04-05 16:53:53 +00:00
Weng Su
1f57fe8c0e
[automerger skipped] [RESTRICT AUTOMERGE] Restrict WifiDppConfiguratorActivity am: 254ba087c2
am: 4a93bd9f39
-s ours am: 70d03ec35b
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26808831
Change-Id: I97155789f7e3b2dc9698ce955a8e7b3236f5722e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-04-04 20:33:54 +00:00
Weng Su
981673f940
[conflict] [RESTRICT AUTOMERGE] Restrict WifiDppConfiguratorActivity am: 254ba087c2
am: 3d6b2b688e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26808831
Change-Id: I7f37ea9867aff063d8a22580d84ab0007abad77c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-04-04 20:29:43 +00:00
Weng Su
70d03ec35b
[automerger skipped] [RESTRICT AUTOMERGE] Restrict WifiDppConfiguratorActivity am: 254ba087c2
am: 4a93bd9f39
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26808831
Change-Id: I190f6f720fa4a6f1fe6f737414a2b8f485a5a4ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-04-04 20:19:13 +00:00
Weng Su
34b0650655
[RESTRICT AUTOMERGE] Restrict WifiDppConfiguratorActivity am: 0ea027a71c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26804708
Change-Id: I28bc46ff37bf11a9fa6b92eaa78c6d77f7cd4e8e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-04-04 20:06:48 +00:00
Weng Su
3d6b2b688e
[RESTRICT AUTOMERGE] Restrict WifiDppConfiguratorActivity am: 254ba087c2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26808831
Change-Id: I475d313032f26d9e835f04d4b8f6ed0e03fb4075
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-04-04 20:06:12 +00:00
Weng Su
4a93bd9f39
[RESTRICT AUTOMERGE] Restrict WifiDppConfiguratorActivity am: 254ba087c2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26808831
Change-Id: I1c23b0952d7e372848fe7486f2efea34b94e9253
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-04-04 20:06:11 +00:00
Weng Su
254ba087c2
[RESTRICT AUTOMERGE] Restrict WifiDppConfiguratorActivity
...
- Don't show WifiDppConfiguratorActivity if user has DISALLOW_ADD_WIFI_CONFIG
- Don't show AddNetworkFragment if user has DISALLOW_ADD_WIFI_CONFIG
Fix: 299931076
Flag: None
Test: manual test with TestDPC
atest -c SettingsUnitTests:AddNetworkFragmentTest \
SettingsUnitTests:WifiDppConfiguratorActivityTest
Change-Id: I34afe0f698e2dc43eba59b25f5f3f4f61e70166a
Merged-In: I34afe0f698e2dc43eba59b25f5f3f4f61e70166a
2024-04-03 07:50:24 +00:00
Weng Su
0ea027a71c
[RESTRICT AUTOMERGE] Restrict WifiDppConfiguratorActivity
...
- Don't show WifiDppConfiguratorActivity if user has DISALLOW_ADD_WIFI_CONFIG
- Don't show AddNetworkFragment if user has DISALLOW_ADD_WIFI_CONFIG
Fix: 299931076
Flag: None
Test: manual test with TestDPC
atest -c SettingsUnitTests:AddNetworkFragmentTest \
SettingsUnitTests:WifiDppConfiguratorActivityTest
Change-Id: I34afe0f698e2dc43eba59b25f5f3f4f61e70166a
Merged-In: I34afe0f698e2dc43eba59b25f5f3f4f61e70166a
2024-04-03 03:52:07 +00:00
Bill Yi
d52215885e
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod
2024-04-02 18:47:09 +00:00
Bill Yi
bb74a16786
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I66011caa4f1408ea66c4636a96fac3b9bd71b04d
2024-04-01 23:45:38 -07:00
Bill Yi
0d947dfd61
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I6040cc5f1e0be6743acc722546890d2ec0e45970
2024-04-01 23:43:43 -07:00
Treehugger Robot
3bfbd3f08b
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod
2024-03-29 22:36:08 +00:00
Bill Yi
ff9585eb97
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I379fddc5f5347057aa951bfaf307841f11b18126
2024-03-28 16:56:44 -07:00
Bill Yi
37746d10f0
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I66f3bcbcecf0755196ad6401541d6dd18726fb31
2024-03-28 16:55:22 -07:00
Treehugger Robot
54af04244e
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod
2024-03-22 16:39:39 +00:00
Bill Yi
4ff58f42de
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ida3e818122c39bcd2863fad12e017f84f53c77a0
2024-03-21 21:01:31 -07:00
Bill Yi
3014617f13
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I4ff8f127353a3807c0264b05d88c5f42ac467bd3
2024-03-21 21:00:00 -07:00
Bill Yi
697dfd9269
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I96c5ccb5ea8c7c2cde497e39fc39ea0ea2f1746f
2024-03-14 16:12:20 -07:00
Bill Yi
723639d1d1
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I0bfa57fe10f9cd1d9c5fadeb329f19710aa2060e
2024-03-08 01:59:53 -08:00
Jason Chiu
ea126ae386
Replace getCallingActivity() with getLaunchedFromPackage() am: ddc11bc03a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26315861
Change-Id: Ib4054f4a6aceb589a157eccf713a13b5abac01bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-03-05 04:49:40 +00:00
Bill Yi
7a16a9e9d9
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ia283b3f75e2352bcdd69b053acaf161ba0c737e9
2024-02-29 09:48:53 -08:00
Jason Chiu
ddc11bc03a
Replace getCallingActivity() with getLaunchedFromPackage()
...
getLaunchedFromPackage() reports who launched this Activity or built
PendingIntent used to launch it, whereas getCallingActivity() reports
who will get result of Activity.
Bug: 316891059
Test: robotest, manual
Change-Id: If97018c2741caef622f0596bbfeaa42ef1788b78
Merged-In: If97018c2741caef622f0596bbfeaa42ef1788b78
(cherry picked from commit 901880a1d2
)
2024-02-22 03:43:50 +00:00