Commit Graph

42493 Commits

Author SHA1 Message Date
TreeHugger Robot
f084eecb4f Merge "Ensure loading all apps once in ManageApplications" into tm-dev am: 036d6744dd am: 4d7e960d65 am: 90f8dd0abd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18160674

Change-Id: I72ccf411a095df407a502526206c49898a5374f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 18:35:00 +00:00
Chaohui Wang
42bd80b21c Merge "Fix Wi-Fi "Network usage" and "Privacy" drop down" into tm-dev am: 7a21c9ef1f am: 10f7493fe3 am: 91413daba0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18186095

Change-Id: Id787c3cd49d94cae82937ddf4637da3103f66a05
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 18:12:13 +00:00
Kholoud Mohamed
513023b2d9 Merge "Add missing settings strings." into tm-dev am: 155df044e5 am: d5a0ee6a90 am: 87fd72bbe1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944008

Change-Id: Ie4e0ede6234e03f7442cf887c65ad39d45b8625f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 17:55:03 +00:00
TreeHugger Robot
90f8dd0abd Merge "Ensure loading all apps once in ManageApplications" into tm-dev am: 036d6744dd am: 4d7e960d65
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18160674

Change-Id: I53e0f9d7562d08c8dc0597c6b88335857b146d6f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 15:20:11 +00:00
Chaohui Wang
91413daba0 Merge "Fix Wi-Fi "Network usage" and "Privacy" drop down" into tm-dev am: 7a21c9ef1f am: 10f7493fe3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18186095

Change-Id: I9bcb51fcc57df333942d39ec976463f95c6bbb36
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 15:19:56 +00:00
Kholoud Mohamed
87fd72bbe1 Merge "Add missing settings strings." into tm-dev am: 155df044e5 am: d5a0ee6a90
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944008

Change-Id: I003177da178c52bb6b9c1640765b1b93d450d5ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 15:12:07 +00:00
TreeHugger Robot
4d7e960d65 Merge "Ensure loading all apps once in ManageApplications" into tm-dev am: 036d6744dd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18160674

Change-Id: Iebce77b67ac04ba66446c602795f2d6d2340754a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 14:28:13 +00:00
Chaohui Wang
10f7493fe3 Merge "Fix Wi-Fi "Network usage" and "Privacy" drop down" into tm-dev am: 7a21c9ef1f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18186095

Change-Id: Ib0c189760733640d4e6f98918e0865e02c36f4a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 14:27:54 +00:00
Kholoud Mohamed
d5a0ee6a90 Merge "Add missing settings strings." into tm-dev am: 155df044e5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944008

Change-Id: I705df4c090815fab9abfbe75bffbe5cb18202b6f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 14:19:33 +00:00
TreeHugger Robot
036d6744dd Merge "Ensure loading all apps once in ManageApplications" into tm-dev 2022-05-09 08:09:46 +00:00
Chaohui Wang
7a21c9ef1f Merge "Fix Wi-Fi "Network usage" and "Privacy" drop down" into tm-dev 2022-05-09 08:02:58 +00:00
Kholoud Mohamed
155df044e5 Merge "Add missing settings strings." into tm-dev 2022-05-09 07:20:57 +00:00
Andy Hung
dcaf3a3505 Merge "SpatialAudioSettings: Fix state check" into tm-dev am: 3198bd8cec am: 78da28e2f0 am: 75571d2077
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18194648

Change-Id: I4c9bc335cfe0ae18c946e3d250dfa97610b58a0a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 04:36:01 +00:00
Chaohui Wang
e739725b32 Merge "Improve Talkback for user select dialog" into tm-dev am: fe0c66dc78 am: d611c6c846 am: a7e00af465
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18131628

Change-Id: I6ec8684bc5f1113a48871bbeefbeb44817b9282d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 04:35:54 +00:00
Andy Hung
d302ee215b Merge "SpatialAudioSettings: Fix state check" into tm-dev am: 3198bd8cec am: 041ae95af6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18194648

Change-Id: I1378f483b1090b4ccb1773b51284c866324acc77
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 04:20:51 +00:00
Chaohui Wang
8ea804ebc7 Merge "Improve Talkback for user select dialog" into tm-dev am: fe0c66dc78 am: 3de3297de4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18131628

Change-Id: I7bc67dc45eaccdc210e03c5be5f9c425aad43ab9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 04:20:45 +00:00
Andy Hung
75571d2077 Merge "SpatialAudioSettings: Fix state check" into tm-dev am: 3198bd8cec am: 78da28e2f0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18194648

Change-Id: I7a44acf11c63f555a970882ab7e331db41b66c12
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 04:13:24 +00:00
Chaohui Wang
a7e00af465 Merge "Improve Talkback for user select dialog" into tm-dev am: fe0c66dc78 am: d611c6c846
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18131628

