Commit Graph

123958 Commits

Author SHA1 Message Date
Weng Su
d340aa06bc Merge "String updates for hotspot speed & compatibility settings" into udc-dev am: 06f84d96cd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22607239

Change-Id: Ic404ad63856927e260bd01a077f0efc1dddc459c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-14 04:17:11 +00:00
Weng Su
06f84d96cd Merge "String updates for hotspot speed & compatibility settings" into udc-dev 2023-04-14 03:37:48 +00:00
Treehugger Robot
40ac0d5178 Merge "Fixes SelectLongPressTimeoutPreferenceControllerTest summary check." into udc-dev am: 5c8d1332c7 am: cd1a9e881e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22630556

Change-Id: I22ab9e26eea36b8fcb15dd1ac4f3c119981b0348
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-13 23:54:35 +00:00
Treehugger Robot
3c5baf76f1 Merge "Fixes SelectLongPressTimeoutPreferenceControllerTest summary check." into udc-dev am: 5c8d1332c7 am: 872336e5a5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22630556

Change-Id: I554a5639de10e868f8a6353f32e32af2c9d4bb81
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-13 23:53:20 +00:00
Treehugger Robot
872336e5a5 Merge "Fixes SelectLongPressTimeoutPreferenceControllerTest summary check." into udc-dev am: 5c8d1332c7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22630556

Change-Id: I4ee332dd0bb0e5f77eafb0bea02e85d5bd85ec43
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-13 23:25:37 +00:00
Treehugger Robot
cd1a9e881e Merge "Fixes SelectLongPressTimeoutPreferenceControllerTest summary check." into udc-dev am: 5c8d1332c7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22630556

Change-Id: If383450d47229780d21c2e6560249d0da564cbbb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-13 23:25:02 +00:00
Treehugger Robot
6065f10f11 Merge "Add dialog for enabling a provider in settings" 2023-04-13 23:24:44 +00:00
Treehugger Robot
5c8d1332c7 Merge "Fixes SelectLongPressTimeoutPreferenceControllerTest summary check." into udc-dev 2023-04-13 22:50:25 +00:00
Jay Thomas Sullivan
fa6d0031f1 [Safety Labels] Filter out auto, wear and tv
This feature should never be enabled on these form factors.

Bug: 277601279
Bug: 264939792
Test: atest CtsPermission3TestCases:SafetyLabelChangesJobServiceTest
Test: atest CtsPermission3TestCases:AppDataSharingUpdatesTest
Change-Id: I89f0443c52cfc0894f2ad5398a15f2c0e1a9ad77
2023-04-13 15:17:04 -07:00
Becca Hughes
7d407abf58 Add dialog for enabling a provider in settings
Test: manual
Bug: 277923170
Change-Id: I404444115f178faf5545dec9686096fcdfdf73de
2023-04-13 21:29:04 +00:00
Xiaozhen Lin
ef815e438b Merge "Destroy activity in onStop()" into udc-dev am: d913003d55 am: 2e070346c7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22625076

Change-Id: I15203fd935152eaeab4416e02cf525ec65cb0a51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-13 21:28:51 +00:00
Xiaozhen Lin
60e1a88005 Merge "Destroy activity in onStop()" into udc-dev am: d913003d55 am: 88ed2d9a06
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22625076

Change-Id: I39dcaaf463ae1def7131230184b4ccf7224bdd73
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-13 21:26:33 +00:00
Treehugger Robot
9953e7b60b Merge "Handle corner cases in "Alarms and Reminders" page" into udc-dev am: 3b24bafb80 am: 4abad22b60
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22609703

Change-Id: I0bb05958d8ddc954532f2fcb8a2096777680f36c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-13 21:14:25 +00:00
Treehugger Robot
b09b6eb551 Merge "Handle corner cases in "Alarms and Reminders" page" into udc-dev am: 3b24bafb80 am: cdda0b8658
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22609703

Change-Id: I0c26bb3a47410bb60981c99c1aec39d0d4a405cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-13 21:13:47 +00:00
Xiaozhen Lin
2e070346c7 Merge "Destroy activity in onStop()" into udc-dev am: d913003d55
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22625076

