Commit Graph

125324 Commits

Author SHA1 Message Date
Automerger Merge Worker
48e7fe9878 Merge "Merge "Disable dreams home controls button when disabled on lockscreen." into udc-dev am: 5bce93eb17 am: 975b03405f am: 848c4689b7" into udc-qpr-dev-plus-aosp 2023-05-22 22:34:32 +00:00
Lucas Silva
730c0f020c Merge "Disable dreams home controls button when disabled on lockscreen." into udc-dev am: 5bce93eb17 am: 975b03405f am: 848c4689b7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23321459

Change-Id: I3c391c7c90ae8b4a1ed4f68559106a777062dc4d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-22 22:34:26 +00:00
Lucas Silva
bb52658b8f Merge "Disable dreams home controls button when disabled on lockscreen." into udc-dev am: 5bce93eb17 am: 2611253691 am: 2190ead573
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23321459

Change-Id: I8fd832022e265f8a1cf3a4a58c38f1d90c06ecf0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-22 22:34:15 +00:00
Lucas Silva
04564ec935 Merge "Disable dreams home controls button when disabled on lockscreen." into udc-dev am: 5bce93eb17 am: 2611253691 am: 308d4f1e46
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23321459

Change-Id: I30f062e5f81b74030a69a6762f7a79e3dea671f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-22 22:28:41 +00:00
Lucas Silva
2190ead573 Merge "Disable dreams home controls button when disabled on lockscreen." into udc-dev am: 5bce93eb17 am: 2611253691
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23321459

Change-Id: I4ae13573dd8858c2f121bbcc859488601eae7c41
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-22 21:52:02 +00:00
Lucas Silva
848c4689b7 Merge "Disable dreams home controls button when disabled on lockscreen." into udc-dev am: 5bce93eb17 am: 975b03405f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23321459

Change-Id: Idea1eab3f671c243553ae587bb19d15d59d05c30
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-22 21:51:53 +00:00
Lucas Silva
308d4f1e46 Merge "Disable dreams home controls button when disabled on lockscreen." into udc-dev am: 5bce93eb17 am: 2611253691
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23321459

Change-Id: Idf7390468792fca7dd34d53efd964580ec5c4567
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-22 21:47:12 +00:00
Lucas Silva
2611253691 Merge "Disable dreams home controls button when disabled on lockscreen." into udc-dev am: 5bce93eb17
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23321459

Change-Id: I05815946cd5be092dbba4767bb9e855e81060ccd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-22 21:08:59 +00:00
Lucas Silva
975b03405f Merge "Disable dreams home controls button when disabled on lockscreen." into udc-dev am: 5bce93eb17
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23321459

Change-Id: Ibd8e11b0cd11ff6ecb17a5b71ae8895e850d5b12
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-22 21:04:21 +00:00
Lucas Silva
5bce93eb17 Merge "Disable dreams home controls button when disabled on lockscreen." into udc-dev 2023-05-22 20:35:16 +00:00
Aleksandar Kiridžić
4e6e88db06 Merge "speech: Remove hard-coded preference key from the controllers" into udc-dev am: bcae90c372 am: b5d3fc5b53 am: 44424b462f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23353398

Change-Id: Ic81b6cb27960a5dc7489e46b20b35976c17d8438
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-22 18:14:37 +00:00
Aleksandar Kiridžić
8ae957a01f Merge "speech: Remove hard-coded preference key from the controllers" into udc-dev am: bcae90c372 am: 24428d1863 am: 6ec7ba0d5b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23353398

Change-Id: I6242ecf35153249351a12dd69e0b26a183fe90e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-22 18:13:09 +00:00
Aleksandar Kiridžić
7e1738c7d1 Merge "speech: Remove hard-coded preference key from the controllers" into udc-dev am: bcae90c372 am: 24428d1863 am: f7e3a2ce45
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23353398

Change-Id: Ic28a59464195632f377ccbfe0be9b6719e156dde
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-22 17:13:11 +00:00
Aleksandar Kiridžić
44424b462f Merge "speech: Remove hard-coded preference key from the controllers" into udc-dev am: bcae90c372 am: b5d3fc5b53
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23353398

Change-Id: Ic28dd33174b358c63e8f286fe02d594c5697c9c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-22 16:40:50 +00:00
Aleksandar Kiridžić
f7e3a2ce45 Merge "speech: Remove hard-coded preference key from the controllers" into udc-dev am: bcae90c372 am: 24428d1863
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23353398

Change-Id: I3cc5b8b385eec247439716393f438543b41f48ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-22 16:40:14 +00:00
Aleksandar Kiridžić
6ec7ba0d5b Merge "speech: Remove hard-coded preference key from the controllers" into udc-dev am: bcae90c372 am: 24428d1863
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23353398

Change-Id: I88e5b182e607e9b6cd5a8caafd38cd607ec4fbff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-22 16:37:25 +00:00
Aleksandar Kiridžić
b5d3fc5b53 Merge "speech: Remove hard-coded preference key from the controllers" into udc-dev am: bcae90c372
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23353398

