Commit Graph

105937 Commits

Author SHA1 Message Date
Calvin Pan
4f56ab0898 Merge "Add unit test for AppLocalePickerActivity" into tm-dev am: 8ad2642b5f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17903006

Change-Id: Ib72a28d7fbf8c7120ed9d1e3076ca5386de51fb7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 16:39:46 +00:00
Betty Chang
268fb81908 Merge "[LE] Launch the MediaOutputBroadcastDialog when the current device is broadcasting" into tm-dev am: 7711207ba5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944166

Change-Id: If9e1fa315a2c26369cc8d50292a53527d4027526
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 16:37:56 +00:00
TreeHugger Robot
4d5385e6e3 Merge "Remove loading spinner from Premium SMS access" into tm-dev am: 611db9e8be
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17903584

Change-Id: I172b47e725fd08cd8f3af954611c0599b8e3a97d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 16:37:29 +00:00
YK Hung
2e7695458f Merge "Refine the BatteryUsageStats close() method invoke timing" into tm-dev am: 55fcb02aca
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18030883

Change-Id: I2573026d8cd8dd2dc8c0f9e8ff2842240a7f66a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 16:37:20 +00:00
Bill Yi
20df862686 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: aedbfeb8b8 2p: 737ee1e1a7 am: fa29c0c3bc -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8b0e95cf44bb643eeae2578a8c8e799c35940888
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 16:37:09 +00:00
Bonian Chen
5ef52de6b2 Merge "[Settings] Avoid from crash UI when querying data usage" into tm-dev 2022-04-29 16:00:31 +00:00
Bonian Chen
7bdf717410 Merge "[Settings] Rename title of SIM UI when changed" into tm-dev 2022-04-29 15:59:32 +00:00
TreeHugger Robot
38989c9c6a Merge "Show restricted message in Wi-Fi Direct summary" into tm-dev 2022-04-29 15:16:44 +00:00
Jan Tomljanovic
297028ea69 Merge "Update the SafetyCenter icon" into tm-dev 2022-04-29 13:38:38 +00:00
TreeHugger Robot
30bba3bbdb Merge "Show restricted message in Wi-Fi hotspot summary" into tm-dev 2022-04-29 09:51:21 +00:00
TreeHugger Robot
5d31a69d65 Merge "Remove tab symbol for app pinning strings" into tm-dev 2022-04-29 09:43:23 +00:00
Bonian Chen
ba943c9b94 [Settings] Rename title of SIM UI when changed
Title of subscription page should align with the SIM card.

Bug: 230308627
Test: local
Change-Id: Iab9ba25ac8c3faf7d37f97c8f3f3488cbaa2e228
2022-04-29 09:10:47 +00:00
Chaohui Wang
71e03076cd Merge "Fix flicker for Mobile data & Wi-Fi page" into tm-dev 2022-04-29 08:26:24 +00:00
Tsung-Mao Fang
a95b12f921 Remove tab symbol for app pinning strings
The pinning description can't align together
in certain device.

To mitigate the alignment problem, we try to
remove the \t character now.

Test: visual
Fix: 222617691
Change-Id: I35974caf9d6fa316a6e4a0a5200ccab6a80f915b
2022-04-29 07:41:33 +00:00
Tom Hsu
1d0f85a3d6 Merge "[Panlingual] Avoid activity restart during rotation" into tm-dev 2022-04-29 07:14:14 +00:00
Arc Wang
a3c7f8482a Merge "Prevent side channel package installation enumeration" into tm-dev 2022-04-29 07:12:06 +00:00
Bonian Chen
0f68faf996 [Settings] Avoid from crash UI when querying data usage
Screen update been requested while querying data usage and response not
yet available.
This change tried to avoid from updating the UI in this case.

Bug: 210664126
Test: local
Change-Id: Id055fbd441936a9842b4acc978a894a855165bb7
2022-04-29 14:28:19 +08:00
Stanley Wang
4cedce018a Merge "Fixe the problem of invalid switch preference." into tm-dev am: 0e861f0993 am: 5e5ea25a2b am: 6ef0f6fed7 am: 908868a215
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17950076

Change-Id: I808ce0d069182656758ce3f413a6c06a92f8dde3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 05:32:49 +00:00
Xinyi Zhou
eab23af22e Delete Fast Pair Settings am: 3438e20da1 am: 14c317a689 am: 425316caae am: 844be62f38
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17968888

Change-Id: I98ffc0ac3dcc922d03bd61cafee0fa6be0eb993e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 05:32:41 +00:00
Stanley Wang
ac4263c5d9 Merge "Fixe the problem of invalid switch preference." into tm-dev am: 0e861f0993 am: 5e5ea25a2b am: 602b1f3d9d am: bd50a87911
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17950076