Change-Id: I110bfedf36fc45f838d2eb8ec416187f53b6d3ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-13 20:50:49 +00:00
Xiaozhen Lin
88ed2d9a06 Merge "Destroy activity in onStop()" into udc-dev am: d913003d55
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22625076

Change-Id: Id6ec9c3af6cea339a2fe7dc7cd6f3d69af10cc14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-13 20:48:57 +00:00
Treehugger Robot
cdda0b8658 Merge "Handle corner cases in "Alarms and Reminders" page" into udc-dev am: 3b24bafb80
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22609703

Change-Id: Icd90be5787437ba28f354fd021b7218092467681
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-13 20:48:22 +00:00
Treehugger Robot
4abad22b60 Merge "Handle corner cases in "Alarms and Reminders" page" into udc-dev am: 3b24bafb80
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22609703

Change-Id: I17b0b90258f62fa921db27d20c6db545318b2f9c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-13 20:47:26 +00:00
Xiaozhen Lin
d913003d55 Merge "Destroy activity in onStop()" into udc-dev 2023-04-13 20:45:15 +00:00
Bill Yi
4ed78b559f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c7550f62e7 -s ours am: 938a981ff6 -s ours am: c81a93c898 -s ours am: 45c919827a -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0441270cf07e787fcf5aad79b033398aa9cd81b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-13 20:13:16 +00:00
Treehugger Robot
3b24bafb80 Merge "Handle corner cases in "Alarms and Reminders" page" into udc-dev 2023-04-13 20:10:49 +00:00
Bill Yi
45951948f5 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c7550f62e7 -s ours am: 938a981ff6 -s ours am: c81a93c898 -s ours am: 6d22363f4f -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8801f6bc6716129e2e57a6483b0327498a25dd44
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-13 20:10:33 +00:00
Daniel Norman
5c6ba285b7 Fixes SelectLongPressTimeoutPreferenceControllerTest summary check.
This preference was updated in
commit 6c3805288b
to use "%s" summary and remove the controller's getSummary()
implementation so the old test that checked the controller summary
was failing.

This new version checks the preference's summary directly, but that
seems to require running using the robotest runner instead of unit test
so this test was moved there and now follows patterns used by other
similar tests there.

Fix: 278110568
Test: SelectLongPressTimeoutPreferenceControllerTest
Change-Id: Ib65c823a568ad200ebeae74ad443f32441e5cb73
2023-04-13 19:57:32 +00:00
Bill Yi
6d22363f4f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c7550f62e7 -s ours am: 938a981ff6 -s ours am: c81a93c898 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Idfe688d92a924ef5f1cbf57019c46dc5cb63d6ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-13 19:46:48 +00:00
Bill Yi
45c919827a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c7550f62e7 -s ours am: 938a981ff6 -s ours am: c81a93c898 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iaccdc66545d618abed222f15c99bf4eb5a2c653f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-13 19:29:19 +00:00
Bill Yi
c81a93c898 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c7550f62e7 -s ours am: 938a981ff6 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3c0c3db07c74f7b0c8c275cde1aa0c05ad33710b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-13 19:12:58 +00:00
Automerger Merge Worker
00ac6a4e58 Merge "Merge "Add intent for entering communal settings" into udc-dev am: 07d056f5c6 am: e7b7c8f919" 2023-04-13 18:55:32 +00:00
Lucas Silva
1196360a26 Merge "Add intent for entering communal settings" into udc-dev am: 07d056f5c6 am: 42f411984a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22597360

Change-Id: I01d239417080c6bb4c983ba2c9641f8d68fe5706
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-13 18:52:03 +00:00
Lucas Silva
2cc3078e8b Merge "Add intent for entering communal settings" into udc-dev am: 07d056f5c6 am: e7b7c8f919
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22597360

Change-Id: I562926d178074206240882885992777b7105ff03
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-13 18:50:44 +00:00
Lucas Silva
42f411984a Merge "Add intent for entering communal settings" into udc-dev am: 07d056f5c6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22597360

