PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
125,479 Commits 1 Branch 0 Tags
1e96136b7d3b05f1229ea9bc996c941733193e9b
Commit Graph

125479 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Jason Chiu
19ae28f1eb Replace getCallingActivity() with getLaunchedFromPackage() am: ddc11bc03a am: 930a9f3180 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26315861

Change-Id: I0ef0c89fe3f3c0f9d8addef766b74f9b637eea92
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-03-05 05:33:46 +00:00
Jason Chiu
930a9f3180 Replace getCallingActivity() with getLaunchedFromPackage() am: ddc11bc03a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26315861

Change-Id: I01598c3f2fa5432dc27357701ddcbb29b4c97776
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-03-05 04:47:38 +00:00
Bill Yi
6b558097e2 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev 2024-02-23 00:07:24 +00: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
Bill Yi
1dcaca0925 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I3b8f1a51ba36d13d5196d03285a996b76016652c
 2024-02-21 16:01:20 -08:00
Bill Yi
5c8799994d Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Iac5066bd452c29cf0c7ebe8f9de2cd0596061d22
 2024-02-21 15:58:17 -08:00
Bill Yi
0e856c1a68 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev 2024-02-15 21:28:56 +00:00
Bill Yi
09454f8635 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I2d59d3beebc4e0d05779836201fd704c4a5a62fc
 2024-02-14 10:16:01 -08:00
Bill Yi
3d8af28675 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Iac69519b9a3a9023a16096ebcacec2e97b41cdc8
 2024-02-14 10:14:30 -08:00
Treehugger Robot
09a89e2771 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev 2024-02-08 22:07:13 +00:00
Treehugger Robot
1dc33e2d40 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev 2024-02-08 22:07:13 +00:00
Bill Yi
4d6d1f66d3 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I1334ce697598fabc251dd937c47036a90de7ff2a
 2024-02-07 15:21:40 -08:00
Bill Yi
a11618f1e5 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I307d5a243bb3d7938ab89dc84b3446ab6ad193a4
 2024-02-07 15:20:08 -08:00
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