Commit Graph

123099 Commits

Author SHA1 Message Date
Chris Antol
2153e884b5 Merge "Update Settings owners list" am: 8bf186bcf8 am: 4e2050a17d am: 626dff2398 am: a9a10fcb2c am: 815cd3e08d
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2528132

Change-Id: I74b05123b91fec15a79a0250197faa22e1606868
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-11 04:07:21 +00:00
Chris Antol
815cd3e08d Merge "Update Settings owners list" am: 8bf186bcf8 am: 4e2050a17d am: 626dff2398 am: a9a10fcb2c
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2528132

Change-Id: I11cdc830976f9038d1fbb54be7c6a7f4b8aeeed2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-11 03:39:03 +00:00
Treehugger Robot
bc49f3f846 Merge "Fix broken settings intent CTS test" into udc-dev am: c46dce4705 am: e0d0c22bd4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22339503

Change-Id: I48589acb44a673cebf5f238ce971178a36cd8125
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-11 03:23:19 +00:00
Chris Antol
1cc11fe9b9 Merge "Update Settings owners list" am: 8bf186bcf8 am: 4e2050a17d am: 626dff2398 am: a9a10fcb2c am: 5449286f02
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2528132

Change-Id: I0adb265e443629bbb52c1aa5bc6161ba8a4aa09a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-11 02:51:44 +00:00
Treehugger Robot
c30dda6d2e Merge "Fix broken settings intent CTS test" into udc-dev am: c46dce4705 am: c544fffc48
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22339503

Change-Id: I1a438481ce0f23cc1d6d16c564c4be7fa8cef8c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-11 02:51:16 +00:00
Chris Antol
5449286f02 Merge "Update Settings owners list" am: 8bf186bcf8 am: 4e2050a17d am: 626dff2398 am: a9a10fcb2c
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2528132

Change-Id: I98b5f66511953e7040f4491d35239287fc29d4f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-11 02:42:39 +00:00
Treehugger Robot
e0d0c22bd4 Merge "Fix broken settings intent CTS test" into udc-dev am: c46dce4705
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22339503

Change-Id: I6b71118f687067cdd882f9c83cc00477c69ba446
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-11 02:39:10 +00:00
Treehugger Robot
c544fffc48 Merge "Fix broken settings intent CTS test" into udc-dev am: c46dce4705
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22339503

Change-Id: Ic6d758791b7853dee0ef7431e682409bc26f6e0e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-11 02:15:28 +00:00
Chris Antol
a9a10fcb2c Merge "Update Settings owners list" am: 8bf186bcf8 am: 4e2050a17d am: 626dff2398
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2528132

Change-Id: I9004b6f0cd1cac6d242906378737072e76e6bac2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-11 01:53:33 +00:00
Treehugger Robot
c46dce4705 Merge "Fix broken settings intent CTS test" into udc-dev 2023-04-11 01:44:55 +00:00
Chris Antol
626dff2398 Merge "Update Settings owners list" am: 8bf186bcf8 am: 4e2050a17d
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2528132

Change-Id: I67b9db14578c047f5a73e8c5fd975e0e8e955eb9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-11 01:21:15 +00:00
Chris Antol
4e2050a17d Merge "Update Settings owners list" am: 8bf186bcf8
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2528132

Change-Id: Ia2be910bc9aa3bf6d693f6012eeae94a51e27d64
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-11 00:50:30 +00:00
Chris Antol
8bf186bcf8 Merge "Update Settings owners list" 2023-04-11 00:03:40 +00:00
Chris Antol
b5237e60d8 Update Settings owners list
Change-Id: If950f63c65ecc6313f7096c94c3a5a9bb48be529
2023-04-10 22:57:24 +00:00
Randy Pfohl
99db040254 Merge "adding new animation to be used when gesture tutorial package is available" into udc-dev am: 00d12bbe22 am: dbf2c7c3e5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22387145

Change-Id: Ie01a45c183015546aa2e6da14572179f73ad9287
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-10 20:25:39 +00:00
Hao Dong
430eba040c Merge "Show a dialog preventing face enrollment in split mode." into udc-dev am: 22c608be4d am: dbbc97700e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22460413

Change-Id: I371cb2b04e2833582bcbf4542752e4adf0bbfde8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-10 20:19:54 +00:00
Randy Pfohl
701fb33e84 Merge "adding new animation to be used when gesture tutorial package is available" into udc-dev am: 00d12bbe22 am: 44d9d4d396
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22387145

