PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
141,459 Commits 1 Branch 0 Tags
5655b46dee8cb3d69e963fd35f4f15f02f81e3b0
Commit Graph

141459 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joseph Vincent
bfc9678d08 Merge "Update strings in PS setup education and settings screen" into main 2024-06-13 14:22:50 +00:00
josephpv
ce8a258b98 Update strings in PS setup education and settings screen 
With this change strings in PS settings screen and PS setup education
screen footer is updated to include medical apps.

Screenshot:
go/ss/54VdL8mNvDXGCF4.png
go/ss/9XEAXLkGZa5KLDF.png

Bug: 346925554
Test: Manual
Change-Id: Ief39d92d27099d285f0e36394b9b41700a3d62d3
 2024-06-13 14:22:16 +00:00
Alexander Roederer
a6b1d7cbbc Adds summary helper for apps subtitle 
The subtitle for the apps page says which apps (up to two/three) and how
many (if there are more than three) are allowed to bypass dnd under the
main "Apps" page.

Bug: 308819928
Test: atest ZenModesSummaryHelperTest
Flag: android.app.modes_ui
Change-Id: I15696384c392ba3f054948db50eea614f91d8c48
 2024-06-13 13:20:29 +00:00
Weng Su
3b161c23b3 Don't show the Wi-Fi icon when Wi-Fi is off 
- Show an empty icon when the Wi-Fi level is unreachable

Bug: 339343274
Flag: EXEMPT bugfix
Test: Manual testing
atest -c SettingsRoboTests

Change-Id: I55f3be145150235b19484e256c35e37f885a1dcf
 2024-06-13 20:43:40 +08:00
Matías Hernández
22c325a099 Load zen mode type icon options from the proper resources 
* Move default mode icons from Settings res to core res.
* Add array resources for the icon options and their descriptions.
* As the initial version of the list, use the default mode icons.

Bug: 333901673
Test: atest IconOptionsProviderImplTest
Flag: android.app.modes_ui
Change-Id: I66669e67a9d607268c05d5ed3df6c9555e57864c
 2024-06-13 14:38:51 +02:00
Chelsea Hao
484d129b35 Merge "Catch NoSuchMethodError as isAutoOnSupported is tagged as FlaggedApi." into main 2024-06-13 11:44:48 +00:00
Treehugger Robot
50ee61a80f Merge "InternetPreferenceController V2 (7/7)" into main 2024-06-13 10:05:19 +00:00
Olivier Nshimiye
2dc4310630 Merge "Remove settings tasks on private space deletion" into main 2024-06-13 09:47:49 +00:00
Matías Hernández
2bdd13fd26 Merge "Follow-up improvements to zen mode icon picker" into main 2024-06-13 09:28:24 +00:00
Chelsea Hao
4826efcbbf Merge "[Audiosharing] Add logging 2." into main 2024-06-13 08:56:59 +00:00
Chelsea Hao
ba98450a2d Merge "[Audiosharing] Add logging 1." into main 2024-06-13 08:56:35 +00:00
Fiona Campbell
21c0dd70ae Merge "Even Dimmer for manual screen brightness mode" into main 2024-06-13 08:50:20 +00:00
chelseahao
c03df5f6c7 Catch NoSuchMethodError as isAutoOnSupported is tagged as FlaggedApi. 
Test: Manual
Bug: 346716614

Change-Id: I69b34c461ab71703490147a49f5c713a25275f51
 2024-06-13 08:47:49 +00:00
Chaohui Wang
b0acf0daf5 InternetPreferenceController V2 (7/7) 
Support alternateSummary for HotspotNetworkEntry.

Bug: 339884322
Flag: com.android.settings.flags.internet_preference_controller_v2
Test: manual - on Internet
Test: unit test
Change-Id: I6a454e86453ea8ed597a032d3f5769b6cf9102ba
 2024-06-13 16:47:01 +08:00
Chaohui Wang
8dd270c0ea Merge changes Ie14c36f0,I73fc9334,Ic06b0e34 into main 
* changes:
  InternetPreferenceController V2 (6/n)
  InternetPreferenceController V2 (5/n)
  InternetPreferenceController V2 (4/n)
 2024-06-13 08:15:22 +00:00
