PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
104,077 Commits 1 Branch 0 Tags
91d1f44c86df35c5447f8af4b63c37609e73e38f
Commit Graph

104077 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
YK Hung
56951b0e0c 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: Ic22cfd4dad06421063992a450101a07f3feebac6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-09 02:30:29 +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
becd92c1b0 [automerged blank] Verify ringtone from ringtone picker is audio 2p: f288d3a31b 2p: 7fb8fc09b5 
Blank merge reason: Change-Id I0a9ca163f5ae91b67c9f957fde4c6db326b8718d with SHA-1 e4c22580c9 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18219304

Bug: 221041256
Change-Id: Ib291441dea3c6f87dfbb54ad0eae9f6dac24c292
Merged-In: I0a9ca163f5ae91b67c9f957fde4c6db326b8718d
 2022-05-09 02:07:26 +00:00
Arc Wang
930822bc13 [automerge] Verify ringtone from ringtone picker is audio 2p: f288d3a31b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18219304

Bug: 221041256
Change-Id: I8970b251440e9f3f86b715ca225c545463a56164
Merged-In: I0a9ca163f5ae91b67c9f957fde4c6db326b8718d
 2022-05-09 02:07:14 +00:00
Arc Wang
7fb8fc09b5 [automerge] Verify ringtone from ringtone picker is audio 2p: f288d3a31b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18219304

Bug: 221041256
Change-Id: I9a3655b8852fd79dcce276f00de7f969d9219b58
Merged-In: I0a9ca163f5ae91b67c9f957fde4c6db326b8718d
 2022-05-09 02:07:13 +00:00
Arc Wang
f288d3a31b Verify ringtone from ringtone picker is audio 
To improve privacy.

Bug: 221041256
Test: atest com.android.settings.DefaultRingtonePreferenceTest
Change-Id: I0a9ca163f5ae91b67c9f957fde4c6db326b8718d
Merged-In: I0a9ca163f5ae91b67c9f957fde4c6db326b8718d
(cherry picked from commit e4c22580c9)
 2022-05-09 02:07:00 +00:00
Arc Wang
babe83e217 Verify ringtone from ringtone picker is audio 
To improve privacy.

Bug: 221041256
Test: atest com.android.settings.DefaultRingtonePreferenceTest
Change-Id: I0a9ca163f5ae91b67c9f957fde4c6db326b8718d
Merged-In: I0a9ca163f5ae91b67c9f957fde4c6db326b8718d
(cherry picked from commit e4c22580c9)
 2022-05-09 02:06:08 +00:00
Arc Wang
1b7fa6f8fc Verify ringtone from ringtone picker is audio 
To improve privacy.

Bug: 221041256
Test: atest com.android.settings.DefaultRingtonePreferenceTest
Change-Id: I0a9ca163f5ae91b67c9f957fde4c6db326b8718d
Merged-In: I0a9ca163f5ae91b67c9f957fde4c6db326b8718d
(cherry picked from commit e4c22580c9)
 2022-05-09 02:05:20 +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
Automerger Merge Worker
53ac7863a9 Merge "Merge "Verify ringtone from ringtone picker is audio" into tm-dev am: 94a2138316 am: dc4104be6d" into tm-d1-dev-plus-aosp 2022-05-09 01:40:25 +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
29531a6ad6 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: If2d57381d8e28dc864989efc78f9fbba278d84d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-09 01:40:22 +00:00
hoffc
0304a0e88b Settings: Optimize the selected WFD route preference summary 
RouteInfo has several status values, such as unavailable status. But according to current logic, unavailable status will be displayed as connnected. it is not reasonable.

Update and optimize the route preference summary with the real WFD status value.

Change-Id: Iacd10e0133d06ef0b86da38cf763fe7def6ed7de
Buganizer: 231656030
 2022-05-09 09:22:57 +08: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
Bonian Chen
830d8e0fec [Settings] Ignore failure test cases - NetworkProviderSimListControllerTest 
This is a change regarding ignoring the failure of test cases within
NetworkProviderSimListControllerTest in order to keep build green.

Bug: 231883966
Test: presubmit
Change-Id: I11bf23c1cab0e97619688ce1ed2c0f539f42a3be
 2022-05-09 08:02:28 +08:00
Bonian Chen
e25b88a8f9 [Settings] Ignore failure test cases - DefaultSubscriptionControllerTest 
This is a change regarding ignoring the failure of test cases within
DefaultSubscriptionControllerTest in order to keep build green.

Bug: 231886723
Test: presubmit
Change-Id: Ice611f1a893e5604b044f69d6b6076fc64844074
 2022-05-09 07:39:14 +08:00