Change-Id: I249f1d3ab937fe52957ce206d8c3d6bb4652429c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 04:13:18 +00:00
Andy Hung
041ae95af6 Merge "SpatialAudioSettings: Fix state check" into tm-dev am: 3198bd8cec
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18194648

Change-Id: I39e45776c2f3bb77fbeb0be80dfdaa834da55fb1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 04:13:12 +00:00
Andy Hung
78da28e2f0 Merge "SpatialAudioSettings: Fix state check" into tm-dev am: 3198bd8cec
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18194648

Change-Id: I290833a20b6c7b733ce4181a549cb3b7658bc4b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 04:11:59 +00:00
Andy Hung
3198bd8cec Merge "SpatialAudioSettings: Fix state check" into tm-dev 2022-05-09 04:06:49 +00:00
Chaohui Wang
3de3297de4 Merge "Improve Talkback for user select dialog" into tm-dev am: fe0c66dc78
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18131628

Change-Id: If421972b4e5221e9addb47fc967e5536c27ccbe3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 03:57:56 +00:00
Chaohui Wang
d611c6c846 Merge "Improve Talkback for user select dialog" into tm-dev am: fe0c66dc78
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18131628

Change-Id: If6c94952892475381c67aa9ff1ae62230e0869ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 03:56:43 +00:00
Chaohui Wang
fe0c66dc78 Merge "Improve Talkback for user select dialog" into tm-dev 2022-05-09 03:56:33 +00:00
YK Hung
7b278f3ba6 Merge "Use system package name for SYSTEM_UID in the BatteryEntry" into tm-dev am: 9d0da1b613 am: 4cc21e3de2 am: f10776f81d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18214694

Change-Id: Ia9a781dbbd6f50d8f3cc79bbad117dd5410a8510
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 02:51:59 +00:00
YK Hung
f10776f81d Merge "Use system package name for SYSTEM_UID in the BatteryEntry" into tm-dev am: 9d0da1b613 am: 4cc21e3de2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18214694

Change-Id: Icce988bd852d1877f487539f5cf34cebb936a8d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 02:30:26 +00:00
YK Hung
45632ebbdc Merge "Use system package name for SYSTEM_UID in the BatteryEntry" into tm-dev am: 9d0da1b613 am: 309dc7061b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18214694

Change-Id: I9ea2657a618f679747d8fa761929e7dd1014cabb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 02:30:20 +00:00
YK Hung
4cc21e3de2 Merge "Use system package name for SYSTEM_UID in the BatteryEntry" into tm-dev am: 9d0da1b613
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18214694

Change-Id: Icfca7b00f180b52e730f6e2a681bcdeac6db4749
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 02:15:28 +00:00
YK Hung
309dc7061b Merge "Use system package name for SYSTEM_UID in the BatteryEntry" into tm-dev am: 9d0da1b613
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18214694

Change-Id: I3151f9ba90193a05972fdc771b6bd82969bfc4ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 02:14:16 +00:00
Arc Wang
dd1d516607 Merge "Verify ringtone from ringtone picker is audio" into tm-dev am: 94a2138316 am: dc4104be6d am: da6cf3046a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18197506

Change-Id: Ibb8badc7119cd5ab3e6a94a1ac12caa8bc940392
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 02:06:51 +00:00
YK Hung
9d0da1b613 Merge "Use system package name for SYSTEM_UID in the BatteryEntry" into tm-dev 2022-05-09 01:52:13 +00:00
Arc Wang
5986d27537 Merge "Verify ringtone from ringtone picker is audio" into tm-dev am: 94a2138316 am: 2557b02f08
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18197506

Change-Id: I01f7e4fb46dd6beff1c7c653b17eace6d1f9fcd9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 01:40:22 +00:00
Arc Wang
da6cf3046a Merge "Verify ringtone from ringtone picker is audio" into tm-dev am: 94a2138316 am: dc4104be6d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18197506

Change-Id: I21fb697c81015d8a6683283d75d10c2f7ae6d073
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 01:40:19 +00:00
Arc Wang
dc4104be6d Merge "Verify ringtone from ringtone picker is audio" into tm-dev am: 94a2138316
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18197506

Change-Id: I135776f8901d34602991f389d6c34fa35fd35825
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 01:22:22 +00:00
Arc Wang
2557b02f08 Merge "Verify ringtone from ringtone picker is audio" into tm-dev am: 94a2138316
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18197506