Change-Id: Ief4f67edd4b8fd9124a5908cdff1f433639a4049
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-10 20:19:30 +00:00
Randy Pfohl
44d9d4d396 Merge "adding new animation to be used when gesture tutorial package is available" into udc-dev am: 00d12bbe22
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22387145

Change-Id: Ia44f66ff64c04d4666938fa4bec16c753a716fc9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-10 20:07:57 +00:00
Randy Pfohl
dbf2c7c3e5 Merge "adding new animation to be used when gesture tutorial package is available" into udc-dev am: 00d12bbe22
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22387145

Change-Id: I970939b9d01cc93482704443877952b00deeca82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-10 20:07:35 +00:00
Randy Pfohl
00d12bbe22 Merge "adding new animation to be used when gesture tutorial package is available" into udc-dev 2023-04-10 19:47:27 +00:00
Hao Dong
40d69e3ce5 Merge "Show a dialog preventing face enrollment in split mode." into udc-dev am: 22c608be4d am: a27d94d75d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22460413

Change-Id: I25f7d00d306b00b1c144d4f1e12478d3276f379d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-10 19:45:32 +00:00
Hao Dong
a27d94d75d Merge "Show a dialog preventing face enrollment in split mode." into udc-dev am: 22c608be4d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22460413

Change-Id: I2c0b2bf9d57fbe518e14f2a9b30e3044be89011f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-10 19:38:02 +00:00
Hao Dong
dbbc97700e Merge "Show a dialog preventing face enrollment in split mode." into udc-dev am: 22c608be4d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22460413

Change-Id: I751be0db204e733bc6bbe7fab7ef38d193351fad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-10 19:36:03 +00:00
Hao Dong
22c608be4d Merge "Show a dialog preventing face enrollment in split mode." into udc-dev 2023-04-10 18:58:27 +00:00
Becca Hughes
20cb8478d4 Fix broken settings intent CTS test
We originally added this data field to the SYNC_SETTINGS intent as a backup but since we have our own and this is breaking CTS. This reverts that change.

Test: make & CTS
Bug: 275385380
Change-Id: I0da949e4adea9c3c8dfdb61017afe6908e72147c
2023-04-10 16:03:27 +00:00
Automerger Merge Worker
5041611155 Merge "Merge "Add manual enabled battery saver reason (2/4)" into udc-dev am: c429ca3e2f am: 9dd71326dd" 2023-04-10 15:10:53 +00:00
YK Hung
ae6a08b176 Merge "Add manual enabled battery saver reason (2/4)" into udc-dev am: c429ca3e2f am: 9dd71326dd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22504367

Change-Id: I32193af52903475dcf7f93f2cc6e4e82ca791707
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-10 15:10:26 +00:00
YK Hung
f04643899b Merge "Add manual enabled battery saver reason (2/4)" into udc-dev am: c429ca3e2f am: 1b6cc404ad
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22504367

Change-Id: If95959e18a99f846a44ed2996aa3f31ac979ceba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-10 15:10:14 +00:00
YK Hung
1b6cc404ad Merge "Add manual enabled battery saver reason (2/4)" into udc-dev am: c429ca3e2f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22504367

Change-Id: Ibe9bb0e826c0dc55e260b8068237c7ea2b32b19c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-10 14:42:10 +00:00
YK Hung
9dd71326dd Merge "Add manual enabled battery saver reason (2/4)" into udc-dev am: c429ca3e2f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22504367

Change-Id: If863d983c5f72cca4ae6a4c7c6afb47239f3be3b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-10 14:41:50 +00:00
YK Hung
c429ca3e2f Merge "Add manual enabled battery saver reason (2/4)" into udc-dev 2023-04-10 14:03:33 +00:00
Daniel Huang
446ddf0e9e Merge "Touchpad settings' icons update" into udc-dev am: 3f16621b86 am: 2c2e65bd1d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22525947

Change-Id: I8a1102b3b9b95f513e86cb629d08d43609eed7a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-10 08:04:57 +00:00
Daniel Huang
efeacacc7a Merge "Touchpad settings' icons update" into udc-dev am: 3f16621b86 am: 4e0371303b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22525947

Change-Id: If30278d699e731f502ee9379e032b1640e6c9f38
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-10 08:04:52 +00:00
Treehugger Robot
deb61df42d Merge "Ignore ActivityNotFoundException from app launch" into udc-dev am: 35f9d486a5 am: 8b3797727f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22347563