Automerger Merge Worker
81ec693d4b Merge "Merge "[Settings] Remove the subscription name verification." into tm-dev am: 361fea8f6b am: 4608fbc8a8" into tm-d1-dev-plus-aosp 2022-05-08 23:37:21 +00:00
Bonian Chen
b5e7404106 Merge "[Settings] Remove the subscription name verification." into tm-dev am: 361fea8f6b am: 89fae0817c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18214682

Change-Id: I628da106298af183c6be6cdcdef06d7458f83442
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-08 23:37:17 +00:00
Bonian Chen
5f2171dc35 Merge "[Settings] Remove the subscription name verification." into tm-dev am: 361fea8f6b am: 4608fbc8a8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18214682

Change-Id: Ia0584f9f384b13ca35e732bb4beb9c51669e58db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-08 23:37:17 +00:00
Bonian Chen
651a548e84 [Settings] Ignore failure test cases - SubscriptionUtilTest 
This is a change regarding ignoring the failure of test cases within
SubscriptionUtilTest in order to keep build green.

Bug: 231886555
Test: presubmit
Change-Id: I0f5c13511968740e439a69be936a75d9f34e4c30
 2022-05-09 07:32:13 +08:00
Bonian Chen
a34f5053df [Settings] Ignore failure test cases - ProviderModelSliceHelperTest 
This is a change regarding ignoring the failure of test cases within
ProviderModelSliceHelperTest in order to keep build green.

Bug: 231886711
Test: presubmit
Change-Id: I0138c9eefad1541a6302393c035b641fc3f4bfac
 2022-05-09 07:23:28 +08:00
Bonian Chen
4608fbc8a8 Merge "[Settings] Remove the subscription name verification." into tm-dev am: 361fea8f6b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18214682

Change-Id: I58426083b5da04cdea4c18305ba6fdfbe4a1c037
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-08 23:19:47 +00:00
Bonian Chen
89fae0817c Merge "[Settings] Remove the subscription name verification." into tm-dev am: 361fea8f6b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18214682

Change-Id: I2bd50d6197f57135932c45c4b4536a57026065cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-08 23:18:36 +00:00
Bonian Chen
361fea8f6b Merge "[Settings] Remove the subscription name verification." into tm-dev 2022-05-08 23:01:44 +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
Bonian Chen
649ad42457 [Settings] Remove the subscription name verification. 
Subscription name may override by other design (for instance, unique
name display).
A verification of subscription name within this test case could be
inappropirate.

Bug: 231660194
Test: unit test
Change-Id: I4182d1de3c0d210bdc1ac699a4f8f862dcf55266
 2022-05-08 19:52:14 +08:00
The Android Open Source Project
65b1c6b4ee Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I8c7445cb0e95557fc6b83356f724cccb0fad40a2
 2022-05-08 08:02:22 +00:00
The Android Open Source Project
5116946868 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I10bb4820ff3df2e102eaffd1dfbb7d7c6a2a0f32
 2022-05-08 07:58:21 +00:00
The Android Open Source Project
6503ce14a7 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I31aaec14dabcc10ed1d63426ec992582edc1f113
 2022-05-08 07:50:48 +00:00
The Android Open Source Project
e5b6c71281 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ic30e6d5b48d8783cc1d3d31f7a35de5cbabdb815
 2022-05-08 07:49:17 +00:00
Bill Yi
196ff79720 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Iea8aa9643e0102a6feb9a00139ee33688d87c298
 2022-05-08 06:21:31 +00:00
Bill Yi
9fd2b9fbcc Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I50f5fe897be249d7347b496d77a458486719b4af
 2022-05-08 06:13:30 +00:00
Bill Yi
f4c7931e46 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I6e42da596df2a99be70199f47e015edeb15e68d3
 2022-05-08 06:10:03 +00:00
Bill Yi
4cbb2ea010 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I23104473e86a47acc286bf2b25b2a49f952b89f5
 2022-05-08 06:07:04 +00:00
Bill Yi
2a0680f979 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Id92b90caa9e4670549b96877c5dd1085d6443b64
 2022-05-08 05:54:21 +00:00
Milton Wu
f3679b6a6e Merge "Update SUW biometric string product" into tm-dev am: 887d590e85 am: 7159cf23bc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18186094

Change-Id: I7f97a33a987f9c62a8b674cf2215637c81931b82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-07 02:28:13 +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
82c6b91c69 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: Ib6f574502419d5d288776e279029f3586ec5e124
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-06 11:39:07 +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
cf3f2dd11f 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: Ib8fb1d9225de8c07dc8d36535805aa1461975985
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-06 11:38:41 +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