Commit Graph

16392 Commits

Author SHA1 Message Date
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
94a2138316 Merge "Verify ringtone from ringtone picker is audio" into tm-dev 2022-05-09 01:06:46 +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
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
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
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
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
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
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
Tsung-Mao Fang
cc13be69d6 Merge "Show slice without toggle when there's no wifi permission" into tm-dev am: c5153183d8 am: a0100b2171 am: f9edc98ba7 am: 6493af118d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18030884

Change-Id: I9d1a5d9c5e9f25ade3aebef7ba7f29a7b1ae6677
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-05 10:30:58 +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
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
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
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
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
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
ykhung
be10538a09 Support special tethering and removed apps UID in the usage list
There is a special UID for network data tethering usage, we will handle
it in a special case to avoid the current rule considering it as an
invalid UID case without showing in the usage list. We will disable the
click behavior to protect the optimization mode page first.

Bug: 227395125
Test: make RunSettingsRoboTests -j56 ROBOTEST_FILTER="com.android.settings.fuelgauge"
Change-Id: I8d96473d382ebc3253748cce8345d6f2261a233d
2022-05-05 16:17:41 +08:00
Daniel Huang
257a6052ab Merge "[Panlingual] Unit test for onLocaleSelected" into tm-dev am: 74b1027fe2 am: 9a339e9d16 am: 03a2775a32 am: e5effd7edf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158867

Change-Id: I85397a27a6cd8e62a38f029ad4e9d45de0ff062e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-05 06:05:41 +00:00
Daniel Huang
e5effd7edf Merge "[Panlingual] Unit test for onLocaleSelected" into tm-dev am: 74b1027fe2 am: 9a339e9d16 am: 03a2775a32
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158867

Change-Id: I53c0555f4a325df7bddf2a309c02521716cbfd76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-05 05:47:37 +00:00
Daniel Huang
62715a9cdd Merge "[Panlingual] Unit test for onLocaleSelected" into tm-dev am: 74b1027fe2 am: 9a339e9d16
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158867

Change-Id: Ic91f10bc276e2d108739cbfc8df5b115e2fdf667
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-05 05:26:25 +00:00
Daniel Huang
03a2775a32 Merge "[Panlingual] Unit test for onLocaleSelected" into tm-dev am: 74b1027fe2 am: 9a339e9d16
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158867

Change-Id: Ife440db792f001864f3305eed6e3e2200e269d52
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-05 05:26:18 +00:00
Daniel Huang
9a339e9d16 Merge "[Panlingual] Unit test for onLocaleSelected" into tm-dev am: 74b1027fe2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158867

Change-Id: I1384bf966c0afc391f97d64c389747fe307497cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-05 05:09:48 +00:00
Daniel Huang
1737ce56fc Merge "[Panlingual] Unit test for onLocaleSelected" into tm-dev am: 74b1027fe2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158867

Change-Id: Ifb20f828c374e2a003d9d0b0f6af98ab50810afb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-05 05:08:22 +00:00
Tsung-Mao Fang
cb641fa6eb Show slice without toggle when there's no wifi permission
When the presenter app doesn't have certain permissions,
it's safer to go with a generic fallback slice
which just redirects user to the actual settings page.

Test: test on the presenter app. robo test
Fix: 178014725
Change-Id: I6f5358af2e00cb2fedba0b3f1474a026135986c6
2022-05-05 12:05:38 +08:00
Daniel Huang
74b1027fe2 Merge "[Panlingual] Unit test for onLocaleSelected" into tm-dev 2022-05-05 03:46:47 +00:00
TreeHugger Robot
900645554a Merge "Hide Wi-Fi toggle in the Wi-Fi slice" into tm-dev am: 3fb9c1a24b am: 5a138163b4 am: 4c10d54239 am: 66262e1052
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18157802

Change-Id: Ib5b9b4c566d0996c03dd3115aa2e57848444b513
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 18:13:09 +00:00
TreeHugger Robot
b997b7ea40 Merge "Remove Wi-Fi toggle in settings search" into tm-dev am: 2e6d03d0f4 am: d5f1760bc2 am: 1ea5c4947f am: d01c722530
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18149762

Change-Id: I384afaacb8221af78180d27359f7f7aec56c6e6a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 18:12:45 +00:00
TreeHugger Robot
66262e1052 Merge "Hide Wi-Fi toggle in the Wi-Fi slice" into tm-dev am: 3fb9c1a24b am: 5a138163b4 am: 4c10d54239
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18157802

Change-Id: Ie7ca0f9c93d2a062f3e8513218f4566d91eee2e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 17:36:58 +00:00
TreeHugger Robot
d01c722530 Merge "Remove Wi-Fi toggle in settings search" into tm-dev am: 2e6d03d0f4 am: d5f1760bc2 am: 1ea5c4947f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18149762

Change-Id: I9bf57c8573062d0b6c2eb9b110c4b419197fb4ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 17:36:43 +00:00
TreeHugger Robot
4c10d54239 Merge "Hide Wi-Fi toggle in the Wi-Fi slice" into tm-dev am: 3fb9c1a24b am: 5a138163b4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18157802

Change-Id: I43abc251d6e3e98614c577a76efbec7d9eeb1daa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 16:54:21 +00:00
TreeHugger Robot
9f25dfbe24 Merge "Hide Wi-Fi toggle in the Wi-Fi slice" into tm-dev am: 3fb9c1a24b am: 4a79ecce7f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18157802

Change-Id: I394ab524cd11acf93961e557ea94ea83599b1eda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 16:53:50 +00:00
TreeHugger Robot
aa2edb9be4 Merge "Remove Wi-Fi toggle in settings search" into tm-dev am: 2e6d03d0f4 am: d61d5316a3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18149762

Change-Id: If1618fdc467bde0a76db51f7456af999acbdd476
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 16:53:34 +00:00
TreeHugger Robot
1ea5c4947f Merge "Remove Wi-Fi toggle in settings search" into tm-dev am: 2e6d03d0f4 am: d5f1760bc2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18149762

Change-Id: I7eb86f07e158a8bae3d5423c002547d031c0ae13
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 16:53:33 +00:00
TreeHugger Robot
5a138163b4 Merge "Hide Wi-Fi toggle in the Wi-Fi slice" into tm-dev am: 3fb9c1a24b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18157802

Change-Id: I21294fc5b06c6eaaf512cdb84d5c83f318baa140
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 16:32:18 +00:00
TreeHugger Robot
d5f1760bc2 Merge "Remove Wi-Fi toggle in settings search" into tm-dev am: 2e6d03d0f4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18149762

Change-Id: I2b49fcfb402b1269c38c35f840d8d09e53dacb91
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 16:30:58 +00:00
TreeHugger Robot
4a79ecce7f Merge "Hide Wi-Fi toggle in the Wi-Fi slice" into tm-dev am: 3fb9c1a24b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18157802

Change-Id: Ic6dcbe5d513d4fa3a9ca3fb7e03add4eb978d145
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 16:29:50 +00:00
TreeHugger Robot
d61d5316a3 Merge "Remove Wi-Fi toggle in settings search" into tm-dev am: 2e6d03d0f4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18149762

Change-Id: I39353aff59e39b3fc6219f52a836e03920cb99cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 16:28:55 +00:00
TreeHugger Robot
3fb9c1a24b Merge "Hide Wi-Fi toggle in the Wi-Fi slice" into tm-dev 2022-05-04 16:01:35 +00:00