Change-Id: Iea6b42c8e00749c5209a3748105bfd17fba218c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 05:32:34 +00:00
Xinyi Zhou
143a59213b Delete Fast Pair Settings am: 3438e20da1 am: e2db47e9ab am: d318a79c25 am: 64e9591e7f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17968888

Change-Id: I7595c23af2be91dfd9ff32fbca1203e972362f99
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 05:32:26 +00:00
Xinyi Zhou
aafebb3890 Delete Fast Pair Settings am: 3438e20da1 am: e2db47e9ab am: 4be70892e9 am: 815bbd8c1b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17968888

Change-Id: I878e145a67fd799b5868af4a5e15b196cd6f985a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 05:32:17 +00:00
Bonian Chen
c89e39cd76 Merge "[Settings] Fix flaky presubmit failure" into tm-dev am: 43cf210f90 am: 313284a9ae am: 6ed05ee86f am: aaf90b2592
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17914304

Change-Id: Ie71920caa92f6ebba0d89b477f98546658286733
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 05:32:09 +00:00
Automerger Merge Worker
05b15207dd Merge "Merge "Fix ZenModeScheduleRuleSettingsTest to test onAttach" into tm-dev am: 29c62e7873 am: b16261a8e1" into tm-d1-dev-plus-aosp am: 2e0303ef25 am: 1b777b7d8b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944009

Change-Id: I03fb323ada5e32b1f9d22c271d81ac2481eeb077
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 05:32:02 +00:00
Bonian Chen
fcae58a2be Merge "[Settings] Fix flaky presubmit failure" into tm-dev am: 43cf210f90 am: 935706425d am: 3a21d96f32 am: e09189620d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17914304

Change-Id: I3245b06427f7cf9cc4fdf49a665d7b11672dc258
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 05:31:54 +00:00
Bonian Chen
0771bd29da Merge "Revert "[Settings] Code refactor for BroadcastReceiver under Lifecycle"" into tm-dev am: b92156c03e am: dbbab09d11 am: a9026bb486 am: 6fdeff527b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17950673

Change-Id: Idb92dabecec6d5a9e74119e5e3f694c6d78b2155
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 05:31:46 +00:00
Yuri Lin
12cc159635 Merge "Fix ZenModeScheduleRuleSettingsTest to test onAttach" into tm-dev am: 29c62e7873 am: 0e7619f290 am: 16a5535dd3 am: 9bc2aff5d7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944009

Change-Id: I7bc99887fbb074656f3fc9a9e5db1daa2549b751
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 05:31:37 +00:00
Lais Andrade
3a911d3ccc Merge "Create separate On/Off string resources for Vibration & haptics" into tm-dev am: 9c8d1e94fb am: 9066672c7d am: 4e60155f11 am: b34d581d2c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17914337

Change-Id: I65d89470d033723d85c8aa2f418ab0c7ff201b2a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 05:31:20 +00:00
Bonian Chen
54b7f79b9e Merge "Revert "[Settings] Code refactor for BroadcastReceiver under Lifecycle"" into tm-dev am: b92156c03e am: f211a82f23 am: fc454f31aa am: 0c22cd1ddd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17950673

Change-Id: I0aebd13b436ef49d6a9e93e0f98f753579d632c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 05:31:12 +00:00
Lais Andrade
fa9ed2d41f Merge "Create separate On/Off string resources for Vibration & haptics" into tm-dev am: 9c8d1e94fb am: e673e22181 am: ae1ae56fb2 am: b760de645d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17914337

Change-Id: Ia26878f9d31b799e5754ef7d61ac83ac575eec16
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 05:31:03 +00:00
TreeHugger Robot
e9142fecc0 Merge "Make the checkbox item large enough to click." into tm-dev am: 9fd4377ddb am: 54467e3eb8 am: 966e1e8e49 am: e0c25fddba
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17950068

Change-Id: I59b56a22f116be58cbc6ecfb6e551779fd136938
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 05:30:56 +00:00
Bonian Chen
d881a708e7 Merge "[Settings] Fix flaky presubmit failure" into tm-dev am: 43cf210f90 am: 313284a9ae am: 5b79b590c4 am: 14ccecd03b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17914304

Change-Id: Ie0af96828067f7b2216aaca7b456fad8f5bb9554
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 05:30:48 +00:00
Yuri Lin
a943c50963 Merge "Fix ZenModeScheduleRuleSettingsTest to test onAttach" into tm-dev am: 29c62e7873 am: b16261a8e1 am: 8a3c983398 am: 727d912d0b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944009

Change-Id: Ie628eca1e752b3dfd3c20284ba969a7d367a8a21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 05:30:39 +00:00
Bonian Chen
57b410e60f [automerger skipped] Merge "Revert "[Settings] Code refactor for BroadcastReceiver under Lifecycle"" into tm-dev am: b92156c03e am: dbbab09d11 am: a725b0c3da am: 3c4956b7c4 -s ours
am skip reason: skipped by user bonianchen

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