Change-Id: I8ad8b5e2fff8532b291be0939ac1ed463e44e083
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 01:21:08 +00:00
Arc Wang
94a2138316 Merge "Verify ringtone from ringtone picker is audio" into tm-dev 2022-05-09 01:06:46 +00:00
ykhung
c880114dba Use system package name for SYSTEM_UID in the BatteryEntry
Force use the system package for the SYSTEM_UID, since the SYSTEM_UID is
used for multiple packages. The getPackageWithHighestDrain() method may
get different packages to represent it, since it will use the highest
battery drain to represent the SYSTEM_UID if there are multiple packages
use the same UID value to make users confuse about the usage data.
_
$ adb shell pm list packages --uid 1000
package:android uid:1000
package:com.android.dynsystem uid:1000
package:com.android.frameworks.core.batterystatsviewer uid:1000
package:com.android.inputdevices uid:1000
package:com.android.keychain uid:1000
package:com.android.localtransport uid:1000
package:com.android.location.fused uid:1000
package:com.android.providers.settings uid:1000
package:com.android.server.telecom uid:1000
package:com.android.settings uid:1000
package:com.android.wallpaperbackup uid:1000

Bug: 202682426
Test: make RunSettingsRoboTests -j56 ROBOTEST_FILTER="com.android.settings.fuelgauge"
Change-Id: I447bfa1b32037763a2194c0639abcc334c7d8b78
2022-05-08 23:42:38 +08:00
Milton Wu
ec5a918d42 Merge "Update SUW biometric string product" into tm-dev am: 887d590e85 am: bb7036142e am: 9f19581d9f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18186094

Change-Id: I037093b09723023af9b7b54afc4e3bb97bf9f5f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-07 02:50:59 +00:00
Milton Wu
9f19581d9f Merge "Update SUW biometric string product" into tm-dev am: 887d590e85 am: bb7036142e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18186094

Change-Id: Ifde76f78c2f0e0617d51c2c630f3bc4bcaba8467
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-07 02:26:19 +00:00
Milton Wu
f2567364d6 Merge "Update SUW biometric string product" into tm-dev am: 887d590e85 am: bb7036142e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18186094

Change-Id: I9a25ce05ddd2093d9ab9740ffc9507bacacb5004
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-07 02:25:45 +00:00
Milton Wu
bb7036142e Merge "Update SUW biometric string product" into tm-dev am: 887d590e85
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18186094

Change-Id: I606d68143b628b445fcc6377717a1035b1a57a35
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-07 01:58:21 +00:00
Milton Wu
7159cf23bc Merge "Update SUW biometric string product" into tm-dev am: 887d590e85
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18186094

Change-Id: Id6b8a36f17b7b9f6067d68d146774149e1a2275f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-07 01:56:58 +00:00
Milton Wu
887d590e85 Merge "Update SUW biometric string product" into tm-dev 2022-05-07 01:27:27 +00:00
SongFerng Wang
6c278e5eef Merge "[BT Broadcast Sink] Add the function for leave and scan QRcode buttons" into tm-dev am: 286682ec8a am: 80c326e316 am: a9b22228bf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18181646

Change-Id: Ia505498a668d64e36f8d7a171f36cfb584be8197
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 12:04:25 +00:00
Ayush Sharma
2c15977b5f Merge "Move set work lock message from header to footer" into tm-dev am: 6e4579a816 am: 2f5f7c96d1 am: b0aa6420d9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18140207

Change-Id: I98f88bfdd069763359c58fe95e16434812a80c95
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 12:04:17 +00:00
SongFerng Wang
07ec013371 Merge "[BT Broadcast Sink] Add the function for leave and scan QRcode buttons" into tm-dev am: 286682ec8a am: a7af4d2965
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18181646

Change-Id: I914b401164b1d99098d209a76d773a9c39133529
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 11:38:46 +00:00
SongFerng Wang
a9b22228bf Merge "[BT Broadcast Sink] Add the function for leave and scan QRcode buttons" into tm-dev am: 286682ec8a am: 80c326e316
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18181646

Change-Id: I87e5c30e2bb0d5bb3c22c4ce6e68759af8adbd4b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 11:38:22 +00:00
Ayush Sharma
b0aa6420d9 Merge "Move set work lock message from header to footer" into tm-dev am: 6e4579a816 am: 2f5f7c96d1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18140207

Change-Id: I38278d4d0cb469c5f2c0dcb757b690776d8eedfd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 11:38:16 +00:00
Ayush Sharma
1376048722 Merge "Move set work lock message from header to footer" into tm-dev am: 6e4579a816 am: 938200e3a8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18140207

Change-Id: Ic92fb8bfd1fcb7a3cf9252b0036989b834b09af8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 11:38:16 +00:00
SongFerng Wang
80c326e316 Merge "[BT Broadcast Sink] Add the function for leave and scan QRcode buttons" into tm-dev am: 286682ec8a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18181646

Change-Id: If732e278300370c10c61b52e347f79c8d9656a0b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 11:10:29 +00:00