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
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
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
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
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
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
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
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
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
Ayush Sharma
2f5f7c96d1
Merge "Move set work lock message from header to footer" into tm-dev am: 6e4579a816
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18140207
Change-Id: Ieaafe1022101cc6d66e5e3518846e3c68b71cd24
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-06 11:10:14 +00:00
SongFerng Wang
286682ec8a
Merge "[BT Broadcast Sink] Add the function for leave and scan QRcode buttons" into tm-dev
2022-05-06 11:08:21 +00:00
Ayush Sharma
6e4579a816
Merge "Move set work lock message from header to footer" into tm-dev
2022-05-06 10:42:10 +00:00
Arc Wang
e4c22580c9
Verify ringtone from ringtone picker is audio
...
To improve privacy.
Bug: 221041256
Test: atest com.android.settings.DefaultRingtonePreferenceTest
Change-Id: I0a9ca163f5ae91b67c9f957fde4c6db326b8718d
2022-05-06 17:42:30 +08:00
Yi-Ling Chuang
9be24d9bd5
Merge "Show previous query upon configuration change" into tm-dev am: 9a14f087cd am: 0fddcd3f80 am: db73382e8b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158875
Change-Id: I9877cc5198d934b89d5aeda83911e1bb4ff3f6c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-06 04:06:22 +00:00
Yi-Ling Chuang
db73382e8b
Merge "Show previous query upon configuration change" into tm-dev am: 9a14f087cd am: 0fddcd3f80
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158875
Change-Id: I69ffdeda8f6accb6557395e4725a45aa2d1b2aa4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-06 03:53:27 +00:00
Yi-Ling Chuang
0fddcd3f80
Merge "Show previous query upon configuration change" into tm-dev am: 9a14f087cd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158875
Change-Id: I2802a6770e187e6ac8d2f76286f0ffa0ee5adac0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-06 03:33:57 +00:00
Yi-Ling Chuang
9a14f087cd
Merge "Show previous query upon configuration change" into tm-dev
2022-05-06 03:17:22 +00:00
TreeHugger Robot
676d56a3a6
Merge "Fix Learn more link not work" into tm-dev am: b2dd7913c0 am: a64b3585c2 am: 1d27f67bfb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18181642
Change-Id: Iaf9cfaeab21014cd257d3e2cfd0abb73ad8f7a74
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-06 03:17:06 +00:00
TreeHugger Robot
1d27f67bfb
Merge "Fix Learn more link not work" into tm-dev am: b2dd7913c0 am: a64b3585c2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18181642
Change-Id: I2bf19dba3f1361116735868b8452c72cf7069293
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-06 03:00:47 +00:00
TreeHugger Robot
a64b3585c2
Merge "Fix Learn more link not work" into tm-dev am: b2dd7913c0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18181642
Change-Id: I7830bae523e7fe0464af2c4ff821c87e46ca4a22
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-06 02:42:35 +00:00
TreeHugger Robot
b2dd7913c0
Merge "Fix Learn more link not work" into tm-dev
2022-05-06 02:27:19 +00:00
Milton Wu
2cb52b2353
Update SUW biometric string product
...
Fingerprint strings for SUW is not consider product. Update string to
use 3 different products. They are tablet, device, and default.
Bug: 228021544
Test: Check SUW fingerprint string in tabet and phone
Change-Id: I728f52360e0c7e4972190caf47bea75a64f873ec
2022-05-06 09:59:26 +08:00
TreeHugger Robot
844772713f
Merge "Add missing settings strings." into tm-dev am: af5a015198 am: b3130cd857 am: e4ebac3480
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17692465
Change-Id: I4bfd07bcc663935d45c03e250a88a444f7b9e025
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-05 14:19:45 +00:00
TreeHugger Robot
036373b278
Merge "Add missing settings strings." into tm-dev am: af5a015198 am: f01fbbcec3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17692465
Change-Id: Ia062145408e033588a1478b341e7a6c91738ea16
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-05 14:06:01 +00:00
TreeHugger Robot
e4ebac3480
Merge "Add missing settings strings." into tm-dev am: af5a015198 am: b3130cd857
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17692465
Change-Id: I25d30bd384eefec6661be219aeae5dfa6108a59b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-05 13:58:46 +00:00
TreeHugger Robot
f01fbbcec3
Merge "Add missing settings strings." into tm-dev am: af5a015198
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17692465
Change-Id: I1c10f70954313ca7a15cd83e8d0663440fb1d3c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-05 13:44:42 +00:00
TreeHugger Robot
b3130cd857
Merge "Add missing settings strings." into tm-dev am: af5a015198
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17692465
Change-Id: Ib407602d7bdba7e7b60fada3ce53e3418b47efda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-05 13:42:38 +00:00
YK Hung
eab6352317
Merge "Support special tethering and removed apps UID in the usage list" into tm-dev am: 434009d709 am: 5f597a5f18 am: f623e0a8d3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158878
Change-Id: If5faf3a894aa5a73d6c7be5f21602d46840e91c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-05 13:33:43 +00:00
TreeHugger Robot
af5a015198
Merge "Add missing settings strings." into tm-dev
2022-05-05 13:19:07 +00:00
YK Hung
5accce3e05
Merge "Support special tethering and removed apps UID in the usage list" into tm-dev am: 434009d709 am: 5f597a5f18
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158878
Change-Id: Ifa54a030b0f028553effdc42965dbab09718515a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-05 13:11:15 +00:00
YK Hung
f623e0a8d3
Merge "Support special tethering and removed apps UID in the usage list" into tm-dev am: 434009d709 am: 5f597a5f18
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158878
Change-Id: I519da4dafa403606a6c197bb9c8ab56e3eaf9770
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-05 13:10:39 +00:00
YK Hung
5f597a5f18
Merge "Support special tethering and removed apps UID in the usage list" into tm-dev am: 434009d709
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158878
Change-Id: Id5e216edab65a83c6c7836e719e8dd11c500acb6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-05 12:41:20 +00:00
YK Hung
75238622bf
Merge "Support special tethering and removed apps UID in the usage list" into tm-dev am: 434009d709
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158878
Change-Id: I70e5ed6a5d04f20d0d6364cd3522a35ae0407920
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-05 12:39:40 +00:00
YK Hung
434009d709
Merge "Support special tethering and removed apps UID in the usage list" into tm-dev
2022-05-05 12:18:10 +00:00
SongFerngWang
e8bb9c9be3
[BT Broadcast Sink] Add the function for leave and scan QRcode buttons
...
Add function for 'leave broadcast' button
Add function for 'Scan QR code' button
Set 'level broadcast' button gray out when device does not have broadcast source
Bug: 228259065
Test: build pass and manually test
Change-Id: Iab4a45e73f49c3f755b95ea3fa38872daac7e745
2022-05-05 18:16:44 +08:00
SongFerng Wang
da313f5e1d
Merge "[LE broadcast sink] Add the source list in boradcast sink UI." into tm-dev am: afe6d302e4 am: e00cbc7885 am: 6e60b53542
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18131624
Change-Id: Id825f8784b7b6e1bf12e82e277c6a7bc4ca8f236
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-05 09:51:51 +00:00
Tsung-Mao Fang
6493af118d
Merge "Show slice without toggle when there's no wifi permission" into tm-dev am: c5153183d8 am: a0100b2171 am: f9edc98ba7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18030884
Change-Id: I1b5fe37f1b85b7aa7e7a693389ffeed55363420e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-05 09:51:28 +00:00
Tom Hsu
7c2d110559
[Panlingual] Fix conflict am: 70fe2d1fdd am: c4603be5b3 am: 1c154f9197
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18181644
Change-Id: Iff851855d4f4f8b0c01650b79cc4b52a5ae07780
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-05 09:50:43 +00:00
SongFerng Wang
6e60b53542
Merge "[LE broadcast sink] Add the source list in boradcast sink UI." into tm-dev am: afe6d302e4 am: e00cbc7885
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18131624
Change-Id: I04a8820ecc9e3757bd58a49e4e451cc7a004e9cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-05 09:28:07 +00:00
SongFerng Wang
c5618a37b4
Merge "[LE broadcast sink] Add the source list in boradcast sink UI." into tm-dev am: afe6d302e4 am: 411d3acb66
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18131624
Change-Id: I58c8d789e9e9b01c1e97acebbbf7d7c4503f6d57
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-05 09:28:03 +00:00
Tsung-Mao Fang
f9edc98ba7
Merge "Show slice without toggle when there's no wifi permission" into tm-dev am: c5153183d8 am: a0100b2171
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18030884
Change-Id: I09616381905908cfebdc0bcb0bced2f6d8176340
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-05 09:27:56 +00:00