YK Hung
2c3560fbbb
Merge "Refine the BatteryUsageStats close() method invoke timing" into tm-dev am: 55fcb02aca
am: 2e7695458f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18030883
Change-Id: Ic9c2f1f9b03b554b8e876a59eb347a1f5be87bb0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 18:27:34 +00:00
Bill Yi
b2e1f16d8d
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: aedbfeb8b8
2p: 737ee1e1a7
am: fa29c0c3bc
-s ours am: 20df862686
-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: Iee180f4e6058a7cddbc27c848f7210ee7b51c365
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 18:27:26 +00:00
Kweku Adams
3a6186c952
Merge "Make final factors configurable." into tm-dev am: 3663986909
am: d3a367c5a9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17947486
Change-Id: Ifde5ac8c236bd25275ca73e5694e76a52c9fdf31
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 18:25:59 +00:00
Stanley Wang
e33f743ffb
Merge "Fixe the problem of invalid switch preference." into tm-dev am: 0e861f0993
am: 26fbf21152
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17950076
Change-Id: I016f2cc41b6a8e7102a6626f7f18e06831b27a04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 18:25:35 +00:00
Prabal Singh
4cdce44fac
Merge "Remove extra argument WorkPolicyUtil constructor" into tm-dev am: 9a8f44227e
am: 7642301f28
am: f52e82eb8c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17981601
Change-Id: I40a8b70116ad90a54c39f8b7405795141c894edd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 18:25:26 +00:00
Xinyi Zhou
35430e6c79
Delete Fast Pair Settings am: 3438e20da1
am: 87259241de
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17968888
Change-Id: I42d4bcfaec55c8677f5be9538102d35a901bc964
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 18:25:22 +00:00
Bill Yi
f6c96fc635
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 9ee24ae348
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17929613
Change-Id: I7edb62af81ab60ec8567782b0c293b8967b8a9f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 18:25:07 +00:00
Bonian Chen
448a4c1161
Merge "[Settings] Fix flaky presubmit failure" into tm-dev am: 43cf210f90
am: b5852f6685
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17914304
Change-Id: Ia43915dd9d429ecc60060d55754f7c2feebc1451
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 18:24:43 +00:00
Yuri Lin
cf900b1598
Merge "Fix ZenModeScheduleRuleSettingsTest to test onAttach" into tm-dev am: 29c62e7873
am: 48f463d840
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944009
Change-Id: I40b0b22315965667c017dc206ad5221a52579a34
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 18:24:30 +00:00
Bonian Chen
a792b884d7
[automerger skipped] Merge "Revert "[Settings] Code refactor for BroadcastReceiver under Lifecycle"" into tm-dev am: b92156c03e
am: c406279030
-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: I13f0fce78d7a156d560c54472f1e8d3999826195
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 18:24:20 +00:00
Amy Hsu
8d3a4324e5
Merge "[ScreenResolutionController] UI string update" into tm-d1-dev am: 19b9978591
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17983872
Change-Id: Ib2e443b2385b482b78cb47ea4241ee28f0e7a3e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 18:22:47 +00:00
Prabal Singh
294134ce05
Merge "Remove extra argument WorkPolicyUtil constructor" into tm-dev am: 9a8f44227e
am: 89e0eda197
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17981601
Change-Id: Ic1978699a9611fbc0b6892d1279aaed20cd5e364
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 18:03:06 +00:00
Prabal Singh
f52e82eb8c
Merge "Remove extra argument WorkPolicyUtil constructor" into tm-dev am: 9a8f44227e
am: 7642301f28
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17981601
Change-Id: I7e08a7863af94ea3db2138797f18747e046b40ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 18:01:38 +00:00
Julia Reynolds
1f912cbfe3
Merge "Move REVIEW_PERMISSIONS_NOTIFICATION_STATE to Global from Secure" into tm-dev am: 312de956ec
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17871961
Change-Id: I76028b997fab517cb28d5dacc821c80cf777ec84
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 17:14:31 +00:00
TreeHugger Robot
6708570e2c
Merge "Hide running time information for "Android System" entry" into tm-dev am: fc6cb73d29
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18062824
Change-Id: Ia8cb12f3f41c3f9ba8cf5ef85d5d012a5fe7053c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 17:14:05 +00:00
Calvin Pan
38fac79ee6
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: I0314d4cf0c8d2232da05fd6b8eb9f417d718ecbf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 17:13:57 +00:00
Betty Chang
ec17c47421
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: I27aae2227a69fbe547a974e2d8a1054f1d87108d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 17:12:59 +00:00
TreeHugger Robot
70e4a209c8
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: I8145b6fae18d039c59cb7ad542d8623d94b4e3c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 17:12:25 +00:00
YK Hung
fc95a8f973
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: Ife069490f25bb4b7fbabf49992537711b21d5266
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 17:12:15 +00:00
Bill Yi
f7c06375b1
[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: I11013b1af35da8dfc6794f1fd656df9ea46d2243
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 17:12:04 +00:00
Julia Reynolds
58f0b1d55d
Merge "Move REVIEW_PERMISSIONS_NOTIFICATION_STATE to Global from Secure" into tm-dev am: 312de956ec
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17871961
Change-Id: I589aa8107d165479d380a23b18a4fbe74bdc5a09
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 16:51:50 +00:00
TreeHugger Robot
fbffb07088
Merge "Hide running time information for "Android System" entry" into tm-dev am: fc6cb73d29
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18062824
Change-Id: Ic0fb3fbcf3229c65ceb99fcfbceaeb3a2665b94e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 16:51:20 +00:00
Calvin Pan
215b87861a
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: Ib73ac117460a8229b9904c414b1a9cd99c6d0651
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 16:51:11 +00:00
Betty Chang
4779a03d38
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: I7a0697dc1f8cc801d702cf33c385097c42816e35
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 16:50:08 +00:00
TreeHugger Robot
05eb3510d4
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: I67831e6261c7722db40d6e24915f42495287b61e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 16:49:36 +00:00
YK Hung
8cda726e7f
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: I6a5042db0114e9d2da8748fb6a30a8f6aafae6ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 16:49:27 +00:00
Bill Yi
de605396bf
[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: Iabd5e1550f5d74ebcf69a39d82f8db2d8a2a4c69
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 16:49:17 +00:00
Julia Reynolds
e0d4b99626
Merge "Move REVIEW_PERMISSIONS_NOTIFICATION_STATE to Global from Secure" into tm-dev am: 312de956ec
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17871961
Change-Id: I805115970058ccaa97e4538955393c12bf5bb39d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 16:40:21 +00:00
TreeHugger Robot
964aeabd9e
Merge "Hide running time information for "Android System" entry" into tm-dev am: fc6cb73d29
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18062824
Change-Id: Iaefe2c50673077f1aac0e77f03e27451911a2885
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 16:39:55 +00:00
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