PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
124,015 Commits 1 Branch 0 Tags
adc0b398d6931ab4dad267130aad7f21de221f1c
Commit Graph

124015 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Bill Yi
643cfdb205 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Iefec5f23be16eb15d1bf1fc2e3fe0b32de9a0a4f
 2024-02-21 15:06:49 -08:00
Tyler Saunders
0ca44d1772 Merge "Remove ExperimentalLifecycleComposeApi" into udc-mainline-prod 2024-02-21 17:11:33 +00:00
Bill Yi
ccabf894c1 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ibfe05bce22ad8ddee12426783d4c6a5c55706e1b
 2024-02-14 10:11:49 -08:00
Treehugger Robot
7102c78fcb Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod 2024-02-09 00:29:44 +00:00
Chaohui Wang
14b8df172f Remove ExperimentalLifecycleComposeApi 
Fix: 276310170
Bug: 271609607
Test: m Settings
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:8d220f064127826d0a5ec9b085d7cc7e49090dfb)
Merged-In: I8798f723bc821241d70fc8e5cb2c6ae59d7115af
Change-Id: I8798f723bc821241d70fc8e5cb2c6ae59d7115af
 2024-02-08 09:49:32 +00:00
Bill Yi
3ca22c2264 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I9401863e8509fa2a2323a5d1dbe0d50bf2d949df
 2024-02-07 15:17:13 -08:00
Bill Yi
e36f8bf429 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ifb619c4587cff45ae87e26d0f856424daa42708f
 2024-02-07 15:15:45 -08:00
Weng Su
18b6a3eb49 [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: I061a737e95bc9670072ef8c88474b1743722ef9b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-02-05 06:23:48 +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
4fbfed8c94 [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: I939c63e24409023c6d93913e9fa247fe2fbe70be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-02-05 00:25:13 +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
dbc5512077 [RESTRICT AUTOMERGE] Restrict WifiDialogActivity am: a0409e582c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26069282

Change-Id: Idb35be691b002767e241c331ab9df5ba7420bf8d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-02-04 23:21:48 +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
Treehugger Robot
72df0d20a9 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod 2024-01-31 18:08:28 +00:00
Bill Yi
fecbcac5cf Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I2fc11584bd33e92ae5a7b503a0c1c9466223abd5
 2024-01-31 00:45:20 -08:00
Bill Yi
7083fedd9b Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I3a91aefaedc27c182f1150c78a5df71fa8dd0523
 2024-01-31 00:43:53 -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
8e3354450c Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod 2024-01-28 22:07:49 +00:00
Bill Yi
ef64758057 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I2958a2972adcd25e871a286c62b9f704991a362a
 2024-01-24 21:40:29 -08:00
Bill Yi
3a86c8e77f Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ia0ae85fde8ff629355d440e59dd1bfd22e9d544d
 2024-01-24 21:39:03 -08:00
Bill Yi
3fd02a8e7e Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I1e49e5eb583e5beeaad82b2c53321a840b5d6e0d
 2024-01-18 11:46:02 -08:00
Bill Yi
9a5a8054b8 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I1e7abc10279e262f9e8faac753cf3cdf0ae46d91
 2024-01-11 18:54:53 -08:00
Bill Yi
072fc7f175 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ib6fb378d4b39375c6d0356cf33ee16fce603afab
 2024-01-02 14:29:49 -08:00
Treehugger Robot
705aa21688 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod 2023-12-27 18:50:52 +00:00