Commit Graph

16835 Commits

Author SHA1 Message Date
Bonian Chen
03d6e7e980 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: I635387a7a0d46592a0e7b1b208886d35b024552e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 03:41:29 +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
283a67add6 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: Ibe14cd82121d72bc963d62675b401bc5f66c222b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 03:41:24 +00:00
Bonian Chen
423785169e Merge "[Settings] Ignore failure test cases - NetworkProviderSimListControllerTest" into tm-dev am: c4033b6d3e am: 669bb956af
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18214699

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

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

Change-Id: I8d5f590a57144217e03dda4ae6b8c4b90b19ac82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 03:40:58 +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
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
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
16f21bb14c Merge "Verify ringtone from ringtone picker is audio" into tm-dev am: 94a2138316 am: f6093ba54c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18197506

Change-Id: I53299c2a955b03c945583e03682bb8eabfea9222
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 01:39:53 +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
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
7479474c76 Merge "[Settings] Remove the subscription name verification." into tm-dev am: 361fea8f6b am: 4608fbc8a8 am: 9a2663325e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18214682

Change-Id: I0c40d6353b3d151fade4f8f419a9d8ad18ab8b1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-08 23:51:36 +00: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
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
9a2663325e 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: I63b89da5a640650d729899df25d67ab40f8d154f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-08 23:37:16 +00:00
Bonian Chen
c0a990abd0 Merge "[Settings] Remove the subscription name verification." into tm-dev am: 361fea8f6b am: b04c73a448
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18214682

Change-Id: I4417b1be695dea67a712782fff0594ddbabdf2c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-08 23:36:51 +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
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
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
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
ff9c2228d3 Merge "Show previous query upon configuration change" into tm-dev am: 9a14f087cd am: 9a55ef5d47
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158875

Change-Id: I3de0f134ac8f074f2a7a831b2e31dd60b76871ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 03:52:50 +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
a5470e4c24 Merge "Fix Settings getProfileIdsWithDisabled usage" 2022-05-06 03:16:37 +00:00
Yuri Lin
7cbba753dc Change zen mode schedules page rule handling
The approach of reloading all rules (and recreating all ZenRulePreferences) every time the rule set changed causes the switches on the page to stop working.

This change keeps the ZenRulePreference around as long as the rule itself is around and keeps it updated, while re-adding the preferences to the PreferenceCategory if needed due to rules changing.

Fixes: 229879326
Test: manual, ZenModeAutomaticRulesPreferenceControllerTest
Change-Id: I4eba41e8252cedd87ac866e4b97513970ca2d94a
2022-05-05 14:24:42 -04:00
TreeHugger Robot
3de43826cb Merge "Add missing settings strings." into tm-dev am: af5a015198 am: b3130cd857 am: e4ebac3480 am: 844772713f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17692465

Change-Id: Ie359cdd4a2b8481319fe918ebff0478fe2877c70
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-05 14:52:43 +00: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
YK Hung
1c7c008cc7 Merge "Support special tethering and removed apps UID in the usage list" into tm-dev am: 434009d709 am: 5f597a5f18 am: f623e0a8d3 am: eab6352317
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158878

Change-Id: I87e0eccec3a24a60fdf73f395c2598ee1d5a15d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-05 13:58:26 +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