Change-Id: I8ee77e14c956f424ec710fc71c5d225485bce9d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-10 08:04:42 +00:00
Treehugger Robot
825450f1b8 Merge "Ignore ActivityNotFoundException from app launch" into udc-dev am: 35f9d486a5 am: 227b55d8c1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22347563

Change-Id: I442e08f1badd0ff0570df968a683c0b2228bb177
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-10 08:04:09 +00:00
Daniel Huang
4e0371303b Merge "Touchpad settings' icons update" into udc-dev am: 3f16621b86
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22525947

Change-Id: I27db019a7dbf1a237969a92969848d6ec13acd93
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-10 07:38:04 +00:00
Daniel Huang
2c2e65bd1d Merge "Touchpad settings' icons update" into udc-dev am: 3f16621b86
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22525947

Change-Id: I5687f6c9827a34405ca1be4b5fdb452596e4e372
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-10 07:38:02 +00:00
Treehugger Robot
227b55d8c1 Merge "Ignore ActivityNotFoundException from app launch" into udc-dev am: 35f9d486a5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22347563

Change-Id: I74fb50dc30c19c233c68856f65c248f5ed7cc552
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-10 07:37:21 +00:00
Treehugger Robot
8b3797727f Merge "Ignore ActivityNotFoundException from app launch" into udc-dev am: 35f9d486a5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22347563

Change-Id: I812e4a865730a1d45bde9ae9f500b990e0d0c6d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-10 07:37:18 +00:00
Daniel Huang
3f16621b86 Merge "Touchpad settings' icons update" into udc-dev 2023-04-10 06:49:06 +00:00
Treehugger Robot
35f9d486a5 Merge "Ignore ActivityNotFoundException from app launch" into udc-dev 2023-04-10 06:48:17 +00:00
danielwbhuang
eaa6a03d65 Touchpad settings' icons update
Two icons need to be updated:
1. The touchpad speed setting inside of the touchpad settings
2. The bottom right tap setting inside of the touchpad settings

https://screenshot.googleplex.com/5QKLTwX8qNrnRsj.png
https://screenshot.googleplex.com/7iHNKwzwAZm5h8N.png

Bug: 269100659
Test: manual
Change-Id: I776e94325b1f54475f406a2fe11c4db4a0205f40
2023-04-10 06:35:24 +00:00
Automerger Merge Worker
9c9c55d24d Merge "Merge "Make all sim list by ordering with slot id" into udc-dev am: 5240d251e1 am: f1a1637563" 2023-04-10 05:09:28 +00:00
Tom Hsu
19e2638508 Merge "Make all sim list by ordering with slot id" into udc-dev am: 5240d251e1 am: f1a1637563
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22530782

Change-Id: I747487bb847adc2919093a454878e8cbf7309d72
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-10 05:07:30 +00:00
Tom Hsu
da4c334402 Merge "Make all sim list by ordering with slot id" into udc-dev am: 5240d251e1 am: 09238601fa
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22530782

Change-Id: Ic5172c0baf7e91ebcbcbea5bfeb5ffce457a7e1c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-10 05:07:22 +00:00
Tom Hsu
09238601fa Merge "Make all sim list by ordering with slot id" into udc-dev am: 5240d251e1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22530782

Change-Id: I6892186990d8ec5676759a6f073357d446b0c533
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-10 04:39:34 +00:00
Tom Hsu
f1a1637563 Merge "Make all sim list by ordering with slot id" into udc-dev am: 5240d251e1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22530782

Change-Id: Ia369cf03f64b2614875fc013f663930894714a0a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-10 04:39:31 +00:00
Tom Hsu
5240d251e1 Merge "Make all sim list by ordering with slot id" into udc-dev 2023-04-10 04:13:55 +00:00
Automerger Merge Worker
ee3135f92f Merge "Merge "Change the label of CombinedBiometricProfileSettingsActivity." into udc-dev am: bc1ee1264b am: 996851e310" 2023-04-08 21:54:19 +00:00
Elliot Sisteron
50af67d891 Merge "Change the label of CombinedBiometricProfileSettingsActivity." into udc-dev am: bc1ee1264b am: 1b14767540
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22507344

Change-Id: Ibecdb7dedf2dd056216859f4d52831ca1e365cd8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-08 21:54:08 +00:00