Chaohui Wang
52d15b6c34 InternetPreferenceController V2 (6/n) 
Treat carrier merged Wi-Fi as cellular.

Bug: 339884322
Flag: com.android.settings.flags.internet_preference_controller_v2
Test: manual - on Internet
Test: unit test
Change-Id: Ie14c36f0f22c332319c097150b06cfeec97e946f
 2024-06-13 15:08:22 +08:00
Joseph Vincent
8e103fc4fd Merge "Add accessibility delegate and populate itemCount" into main 2024-06-13 05:39:33 +00:00
Chaohui Wang
c5cc30f0c3 InternetPreferenceController V2 (5/n) 
Support ethernet.

Bug: 339884322
Flag: com.android.settings.flags.internet_preference_controller_v2
Test: manual - on Internet
Test: unit test
Change-Id: I73fc9334379daa979f736fc9ff31c3d576a3381b
 2024-06-13 13:29:13 +08:00
Chaohui Wang
0d758dfdb9 InternetPreferenceController V2 (4/n) 
Display different icon for different condition.

Bug: 339884322
Flag: com.android.settings.flags.internet_preference_controller_v2
Test: manual - on Internet
Test: unit test
Change-Id: Ic06b0e349a284f8b4466bd0c19f318a6a0936a6e
 2024-06-13 13:29:13 +08:00
Chaohui Wang
585727a34a Merge "InternetPreferenceController V2 (3/n)" into main 2024-06-13 05:24:51 +00:00
Chelsea Hao
dd494e68d2 Merge "Update auto on text." into main 2024-06-13 03:39:52 +00:00
Julia Reynolds
162813cd5a Merge "Support device effects for manual mode" into main 2024-06-12 23:29:59 +00:00
Android Build Coastguard Worker
a8fd405a8f Snap for 11959661 from 076b7ee22a to 24Q3-release 
Change-Id: I751144b8ab0d9d594a74d699eb004fa4c8435ea3
 2024-06-12 23:23:03 +00:00
Treehugger Robot
5d512f2c52 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Replace getCallingActivity() with getLaunchedFromPackage()" into sc-dev am: 952dbb9aa3 am: d0f5ccb499 -s ours am: 20f8ad98fb -s ours am: 357d9ecbdb -s ours am: 506fc66f7c -s ours am: 1120050213 -s ours am: 352bcbcbc4 -s ours am: e9842d18db -s ours am: 8b3026b2b0 -s ours 
am skip reason: contains skip directive

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

Change-Id: I1189c8eb8d46ab24c44988f1dae35bcdf7c66042
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-12 21:34:26 +00:00
Jason Chiu
71bc19b212 [automerger skipped] [RESTRICT AUTOMERGE] Replace getCallingActivity() with getLaunchedFromPackage() am: b86569b274 am: d0a4db88bb -s ours am: e0b4c24d20 -s ours am: 8e61964dec -s ours am: 23bcaf74e8 -s ours am: a01c5efd63 -s ours am: 7efa1c8090 -s ours am: 8666ed7ac1 -s ours am: 1edc91a76b -s ours 
am skip reason: contains skip directive

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

Change-Id: Id922679bbeba85e6c4a156b48c60f93f2ca4bfd1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-12 21:34:21 +00:00
Treehugger Robot
54565cdbb8 [automerger skipped] [RESTRICT AUTOMERGE] Merge "Replace getCallingActivity() with getLaunchedFromPackage()" into sc-v2-dev am: 324e36b19d am: a339d8ea9a am: ffb480aee4 am: ba599569fd -s ours am: ebefb83789 -s ours am: ebf3f4cee6 -s ours am: 915d38372e -s ours 
am skip reason: contains skip directive

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

Change-Id: Ib1485864df8e23fa821b21af735b10a70f2dc380
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-12 21:34:06 +00:00
Treehugger Robot
770ab5fdd1 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Replace getCallingActivity() with getLaunchedFromPackage()" into sc-dev am: 952dbb9aa3 am: d0f5ccb499 -s ours am: 20f8ad98fb -s ours am: 357d9ecbdb -s ours am: 5e90b5cfbb -s ours am: ef935895f9 -s ours am: b1cdb2abae -s ours am: d3c697bd8d -s ours 
am skip reason: contains skip directive

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