Change-Id: I78b084b6a61b579ec92c183463dde22f44367bbc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-22 16:13:19 +00:00
Aleksandar Kiridžić
24428d1863 Merge "speech: Remove hard-coded preference key from the controllers" into udc-dev am: bcae90c372
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23353398

Change-Id: I147940935719c7baa482fa6f9b8a0111d4bdb4ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-22 16:12:09 +00:00
Behnam Heydarshahi
c37f6de459 Merge "Remove volume_separate_notification flag" into udc-dev am: 7aa8424cc0 am: 66dd57ea6e am: 2ba634defc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23244447

Change-Id: If89d6b326175692308d94d1d39ea49b836a440c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-22 15:48:45 +00:00
Aleksandar Kiridžić
bcae90c372 Merge "speech: Remove hard-coded preference key from the controllers" into udc-dev 2023-05-22 15:40:08 +00:00
Behnam Heydarshahi
2dc515803c Merge "Remove volume_separate_notification flag" into udc-dev am: 7aa8424cc0 am: 66dd57ea6e am: afa72d6f3b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23244447

Change-Id: Ia240bbebe36b61adf1b731780fa746eea0f2936f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-22 15:17:34 +00:00
Behnam Heydarshahi
3f1f842250 Merge "Remove volume_separate_notification flag" into udc-dev am: 7aa8424cc0 am: 2aecb2f1ea am: ffbc25e249
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23244447

Change-Id: I2fe0b29add60d26dab32d142d970f2ee3ad7781c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-22 15:17:18 +00:00
Behnam Heydarshahi
2ba634defc Merge "Remove volume_separate_notification flag" into udc-dev am: 7aa8424cc0 am: 66dd57ea6e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23244447

Change-Id: I7321e1606c81be721525e9d616587b9a026722df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-22 15:16:05 +00:00
Behnam Heydarshahi
afa72d6f3b Merge "Remove volume_separate_notification flag" into udc-dev am: 7aa8424cc0 am: 66dd57ea6e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23244447

Change-Id: Idb89740bd368bae7f53f787159d0c0e3953e8ce3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-22 15:13:26 +00:00
Behnam Heydarshahi
66dd57ea6e Merge "Remove volume_separate_notification flag" into udc-dev am: 7aa8424cc0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23244447

Change-Id: Ie146780b807211d786039a5d022d3be8246616e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-22 14:49:15 +00:00
Behnam Heydarshahi
ffbc25e249 Merge "Remove volume_separate_notification flag" into udc-dev am: 7aa8424cc0 am: 2aecb2f1ea
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23244447

Change-Id: I70ddbb0ecd7a1553a8d07b3ee47c305399edeb58
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-22 14:48:56 +00:00
Behnam Heydarshahi
2aecb2f1ea Merge "Remove volume_separate_notification flag" into udc-dev am: 7aa8424cc0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23244447

Change-Id: I6798c7a2e2020eb1ca4dbe6dbf1cb7ccc50a76b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-22 14:21:55 +00:00
Behnam Heydarshahi
7aa8424cc0 Merge "Remove volume_separate_notification flag" into udc-dev 2023-05-22 14:09:22 +00:00
Lex Huang
6e256487b3 Merge "Fix ActivityNotFoundException" into udc-qpr-dev am: ebab5f6e38
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23352276

Change-Id: I2e1f9cbb5f54b38d3f4c29ca903569e13adc71ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-22 07:04:42 +00:00
Lex Huang
ebab5f6e38 Merge "Fix ActivityNotFoundException" into udc-qpr-dev 2023-05-22 06:51:08 +00:00
Treehugger Robot
8cef9b67aa Merge "Add Battery Information page" into udc-qpr-dev am: 097cd12494
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23341380

Change-Id: I05066578eb368867fb1eab3c6f8913973c1a5375
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-22 02:06:56 +00:00
Treehugger Robot
097cd12494 Merge "Add Battery Information page" into udc-qpr-dev 2023-05-22 01:34:11 +00:00
Himanshu Gupta
40ff85836a Merge "Clearing obsolete cloneUserId from CloneBackend." into udc-dev am: 4740720948 am: af793d86f2 am: 40dd0958d6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23262239

Change-Id: I074ba380be18c1116696b3f0bcb7c3c2ad3a47c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-19 22:24:44 +00:00
Himanshu Gupta
86cad961c6 Merge "Clearing obsolete cloneUserId from CloneBackend." into udc-dev am: 4740720948 am: 59651f68af am: 29bc3c491f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23262239

Change-Id: I46187296224ca51abf6fd0b5ada01710b558f360
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-19 22:22:55 +00:00
Himanshu Gupta
4af03a6f78 Merge "Clearing obsolete cloneUserId from CloneBackend." into udc-dev am: 4740720948 am: af793d86f2 am: 783069217f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23262239

