Commit Graph

123488 Commits

Author SHA1 Message Date
Treehugger Robot
c446430a32 Merge "Add text for T-QPR3 to udc branch first." into udc-dev am: a9469717a0 am: a730043c30
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22645641

Change-Id: Iea94ee7ef2367fe521d34e6256408a9d109a0ccd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-14 15:29:47 +00:00
Treehugger Robot
a730043c30 Merge "Add text for T-QPR3 to udc branch first." into udc-dev am: a9469717a0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22645641

Change-Id: Ide7e637a22738df81521877b246c83f32ad3d3b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-14 15:02:00 +00:00
Treehugger Robot
a9469717a0 Merge "Add text for T-QPR3 to udc branch first." into udc-dev 2023-04-14 14:27:41 +00:00
Kweku Adams
f39b99a6e7 Merge "Hide TARE page when disabled." into udc-dev am: 21b9d15cd6 am: a3b109b4b4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22384966

Change-Id: Id5333c396c27b00634f137cb0f665e43681497b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-14 14:19:48 +00:00
Kweku Adams
942cf5f7a5 Merge "Hide TARE page when disabled." into udc-dev am: 21b9d15cd6 am: aca72e46ac
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22384966

Change-Id: I58567babaa879f36b37459648376530a822e7d8e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-14 14:16:03 +00:00
Kweku Adams
aca72e46ac Merge "Hide TARE page when disabled." into udc-dev am: 21b9d15cd6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22384966

Change-Id: I36c2a77073053fb667fea187930a1d369cebd9ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-14 13:51:22 +00:00
Kweku Adams
a3b109b4b4 Merge "Hide TARE page when disabled." into udc-dev am: 21b9d15cd6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22384966

Change-Id: I6c672e16cd89d0878e1a2d6f975102bdc22f5a8c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-14 13:51:19 +00:00
Kweku Adams
21b9d15cd6 Merge "Hide TARE page when disabled." into udc-dev 2023-04-14 13:20:06 +00:00
Bill Lin
53c440bc6f Merge "Remove onWindowFocusChange solution from FPS enrollment" into udc-dev am: f77643bec7 am: 6934169f4f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22613586

Change-Id: I43fbf41fff38668597044bd0326a6e446fa80b68
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-14 10:31:11 +00:00
Jason Hsu
6b759cc169 Merge "Add ability to handle onActivityResult for AbstractPreferenceController in DashboardFragment" into udc-dev am: 32614f2b52 am: e01555de5f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22477522

Change-Id: I5047e1dcab52594f2fd9d2683499f886391cceaf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-14 10:31:01 +00:00
Bill Lin
ff899ca4b8 Merge "Remove onWindowFocusChange solution from FPS enrollment" into udc-dev am: f77643bec7 am: eeef3fd175
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22613586

Change-Id: I6305a980e72021ff87dfc5d327ebd202bcdb9892
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-14 10:30:14 +00:00
Jason Hsu
f7d03652eb Merge "Add ability to handle onActivityResult for AbstractPreferenceController in DashboardFragment" into udc-dev am: 32614f2b52 am: 566f5b5316
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22477522

Change-Id: I798d3c787fbe6d7b47265f22b4e01dfef145205b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-14 10:30:01 +00:00
Automerger Merge Worker
ba50745e91 Merge changes from topic "am-cc328bbc5f954895bff2984bd1c3911b"
* changes:
  [automerger skipped] Merge "[RESTRICT AUTOMERGE] Force enabling Notes role from developer options affects all users." into udc-dev am: cd0176ba92 am: 97f0292aa4 -s ours
  [automerger skipped] [RESTRICT AUTOMERGE] Force enabling Notes role from developer options affects all users. am: a1b7888c30 am: b7a36ed2ff -s ours
2023-04-14 10:28:41 +00:00
Vania Januar
681558148e [automerger skipped] Merge "[RESTRICT AUTOMERGE] Force enabling Notes role from developer options affects all users." into udc-dev am: cd0176ba92 am: 97f0292aa4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I93fb04c945bf9e23ffd9966ab9ecef02e716031e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-14 10:28:31 +00:00
Vania Januar
9f054ff8bc [automerger skipped] Merge "[RESTRICT AUTOMERGE] Force enabling Notes role from developer options affects all users." into udc-dev am: cd0176ba92 am: 62bfb52110 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iaa65433185a8df1fdfb325b99c25593e5e1b00a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-14 10:27:15 +00:00
Vania Januar
ef4aab5b47 [automerger skipped] [RESTRICT AUTOMERGE] Force enabling Notes role from developer options affects all users. am: a1b7888c30 am: 95949527e3 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I80b2d45d482576b006425b10998777bcf89b017d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-14 10:27:09 +00:00
Vania Januar
51e8affa61 [automerger skipped] [RESTRICT AUTOMERGE] Force enabling Notes role from developer options affects all users. am: a1b7888c30 am: b7a36ed2ff -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1efb2abc17cb7f9c691230508b4bb0a0c8899a10
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-14 10:27:04 +00:00
Bill Lin
6934169f4f Merge "Remove onWindowFocusChange solution from FPS enrollment" into udc-dev am: f77643bec7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22613586

