Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
103,167 Commits 1 Branch 0 Tags
c071d20568c91e4feddf2a43b36f17b711a69b0c
Commit Graph

42292 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
a7af4d2965 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: Id200031fbfb965fb97fe4b87a7bbb820dbf0a970
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-06 11:09:32 +00:00
Ayush Sharma
938200e3a8 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: Ib944ba6daa832409c6f5ae2b6b3921e4038dea33
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-06 11:08:55 +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
efbd45873b 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: I5656707b6503997d9cd05589bb4c51d8cc113101
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-06 03:53:22 +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
dd6dd8ad13 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: I5e72367a25b57f91014bf983289019a399b53792
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-06 03:33:03 +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
a636c1e104 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: I4da85f0178f60d6fb9c692e900f25bb333c1f8a3
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
01afe2287f 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: Ieb6aa225ddbae799d999bb018e659d7514bf014d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-06 02:41:16 +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
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
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
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
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
8998aeb1fc 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: Ieed25319883b72568c1b1c1421452a49578840ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 09:27:24 +00:00
Tom Hsu
1c154f9197 [Panlingual] Fix conflict am: 70fe2d1fdd am: c4603be5b3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18181644

Change-Id: I0bd679552d03be99daf1e31d120626cc8b9d4ff0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 09:26:24 +00:00
Jonathan Scott
b7f4f56cad Add missing settings strings. 
Also re-enable and fix tests.

Test: manual
Fixes: 226183482
Fixes: 218799125
Fixes: 219375624

Change-Id: I9605f1f4e2e834baf63e015e96639567c5481b5f
 2022-05-05 09:12:59 +00:00
SongFerng Wang
e00cbc7885 Merge "[LE broadcast sink] Add the source list in boradcast sink UI." into tm-dev am: afe6d302e4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18131624

Change-Id: I051e905d4a216f57aa2b9244cf93df203b6e0c76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 09:09:25 +00:00
SongFerng Wang
411d3acb66 Merge "[LE broadcast sink] Add the source list in boradcast sink UI." into tm-dev am: afe6d302e4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18131624

Change-Id: Ifeb0c8ee95410f9555650078a396ca0728fb9a4c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 09:09:22 +00:00
Tsung-Mao Fang
a0100b2171 Merge "Show slice without toggle when there's no wifi permission" into tm-dev am: c5153183d8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18030884

Change-Id: I8a5a602eb88c8947ad1ba293e3477e05d5c99ed7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 09:08:53 +00:00
Tsung-Mao Fang
c4613ab0d2 Merge "Show slice without toggle when there's no wifi permission" into tm-dev am: c5153183d8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18030884

Change-Id: Ib1f9f1895b7555b0a1fdcb42679a12707bbc167b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 09:08:40 +00:00
Tom Hsu
c4603be5b3 [Panlingual] Fix conflict am: 70fe2d1fdd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18181644

Change-Id: I73dc18b9f3d456cc1c3569be593f0bec37b61e44
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 09:08:28 +00:00
Tom Hsu
fd09e5c0e8 [Panlingual] Fix conflict am: 70fe2d1fdd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18181644

Change-Id: I51b5f3f60061e41217b277e03686f43fbf85e885
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 09:08:02 +00:00
SongFerng Wang
afe6d302e4 Merge "[LE broadcast sink] Add the source list in boradcast sink UI." into tm-dev 2022-05-05 08:50:20 +00:00
Tsung-Mao Fang
c5153183d8 Merge "Show slice without toggle when there's no wifi permission" into tm-dev 2022-05-05 08:43:00 +00:00