Change-Id: I9cab800926fb71255002d3abc6efd198a0313c19
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-12 21:33:50 +00:00
Jason Chiu
373daafcec [automerger skipped] [RESTRICT AUTOMERGE] Replace getCallingActivity() with getLaunchedFromPackage() am: b86569b274 am: d0a4db88bb -s ours am: e0b4c24d20 -s ours am: 8e61964dec -s ours am: 19019740e0 -s ours am: 2e2afe97df -s ours am: e28d3aaa38 -s ours am: 20c8698884 -s ours 
am skip reason: contains skip directive

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

Change-Id: If3277f35cb25c0e5c3baccc7b8b1c7e24e33e7f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-12 21:33:45 +00:00
Treehugger Robot
f103ae929f [automerger skipped] [RESTRICT AUTOMERGE] Merge "Replace getCallingActivity() with getLaunchedFromPackage()" into sc-v2-dev am: 324e36b19d am: a339d8ea9a am: 9e311f362a -s ours am: 4c59ec6eaf -s ours am: 296a7877e9 -s ours am: 1d5135af02 -s ours 
am skip reason: contains skip directive

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

Change-Id: Ib78b3e6f1559b0923bb0d22f1f28b487fa6ef201
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-12 21:33:31 +00:00
Treehugger Robot
06c9461e42 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Replace getCallingActivity() with getLaunchedFromPackage()" into sc-dev am: 952dbb9aa3 am: d0f5ccb499 -s ours am: 20f8ad98fb -s ours am: 357d9ecbdb -s ours am: 506fc66f7c -s ours am: 1120050213 -s ours am: 352bcbcbc4 -s ours am: ba400e5833 -s ours 
am skip reason: contains skip directive

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

Change-Id: I279da4bda0e72ca3abfd3bfac9d41f0258e03b24
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-12 21:13:01 +00:00
Jason Chiu
0d8d11113f [automerger skipped] [RESTRICT AUTOMERGE] Replace getCallingActivity() with getLaunchedFromPackage() am: b86569b274 am: d0a4db88bb -s ours am: e0b4c24d20 -s ours am: 8e61964dec -s ours am: 23bcaf74e8 -s ours am: a01c5efd63 -s ours am: 7efa1c8090 -s ours am: 22541a8377 -s ours 
am skip reason: contains skip directive

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

Change-Id: I787f57a1c5fcc43bec4ce7e4bc41ba24f6d59192
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-12 21:12:56 +00:00
Treehugger Robot
82a0cc0a66 [automerger skipped] [RESTRICT AUTOMERGE] Merge "Replace getCallingActivity() with getLaunchedFromPackage()" into sc-v2-dev am: 324e36b19d am: a339d8ea9a am: ffb480aee4 am: ba599569fd -s ours am: ebefb83789 -s ours am: 6f4a788f83 -s ours 
am skip reason: contains skip directive

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

Change-Id: I195ad4a72331f6db710757738ea76e8af3b93516
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-12 21:12:33 +00:00
Treehugger Robot
4f57dcf811 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Replace getCallingActivity() with getLaunchedFromPackage()" into sc-dev am: 952dbb9aa3 am: d0f5ccb499 -s ours am: 20f8ad98fb -s ours am: 357d9ecbdb -s ours am: 5e90b5cfbb -s ours am: ef935895f9 -s ours am: 1fd30e8fba -s ours 
am skip reason: contains skip directive

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

Change-Id: I784fb157922ca9af5085afc9ad2063a476aa50c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-12 21:12:16 +00:00
Jason Chiu
64b83b769e [automerger skipped] [RESTRICT AUTOMERGE] Replace getCallingActivity() with getLaunchedFromPackage() am: b86569b274 am: d0a4db88bb -s ours am: e0b4c24d20 -s ours am: 8e61964dec -s ours am: 19019740e0 -s ours am: 2e2afe97df -s ours am: ebace9614a -s ours 
am skip reason: contains skip directive

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

Change-Id: Ifad6b769039877dd9b7da369ceefb55f5af6c7bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-12 21:12:12 +00:00
Treehugger Robot
174d6e7c6f [automerger skipped] [RESTRICT AUTOMERGE] Merge "Replace getCallingActivity() with getLaunchedFromPackage()" into sc-v2-dev am: 324e36b19d am: a339d8ea9a am: 9e311f362a -s ours am: 4c59ec6eaf -s ours am: 6ba7ae9d32 -s ours 
am skip reason: contains skip directive

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