Change-Id: I82ebead89323f9092d6e5b38c3ba00a264b1eccd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-14 10:03:17 +00:00
Jason Hsu
e01555de5f Merge "Add ability to handle onActivityResult for AbstractPreferenceController in DashboardFragment" into udc-dev am: 32614f2b52
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22477522

Change-Id: I14a9a8369e45788087da4901087eab7198176acc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-14 10:03:08 +00:00
Bill Lin
eeef3fd175 Merge "Remove onWindowFocusChange solution from FPS enrollment" into udc-dev am: f77643bec7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22613586

Change-Id: I8fe81ec30aeb71335673d1f689bec1f836b98c40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-14 10:02:56 +00:00
Jason Hsu
566f5b5316 Merge "Add ability to handle onActivityResult for AbstractPreferenceController in DashboardFragment" into udc-dev am: 32614f2b52
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22477522

Change-Id: I087e75295f6a068f0bebec388dacdb6b2791f808
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-14 10:02:45 +00:00
Vania Januar
97f0292aa4 Merge "[RESTRICT AUTOMERGE] Force enabling Notes role from developer options affects all users." into udc-dev am: cd0176ba92
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22598718

Change-Id: Id9e078743fc3e3f4ca8ca2a44646079123bafa9c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-14 10:02:42 +00:00
Vania Januar
b7a36ed2ff [RESTRICT AUTOMERGE] Force enabling Notes role from developer options affects all users. am: a1b7888c30
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22598718

Change-Id: I5404a919e2ae65c76a8de8313719b09ca44ab193
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-14 10:02:40 +00:00
Vania Januar
62bfb52110 Merge "[RESTRICT AUTOMERGE] Force enabling Notes role from developer options affects all users." into udc-dev am: cd0176ba92
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22598718

Change-Id: I5f3665a9819bc5396c6e4d766141e84a1758d1f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-14 10:01:25 +00:00
Vania Januar
95949527e3 [RESTRICT AUTOMERGE] Force enabling Notes role from developer options affects all users. am: a1b7888c30
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22598718

Change-Id: I10e4a216cef5762ccfdc37bf196c13aa9c65faba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-14 09:59:25 +00:00
Bill Lin
f77643bec7 Merge "Remove onWindowFocusChange solution from FPS enrollment" into udc-dev 2023-04-14 09:45:42 +00:00
Jason Hsu
32614f2b52 Merge "Add ability to handle onActivityResult for AbstractPreferenceController in DashboardFragment" into udc-dev 2023-04-14 09:42:43 +00:00
Vania Januar
cd0176ba92 Merge "[RESTRICT AUTOMERGE] Force enabling Notes role from developer options affects all users." into udc-dev 2023-04-14 09:25:10 +00:00
Vania Januar
11603c5be9 Merge "Force enabling Notes role from developer options affects all users." 2023-04-14 09:24:44 +00:00
Zaiyue Xue
e8e353130f Add text for T-QPR3 to udc branch first.
The text is used in ag/22635696. Add it to udc is make it to be
translated fast.

Bug: 278022447
Test: presbumit
Change-Id: I065c2c13c6967cabc3c46888d2a93a11f5ceffa5
2023-04-14 16:02:49 +08:00
Automerger Merge Worker
f4efa80c66 Merge "Merge "String updates for hotspot speed & compatibility settings" into udc-dev am: 06f84d96cd am: 3e4fe73001" 2023-04-14 04:46:12 +00:00
Weng Su
dc078887f2 Merge "String updates for hotspot speed & compatibility settings" into udc-dev am: 06f84d96cd am: 3e4fe73001
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22607239

Change-Id: Ic0133b81d5cc2abbe74cb9c02b31871479ff6e4d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-14 04:44:59 +00:00
Weng Su
a1320a06cb Merge "String updates for hotspot speed & compatibility settings" into udc-dev am: 06f84d96cd am: d340aa06bc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22607239

Change-Id: I3a8b33d391d45ef3a5b6450c46e1f2eb4c193551
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-14 04:44:51 +00:00
Weng Su
3e4fe73001 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: Iffc473382077dbcdf9cf817b1e99381e431825d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-14 04:17:12 +00:00
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
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