Change-Id: I484b4b3d5a7945b5384d022d410d0c9ee311184c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-13 18:38:21 +00:00
Lucas Silva
e7b7c8f919 Merge "Add intent for entering communal settings" into udc-dev am: 07d056f5c6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22597360

Change-Id: Ibbd51e1338a7f8f404a5bb125b968e59a70d1e7a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-13 18:35:37 +00:00
Bill Yi
68cef2d659 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: bfb5780a19 -s ours am: 7c238ffd29 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I09782da7b5e425ba1d752afbf5c75cde854f0698
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-13 18:35:27 +00:00
Bill Yi
4cd8cc1353 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 54bb26194d -s ours am: 93c4a0ac79 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib52408652bb15928322b1080f8f1d1371a32c797
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-13 18:35:16 +00:00
Bill Yi
1decbc3872 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 10284d973a -s ours am: febd455984 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5ea4a7b45591c01cd02cd358562c0e5201641a9f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-13 18:35:01 +00:00
Bill Yi
cfc9d019d8 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 38819c3840 -s ours am: ec96f6abcd -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic27939c517b85c017e94c0e5d5cd5bce4db4788b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-13 18:34:39 +00:00
Bill Yi
7d2110bd60 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 43599d0404 -s ours am: f5782293d1 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I869a4ca96467b64ae02b1f211496688fcc73774c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-13 18:34:14 +00:00
Bill Yi
e9d6836259 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 12fc7f8479 -s ours am: ea747f6325 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1ccaddc93017e6520154c0afa0c1eae8bb8cf094
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-13 18:33:56 +00:00
Bill Yi
938a981ff6 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c7550f62e7 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I08a06bda42f5180f702b93e5285c374d03606cbf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-13 18:33:28 +00:00
Lucas Silva
07d056f5c6 Merge "Add intent for entering communal settings" into udc-dev 2023-04-13 18:28:43 +00:00
Bill Yi
abb5acb64e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: bfb5780a19 -s ours am: 2e834a8f88 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia8033beeeacb141a74a0abd88fa6c5d6a16de2e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-13 18:19:31 +00:00
Bill Yi
6da36b9a3c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 54bb26194d -s ours am: 6783da78de -s ours
am skip reason: subject contains skip directive

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

Change-Id: I33a4904f028430d5379ad1b748d6bd6762c468c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-13 18:19:29 +00:00
Bill Yi
31524bfa5d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 10284d973a -s ours am: 154e826ae6 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I191fa43141453f3b97849cec8866042f7238b6f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-13 18:19:27 +00:00
Bill Yi
0fe80ba5df [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 38819c3840 -s ours am: 23cddc9689 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8e6189a38cc6abb6e787c74012189fa76bf949f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-13 18:19:25 +00:00
Bill Yi
179a70774e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 43599d0404 -s ours am: f6e56e7ad3 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iae2f571dbe7e670909401af72a6d2000fdd1af9e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-13 18:19:23 +00:00
Bill Yi
d6df69fbad [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 12fc7f8479 -s ours am: a60ca8c201 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9a33c149147154f85a8a36dc240569ec6341ceae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-13 18:17:36 +00:00
Bill Yi
2e834a8f88 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: bfb5780a19 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I512b398134c74e19705ddeeaed1f4f8709a7206a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-13 18:09:15 +00:00
Bill Yi
6783da78de [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 54bb26194d -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iefc6632a3603279a0bcef3af6409d58ee9972f5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-13 18:09:11 +00:00
Bill Yi
154e826ae6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 10284d973a -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9f7a39e56745b0e1bb6ca44dad6ff56067772355
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-13 18:09:08 +00:00
Bill Yi
23cddc9689 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 38819c3840 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ibf8617bcada40ca4924dd6f6b7cc19f3d647703c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-13 18:08:52 +00:00
Bill Yi
f6e56e7ad3 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 43599d0404 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4ff77937dabcca782b6c8a54138a0c742f868f21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-13 18:08:34 +00:00