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

103899 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Bonian Chen
1be0b619d4 Merge "[Settings] Ignore failure test cases - DefaultSubscriptionControllerTest" into tm-dev am: a9eb5f27c1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18218462

Change-Id: Ic3bdc2914e6e9674e02778f780258a2797f1e828
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-09 03:56:34 +00:00
Chaohui Wang
fe0c66dc78 Merge "Improve Talkback for user select dialog" into tm-dev 2022-05-09 03:56:33 +00:00
Automerger Merge Worker
c071d20568 Merge "Merge "[Settings] Ignore failure test cases - NetworkProviderSimListControllerTest" into tm-dev am: c4033b6d3e am: 8a847f4d99" into tm-d1-dev-plus-aosp 2022-05-09 03:41:42 +00:00
Bonian Chen
a9eb5f27c1 Merge "[Settings] Ignore failure test cases - DefaultSubscriptionControllerTest" into tm-dev 2022-05-09 03:41:42 +00:00
Bonian Chen
79c575a98e Merge "[Settings] Ignore failure test cases - NetworkProviderSimListControllerTest" into tm-dev am: c4033b6d3e am: 8a847f4d99 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18214699

Change-Id: I8dc99e1a7d8bb6a49cbceeb644932ebb43bbd582
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-09 03:41:40 +00:00
Bonian Chen
88ce933530 Merge "[Settings] Ignore failure test cases - NetworkProviderSimListControllerTest" into tm-dev am: c4033b6d3e am: 876f30fd37 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18214699

Change-Id: Ie181bb3db1407e8388d167584ad281bad027ce53
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-09 03:41:39 +00:00
Automerger Merge Worker
97060cbb88 Merge "Merge "[Settings] Ignore failure test cases - ProviderModelSliceHelperTest" into tm-dev am: a89902e9c9 am: 2298027711" into tm-d1-dev-plus-aosp 2022-05-09 03:41:36 +00:00
Bonian Chen
6cb2af7ba1 Merge "[Settings] Ignore failure test cases - ProviderModelSliceHelperTest" into tm-dev am: a89902e9c9 am: 2298027711 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18214700

Change-Id: Ibcfc2afaa58be58c77b202a1fcc580935d0565da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-09 03:41:33 +00:00
Bonian Chen
1b401e85db Merge "[Settings] Ignore failure test cases - ProviderModelSliceHelperTest" into tm-dev am: a89902e9c9 am: abef1274ac 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18214700

Change-Id: I488f351fdb39ca73e4a8ca10e2a92a8953d0bbf2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-09 03:41:32 +00:00
Automerger Merge Worker
ec486bfe6c Merge "Merge "[Settings] Ignore failure test cases - SubscriptionUtilTest" into tm-dev am: 52a1fdf310 am: 1c9ce13822" into tm-d1-dev-plus-aosp 2022-05-09 03:41:29 +00:00
Bonian Chen
c1454d8fbe Merge "[Settings] Ignore failure test cases - SubscriptionUtilTest" into tm-dev am: 52a1fdf310 am: 1c9ce13822 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18214701

Change-Id: I362ffec1454911c4cd5254b95be494f977afdac9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-09 03:41:26 +00:00
Bonian Chen
ff3882576f Merge "[Settings] Ignore failure test cases - SubscriptionUtilTest" into tm-dev am: 52a1fdf310 am: 5924a2fc7b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18214701

Change-Id: Ibb22f148b3019c5573387951fb15dd6d38e5f10a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-09 03:41:25 +00:00
Bonian Chen
876f30fd37 Merge "[Settings] Ignore failure test cases - NetworkProviderSimListControllerTest" into tm-dev am: c4033b6d3e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18214699

Change-Id: I588ade8586c01b7c5631c3524759c12b308cc9a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-09 03:10:08 +00:00
Bonian Chen
abef1274ac Merge "[Settings] Ignore failure test cases - ProviderModelSliceHelperTest" into tm-dev am: a89902e9c9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18214700

Change-Id: I4aa2a89aab616016f5885019dd31e072c637bc84
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-09 03:10:01 +00:00
Bonian Chen
5924a2fc7b Merge "[Settings] Ignore failure test cases - SubscriptionUtilTest" into tm-dev am: 52a1fdf310 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18214701

Change-Id: Ib07f0176f098e287b91ee2b2598b900f4c3b535c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-09 03:09:53 +00:00
Bonian Chen
8a847f4d99 Merge "[Settings] Ignore failure test cases - NetworkProviderSimListControllerTest" into tm-dev am: c4033b6d3e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18214699

Change-Id: Iac00062831079b367612adedf60f0492589ab008
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-09 03:08:55 +00:00
Bonian Chen
2298027711 Merge "[Settings] Ignore failure test cases - ProviderModelSliceHelperTest" into tm-dev am: a89902e9c9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18214700

Change-Id: I119377b9953c8c43fb9e4f3c00891cf867611d77
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-09 03:08:46 +00:00
Bonian Chen
1c9ce13822 Merge "[Settings] Ignore failure test cases - SubscriptionUtilTest" into tm-dev am: 52a1fdf310 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18214701

Change-Id: Id6207e1bdd2a9fed8ad69df3c819f72c0594f000
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-09 03:08:38 +00:00
Bonian Chen
c4033b6d3e Merge "[Settings] Ignore failure test cases - NetworkProviderSimListControllerTest" into tm-dev 2022-05-09 02:58:00 +00:00
Bonian Chen
a89902e9c9 Merge "[Settings] Ignore failure test cases - ProviderModelSliceHelperTest" into tm-dev 2022-05-09 02:56:35 +00:00
Bonian Chen
52a1fdf310 Merge "[Settings] Ignore failure test cases - SubscriptionUtilTest" into tm-dev 2022-05-09 02:52:24 +00:00
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