Change-Id: Id16d6eaf35f7565ae6c5c5b8c996a246206455e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-12 21:11:48 +00:00
Treehugger Robot
8b3026b2b0 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Replace getCallingActivity() with getLaunchedFromPackage()" into sc-dev am: 952dbb9aa3 am: d0f5ccb499 -s ours am: 20f8ad98fb -s ours am: 357d9ecbdb -s ours am: 506fc66f7c -s ours am: 1120050213 -s ours am: 352bcbcbc4 -s ours am: e9842d18db -s ours 
am skip reason: contains skip directive

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

Change-Id: If0a54192ba44f070c8840881c6baab4f14c71fa4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-12 21:06:16 +00:00
Jason Chiu
1edc91a76b [automerger skipped] [RESTRICT AUTOMERGE] Replace getCallingActivity() with getLaunchedFromPackage() am: b86569b274 am: d0a4db88bb -s ours am: e0b4c24d20 -s ours am: 8e61964dec -s ours am: 23bcaf74e8 -s ours am: a01c5efd63 -s ours am: 7efa1c8090 -s ours am: 8666ed7ac1 -s ours 
am skip reason: contains skip directive

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

Change-Id: I4cbba462765e6a9d105658a7f1736dbc11fdfe7e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-12 21:06:13 +00:00
Treehugger Robot
915d38372e [automerger skipped] [RESTRICT AUTOMERGE] Merge "Replace getCallingActivity() with getLaunchedFromPackage()" into sc-v2-dev am: 324e36b19d am: a339d8ea9a am: ffb480aee4 am: ba599569fd -s ours am: ebefb83789 -s ours am: ebf3f4cee6 -s ours 
am skip reason: contains skip directive

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

Change-Id: Ife6447f0f469b7682b3b7cb6917175cf23ceb921
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-12 21:06:00 +00:00
Treehugger Robot
d3c697bd8d [automerger skipped] Merge "[RESTRICT AUTOMERGE] Replace getCallingActivity() with getLaunchedFromPackage()" into sc-dev am: 952dbb9aa3 am: d0f5ccb499 -s ours am: 20f8ad98fb -s ours am: 357d9ecbdb -s ours am: 5e90b5cfbb -s ours am: ef935895f9 -s ours am: b1cdb2abae -s ours 
am skip reason: contains skip directive

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

Change-Id: I6ca706c6459cb20d4b1bce3b19616566a5233884
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-12 21:05:49 +00:00
Jason Chiu
20c8698884 [automerger skipped] [RESTRICT AUTOMERGE] Replace getCallingActivity() with getLaunchedFromPackage() am: b86569b274 am: d0a4db88bb -s ours am: e0b4c24d20 -s ours am: 8e61964dec -s ours am: 19019740e0 -s ours am: 2e2afe97df -s ours am: e28d3aaa38 -s ours 
am skip reason: contains skip directive

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

Change-Id: I40e5ef30fdf63a0210b29fe69ce22f4364a5768d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-12 21:05:44 +00:00
Treehugger Robot
1d5135af02 [automerger skipped] [RESTRICT AUTOMERGE] Merge "Replace getCallingActivity() with getLaunchedFromPackage()" into sc-v2-dev am: 324e36b19d am: a339d8ea9a am: 9e311f362a -s ours am: 4c59ec6eaf -s ours am: 296a7877e9 -s ours 
am skip reason: contains skip directive

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

Change-Id: I9739896033d9ea12872a002a3bc285d1379dc0cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-12 21:05:18 +00:00
Treehugger Robot
ba400e5833 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Replace getCallingActivity() with getLaunchedFromPackage()" into sc-dev am: 952dbb9aa3 am: d0f5ccb499 -s ours am: 20f8ad98fb -s ours am: 357d9ecbdb -s ours am: 506fc66f7c -s ours am: 1120050213 -s ours am: 352bcbcbc4 -s ours 
am skip reason: contains skip directive

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