Change-Id: I1b4dffff12aa041da05d6b021f23e3fbb5dde7cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 05:23:42 +00:00
Julia Reynolds
312de956ec Merge "Move REVIEW_PERMISSIONS_NOTIFICATION_STATE to Global from Secure" into tm-dev 2022-04-29 05:11:26 +00:00
TreeHugger Robot
fc6cb73d29 Merge "Hide running time information for "Android System" entry" into tm-dev 2022-04-29 04:32:41 +00:00
Lais Andrade
9cae3d694e Merge "Create separate On/Off string resources for Vibration & haptics" into tm-dev am: 9c8d1e94fb am: 9066672c7d am: 109b181126 am: 94c826bda7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17914337

Change-Id: Ic300a4b801c9ae8ce49f6378a381703eddd5a8df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 04:04:59 +00:00
TreeHugger Robot
8e5cb44ef8 Merge "Make the checkbox item large enough to click." into tm-dev am: 9fd4377ddb am: 39cbfbfed5 am: c1cdae7699 am: 9a9d90d8d3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17950068

Change-Id: I4a1ece82b2d6a5b6e71b312f0b194f51b6355b46
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 04:04:51 +00:00
TreeHugger Robot
a8db6377ae Merge "Make the checkbox item large enough to click." into tm-dev am: 9fd4377ddb am: 39cbfbfed5 am: 094cde648b am: 520db6c09d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17950068

Change-Id: I66719a2e391fc5ac42a535248015397f35b3c9ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 04:04:40 +00:00
TreeHugger Robot
2a68a9354a Merge "Fix collapsing toolbar can't collapse problem" into tm-dev am: 5395a4eb28 am: b0bf5dd13f am: 46dda94691 am: 61e4005b0c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944164

Change-Id: I979acae3527b1568e6aef564fbdeaa285c082bde
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 04:04:32 +00:00
TreeHugger Robot
8115c62073 Merge "Fix collapsing toolbar can't collapse problem" into tm-dev am: 5395a4eb28 am: aee4b8e3d4 am: 2a742b1774 am: 8325e40813
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944164

Change-Id: I3023898eb2e61a11b8c48a680522b3196d1757fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 04:04:24 +00:00
TreeHugger Robot
9686842b72 Merge "Fix collapsing toolbar can't collapse problem" into tm-dev am: 5395a4eb28 am: aee4b8e3d4 am: 8f618ea83a am: fae9bbbb2e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944164

Change-Id: I925614cdac0ed03045d9816c2de8cdf28cbedc1e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 04:04:17 +00:00
Alex Johnston
d041599d3f Merge "Fix USB tethering grey out behaviour" into tm-dev am: 7828dda503 am: 56807e16f5 am: 447dae8143 am: a08ffe1256
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944005

Change-Id: I34a49042446e4ddddb7b5f71348ad99db9771584
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 04:04:03 +00:00
Alex Johnston
0c0704b6f7 Merge "Fix USB tethering grey out behaviour" into tm-dev am: 7828dda503 am: d45cab5850 am: 8f02d3da63 am: 636bf7d186
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944005

Change-Id: I023cc0163336902473fb87757c16a0bc2b4fca74
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 04:03:55 +00:00
Alex Johnston
a6016441f9 Merge "Fix USB tethering grey out behaviour" into tm-dev am: 7828dda503 am: d45cab5850 am: 8229b0fbf7 am: f8ee374a19
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944005

Change-Id: I4f50807a6c72db3534c32dd94440760e3a820e89
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 04:03:45 +00:00
Calvin Pan
8ad2642b5f Merge "Add unit test for AppLocalePickerActivity" into tm-dev 2022-04-29 03:56:56 +00:00
Betty Chang
7711207ba5 Merge "[LE] Launch the MediaOutputBroadcastDialog when the current device is broadcasting" into tm-dev 2022-04-29 03:33:55 +00:00
Amy Hsu
19b9978591 Merge "[ScreenResolutionController] UI string update" into tm-d1-dev 2022-04-29 03:25:34 +00:00
ykhung
1c3cb4505c Hide running time information for "Android System" entry
Hide the running time information for "Android System" entry, since this
entry will combine multiple system components together. It will provide
incorrect running time information. The getRealUid() method maps many
UIDs to Process.SYSTEM_UID(1000), which results in combining all of
those UIDs into one "Android System" entry. This is the expected behavior.

Bug: 220717612
Test: make RunSettingsRoboTests -j56 ROBOTEST_FILTER="com.android.settings.fuelgauge"
Change-Id: I0aece0f1e86c36e55a2b5a966b4da9fdea14c748
2022-04-29 02:40:07 +00:00
TreeHugger Robot
96e12783cc Merge "Import translations. DO NOT MERGE ANYWHERE" 2022-04-29 02:36:28 +00:00