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

125289 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Weng Su
0abcc6d070 [automerger skipped] [conflict] [RESTRICT AUTOMERGE] Restrict WifiDppConfiguratorActivity am: 254ba087c2 am: 3d6b2b688e am: 981673f940 -s ours am: 1112a774e0 -s ours am: c70a02037d -s ours 
am skip reason: contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26838814

Change-Id: I2ef9b190b078c7449241c91e3456dee2174363ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-04-05 17:23:50 +00:00
Weng Su
c70a02037d [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: I9c69e4b2f3a0e595d3b7ea39961a269b1275a7a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-04-05 17:11:14 +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
fe84674bf9 [automerger skipped] [RESTRICT AUTOMERGE] Restrict WifiDppConfiguratorActivity am: 254ba087c2 am: 4a93bd9f39 -s ours am: 70d03ec35b -s ours am: 74c1cf0e7b -s ours 
am skip reason: contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26808831

Change-Id: I3554a4f09f2aca6f1f39c69d4564faed19615e29
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-04-04 20:51:21 +00:00
Weng Su
74c1cf0e7b [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: I3fd4e0ecb10c7bf587ad45fc174ad0fb2f2ccb4f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-04-04 20:33:36 +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
1f2fc04f17 [RESTRICT AUTOMERGE] Restrict WifiDppConfiguratorActivity am: 0ea027a71c am: 146d51f2cc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26804708

Change-Id: If2fb5dea84a4e7f26186a062bd9b946709642da3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-04-04 20:19:04 +00:00
Weng Su
146d51f2cc [RESTRICT AUTOMERGE] Restrict WifiDppConfiguratorActivity am: 0ea027a71c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26804708

Change-Id: I2f57a28bbc46a1f648d6ecf0a72eab3a884e69e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-04-04 20:06:34 +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
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