Change-Id: Ie7f04734dbac25664efb106bbd6ba47bb1fca2de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-19 22:22:39 +00:00
Himanshu Gupta
29bc3c491f Merge "Clearing obsolete cloneUserId from CloneBackend." into udc-dev am: 4740720948 am: 59651f68af
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23262239

Change-Id: Ic1d0bb036477f0246a1c7813255f5053fafecff6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-19 22:02:18 +00:00
Himanshu Gupta
40dd0958d6 Merge "Clearing obsolete cloneUserId from CloneBackend." into udc-dev am: 4740720948 am: af793d86f2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23262239

Change-Id: I6a6b1f0824fefb1ec12cc61dda3c2b550d8fb072
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-19 21:56:28 +00:00
Himanshu Gupta
783069217f Merge "Clearing obsolete cloneUserId from CloneBackend." into udc-dev am: 4740720948 am: af793d86f2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23262239

Change-Id: Id0c01cecf1b24afea3f07a7395217b656a91a512
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-19 21:54:28 +00:00
Himanshu Gupta
59651f68af Merge "Clearing obsolete cloneUserId from CloneBackend." into udc-dev am: 4740720948
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23262239

Change-Id: Ie4a5bcf554ab4bc20acc00e868c79ac5a54320c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-19 21:15:21 +00:00
Himanshu Gupta
af793d86f2 Merge "Clearing obsolete cloneUserId from CloneBackend." into udc-dev am: 4740720948
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23262239

Change-Id: I5afbb8497652ad9e61af90617d0f5ed8e35c8a5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-19 21:12:35 +00:00
Himanshu Gupta
4740720948 Merge "Clearing obsolete cloneUserId from CloneBackend." into udc-dev 2023-05-19 20:28:36 +00:00
Aleksandar Kiridzic
30fd927eba speech: Remove hard-coded preference key from the controllers
OnDeviceRecognitionPreferenceController and TtsPreferenceController
had their preference keys hard-coded which was breaking
AccessibilitySettingsTest. The key is now left to be read
from the super constructor.

Bug: 283449837
Test: Manual, already existing robotests
Change-Id: Ibe11a2134fffea0a081ca9f5e2f9441911574efa
2023-05-19 21:11:19 +01:00
Nicolas Sleiman
6fa4152f4c Merge "Remove GET_ACTIVITIES in InteractAcrossProfiles in Settings" into udc-dev am: 03e8dbca58 am: 008a5b24b5 am: 9ddce7322c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23347979

Change-Id: Ifeb050cb19fc5e8d2df60ebf1385ee04e1a83464
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-19 16:55:46 +00:00
Ankita Vyas
38eb3b4d1b Merge "Remove GET_ACTIVITIES flag while fetching installed apps from package manager." into udc-dev am: 96cff64862 am: 915741a00d am: 94864ce36d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23343098

Change-Id: I35e0650d865ca1aa662cd33fa58e1db10bc68a33
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-19 16:55:39 +00:00
Nicolas Sleiman
d422c5a1b2 Merge "Remove GET_ACTIVITIES in InteractAcrossProfiles in Settings" into udc-dev am: 03e8dbca58 am: 123fa6ae78 am: 60e25e30e1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23347979

Change-Id: I553522d7f912aa488da9833fa3df2961571c6268
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-19 16:55:26 +00:00
Ankita Vyas
6cb3ea6a19 Merge "Remove GET_ACTIVITIES flag while fetching installed apps from package manager." into udc-dev am: 96cff64862 am: 8053e9da26 am: 2af208be41
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23343098

Change-Id: Id544df727dc353bea4a9df84702a5a5ea76008be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-19 16:54:52 +00:00
Nicolas Sleiman
d8efa40d2c Merge "Remove GET_ACTIVITIES in InteractAcrossProfiles in Settings" into udc-dev am: 03e8dbca58 am: 123fa6ae78 am: 122806ad50
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23347979

Change-Id: Ief3c1ed6340528399883ab09567e2fbe6fd9ee10
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-19 16:20:24 +00:00
Ankita Vyas
fbb0a74bd3 Merge "Remove GET_ACTIVITIES flag while fetching installed apps from package manager." into udc-dev am: 96cff64862 am: 8053e9da26 am: 01fca127fb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23343098

Change-Id: I512cd9e19bab6c4fb08344a4f27bc776b18fe473
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-19 16:20:09 +00:00
Treehugger Robot
bd47587e8b Merge "Add a new feature provider for Battery info page" into udc-qpr-dev am: 70c89004ee
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23308379

Change-Id: I45e4b2f609ced644754410db120e5cd25ad5b6f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-19 16:18:59 +00:00
Nicolas Sleiman
9ddce7322c Merge "Remove GET_ACTIVITIES in InteractAcrossProfiles in Settings" into udc-dev am: 03e8dbca58 am: 008a5b24b5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23347979

Change-Id: I5474df25774da24adf42f2b35d6e46915d1cfb67
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-19 16:18:16 +00:00