Change-Id: I5cc79f583152d2402312cf0b49de95b930db1eb3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-12 20:51:01 +00:00
Jason Chiu
22541a8377 [automerger skipped] [RESTRICT AUTOMERGE] Replace getCallingActivity() with getLaunchedFromPackage() am: b86569b274 am: d0a4db88bb -s ours am: e0b4c24d20 -s ours am: 8e61964dec -s ours am: 23bcaf74e8 -s ours am: a01c5efd63 -s ours am: 7efa1c8090 -s ours 
am skip reason: contains skip directive

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

Change-Id: I7f7368a21df5731cdafc805e7ff729c2b959d61c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-12 20:50:58 +00:00
Treehugger Robot
6f4a788f83 [automerger skipped] [RESTRICT AUTOMERGE] Merge "Replace getCallingActivity() with getLaunchedFromPackage()" into sc-v2-dev am: 324e36b19d am: a339d8ea9a am: ffb480aee4 am: ba599569fd -s ours am: ebefb83789 -s ours 
am skip reason: contains skip directive

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

Change-Id: I9f7be5961184e0d3e3495b0b38ed41827938bef2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-12 20:50:46 +00:00
Treehugger Robot
e9842d18db [automerger skipped] Merge "[RESTRICT AUTOMERGE] Replace getCallingActivity() with getLaunchedFromPackage()" into sc-dev am: 952dbb9aa3 am: d0f5ccb499 -s ours am: 20f8ad98fb -s ours am: 357d9ecbdb -s ours am: 506fc66f7c -s ours am: 1120050213 -s ours am: 352bcbcbc4 -s ours 
am skip reason: contains skip directive

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

Change-Id: I6d0339ce017b28453db66ce246b30b526fd0192b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-12 20:50:42 +00:00
Jason Chiu
8666ed7ac1 [automerger skipped] [RESTRICT AUTOMERGE] Replace getCallingActivity() with getLaunchedFromPackage() am: b86569b274 am: d0a4db88bb -s ours am: e0b4c24d20 -s ours am: 8e61964dec -s ours am: 23bcaf74e8 -s ours am: a01c5efd63 -s ours am: 7efa1c8090 -s ours 
am skip reason: contains skip directive

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

Change-Id: I3dfeaf4f28497dc5f9347a0499128a8499803e74
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-12 20:50:38 +00:00
Treehugger Robot
1fd30e8fba [automerger skipped] Merge "[RESTRICT AUTOMERGE] Replace getCallingActivity() with getLaunchedFromPackage()" into sc-dev am: 952dbb9aa3 am: d0f5ccb499 -s ours am: 20f8ad98fb -s ours am: 357d9ecbdb -s ours am: 5e90b5cfbb -s ours am: ef935895f9 -s ours 
am skip reason: contains skip directive

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

Change-Id: Idaca5e24548e72712196fc657dcb401f5022b63d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-12 20:50:37 +00:00
Jason Chiu
ebace9614a [automerger skipped] [RESTRICT AUTOMERGE] Replace getCallingActivity() with getLaunchedFromPackage() am: b86569b274 am: d0a4db88bb -s ours am: e0b4c24d20 -s ours am: 8e61964dec -s ours am: 19019740e0 -s ours am: 2e2afe97df -s ours 
am skip reason: contains skip directive

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

Change-Id: I0150ba1b5277ce7221689aaa60d719e758199b30
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-12 20:50:35 +00:00
Treehugger Robot
ebf3f4cee6 [automerger skipped] [RESTRICT AUTOMERGE] Merge "Replace getCallingActivity() with getLaunchedFromPackage()" into sc-v2-dev am: 324e36b19d am: a339d8ea9a am: ffb480aee4 am: ba599569fd -s ours am: ebefb83789 -s ours 
am skip reason: contains skip directive

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

Change-Id: I06806f376737ae09894da936a9af96815b9709a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-12 20:50:28 +00:00
Treehugger Robot
6ba7ae9d32 [automerger skipped] [RESTRICT AUTOMERGE] Merge "Replace getCallingActivity() with getLaunchedFromPackage()" into sc-v2-dev am: 324e36b19d am: a339d8ea9a am: 9e311f362a -s ours am: 4c59ec6eaf -s ours 
am skip reason: contains skip directive

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

Change-Id: I07c05e81014f6591d740a7e65ff5964437a9c060
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-12 20:50:22 +00:00