TreeHugger Robot
4b30a75450
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 37c4a74b27
-s ours am: 9c9dea5406
-s ours am: 4eef82d108
-s ours am: e634981491
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17930029
Change-Id: I214d1d0f16661e2711d71af3357b88dd732be41f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 00:30:15 +00:00
Bill Yi
01fe7ef850
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3f51a847ff
-s ours am: 88e3db5ba2
-s ours am: 4112503af4
-s ours am: d29e5cc4ec
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17930029
Change-Id: I09045df530501be1fb88a88251536dc300351945
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 00:29:34 +00:00
Automerger Merge Worker
ca597611c5
Merge changes from topic "am-828d7b02241a4b7fb76fe599192cd666" into tm-d1-dev-plus-aosp am: 7bd6130a60
am: 36900649d9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17933038
Change-Id: I2d236bf9377bb29f96ac25250ca9d189a821db8b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 00:26:58 +00:00
TreeHugger Robot
67c43ac3b0
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 3e8135ea74
-s ours am: 1f6b29b35a
-s ours am: e26c4e41ad
-s ours am: 56424d355e
-s ours am: c3d19b2c67
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17933038
Change-Id: Ia3dd4432d8dfcaacd8ccf46358ba0d586be4f863
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 00:26:42 +00:00
Automerger Merge Worker
710c94e17a
Merge changes from topic "am-505afd9430024806aa2c671aef3b93c5" into tm-qpr-dev-plus-aosp am: 192728f91e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17933038
Change-Id: I5f70c6d638aab1f8eea2eba02fee10cc3c59937d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 00:22:22 +00:00
TreeHugger Robot
78a59521cd
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 3e8135ea74
-s ours am: 1f6b29b35a
-s ours am: 68baeb6c08
-s ours am: 298cb3a25c
-s ours am: 5671e6d081
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17933038
Change-Id: I5b71e7e0f9804c69960ad235eb8707389eb2ff79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 00:22:07 +00:00
TreeHugger Robot
39f3636b95
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 3e8135ea74
-s ours am: 1f6b29b35a
-s ours am: 68baeb6c08
-s ours am: 615c81031b
-s ours am: 02457d0e68
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17933038
Change-Id: I8e4852fe4c64defbfd5361a57220b651e246244a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 00:14:06 +00:00
Bill Yi
b3f7982a7c
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0c2f84941f
-s ours am: 7146184316
-s ours am: c2b193716b
-s ours am: 9f8abb6e53
-s ours am: 025c03d6f9
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17933038
Change-Id: I925db092d058add5de31ecba3a5bd0ec9656d833
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 00:13:50 +00:00
TreeHugger Robot
6319f3f08e
Merge "Fix the description of one-handed mode doesn't change immediately in Gestures page after users turn on/off in Quick Settings" into tm-dev am: a72b9398fb
am: be39eb0ad1
am: 20a6096aae
am: df8346c483
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944022
Change-Id: I5a9a4fedfc9f43662e70b8f6fdf0872f50c3d008
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 00:12:34 +00:00
TreeHugger Robot
dc0839c856
Merge "Fix the description of one-handed mode doesn't change immediately in Gestures page after users turn on/off in Quick Settings" into tm-dev am: a72b9398fb
am: daf63cf01e
am: 0fe59d8923
am: 7b78ba43d1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944022
Change-Id: I9d47e519df681a0cb38ca5721f7573a29a31a228
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 00:12:27 +00:00
TreeHugger Robot
75ace75c4c
Merge "Fix the description of one-handed mode doesn't change immediately in Gestures page after users turn on/off in Quick Settings" into tm-dev am: a72b9398fb
am: be39eb0ad1
am: dfd4ecad02
am: 3929ebd72d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944022
Change-Id: I93abb24088d5a53a8dadad3fd2d57539d7effcb8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 00:12:17 +00:00
Automerger Merge Worker
7d16ba0e17
Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 35705d94c8
-s ours am: fa497ab8af
-s ours am: 82c384c62d
-s ours" into tm-d1-dev-plus-aosp am: a76378a81f
-s ours am: 568ac16fd7
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17934542
Change-Id: I50b66012381d285bb98753425758bb3fd32923e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 00:09:34 +00:00
Bill Yi
b0eae03407
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 35705d94c8
-s ours am: fa497ab8af
-s ours am: 82c384c62d
-s ours am: eb5995a968
-s ours am: ee81bf15c4
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17934542
Change-Id: I6b97b5449c0d9383a3f834fbf70c890c85c24807
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 00:09:12 +00:00
Automerger Merge Worker
a73b5018b0
Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 35705d94c8
-s ours am: fa497ab8af
-s ours am: cb6059d24d
-s ours am: 1d14eb1b01
-s ours" into tm-qpr-dev-plus-aosp am: 6c462552d0
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17934542
Change-Id: I42bb8d3c3529877a305a13164dc9a347de620ca4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 00:06:05 +00:00
Bill Yi
1314169d3d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 35705d94c8
-s ours am: fa497ab8af
-s ours am: cb6059d24d
-s ours am: 1d14eb1b01
-s ours am: b236dc122f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17934542
Change-Id: I7339c34fe8a59054221489e1ea5ce90de0c2ea86
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 00:05:48 +00:00
Automerger Merge Worker
998cd94408
Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 35705d94c8
-s ours am: fa497ab8af
-s ours am: 82c384c62d
-s ours am: e482bd0e01
-s ours am: bcb09a4db2
-s ours"
2022-04-29 00:02:41 +00:00
Abel Tesfaye
3fb18c1505
Merge "Merge auto-rotate comment/style fixes from tm-dev that couldn't be cherry picked into master"
2022-04-29 00:02:36 +00:00
Bill Yi
1dfca8360a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 35705d94c8
-s ours am: fa497ab8af
-s ours am: 82c384c62d
-s ours am: e482bd0e01
-s ours am: bcb09a4db2
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17934542
Change-Id: I83c4e913f6cc5a8e8f2ee59997acee74bc744324
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 00:00:35 +00:00
William Leshner
2950e7c84d
Merge "Disable screen saver setting for non-system users." into tm-qpr-dev am: ed5ba9a647
am: e708b185e8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17871948
Change-Id: Iba3719c80fccd9b8b7a6e88c7ed5dc334804f52d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-28 23:59:44 +00:00
Bonian Chen
17be1037ee
Merge "[Settings] Code refactor for BroadcastReceiver under Lifecycle" into tm-dev am: 73c8e2f45a
am: bad5635b38
am: 6baccf2f44
am: 2089e8add0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17859326
Change-Id: Ie3b914514589ab3292e2c8ef5bf92b799d848054
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-28 23:59:35 +00:00
Bonian Chen
3ae0cbaad4
Merge "[Settings] Code refactor for combining TelephonyCallback with Lifecycle" into tm-dev am: 3fc05a917e
am: e8619c8d08
am: 5b68b8eedd
am: 6bb8c2cdd8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17903597
Change-Id: I780d10c51847abbbe4d6c57cffb5595cbe03858f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-28 23:59:28 +00:00
Bonian Chen
df82b11ff3
Merge "[Settings] Code refactor for BroadcastReceiver under Lifecycle" into tm-dev am: 73c8e2f45a
am: 1d1c2826c9
am: a3df120063
am: 3cf209a5ec
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17859326
Change-Id: I1339eb05f8a1f9aaeccb268e470c752096720774
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-28 23:59:20 +00:00
Bonian Chen
47e8527f6b
Merge "[Settings] Code refactor for combining TelephonyCallback with Lifecycle" into tm-dev am: 3fc05a917e
am: 6483721f20
am: d8bd42d6f3
am: 98875e52e8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17903597
Change-Id: Ic721a35a4e4b67826f466f4c6cbac491c3530269
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-28 23:59:12 +00:00
Jason Hsu
ec231955bc
Merge "Correct Magnification shortcut title" into tm-dev am: 12c10cfa5c
am: c0fb12cf7c
am: 691b1ef4f0
am: ef96d03e48
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17910930
Change-Id: Ifb642bc91dc2f8ea80c2234f805f3179c109ae51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-28 23:59:05 +00:00
Jason Hsu
22c79c504a
Merge "Correct Magnification shortcut title" into tm-dev am: 12c10cfa5c
am: 2fc065c351
am: cd187d8bed
am: bd3c43b150
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17910930
Change-Id: I800a0a2878273f5d01f3ee4f3f710c93f419752d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-28 23:58:57 +00:00
Bonian Chen
851c7377a8
Merge "[Settings] Code refactor for BroadcastReceiver under Lifecycle" into tm-dev am: 73c8e2f45a
am: bad5635b38
am: a28e63c502
am: ad45786342
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17859326
Change-Id: Ieaeff53e9d4e7bf1cfda1bdfe04f03071c33a7cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-28 23:58:48 +00:00
TreeHugger Robot
0a2b1de3a5
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev
2022-04-28 22:57:53 +00:00
Prabal Singh
7642301f28
Merge "Remove extra argument WorkPolicyUtil constructor" into tm-dev am: 9a8f44227e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17981601
Change-Id: I0e90fc35f7916ae920ce08a2da996d69e01cf80f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-28 20:51:44 +00:00
Prabal Singh
13ce7c8eaf
Merge "Remove extra argument WorkPolicyUtil constructor" into tm-dev am: 9a8f44227e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17981601
Change-Id: Ie1a4b549c089febb2bed325aace1b328b7adbf83
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-28 20:42:55 +00:00
Prabal Singh
89e0eda197
Merge "Remove extra argument WorkPolicyUtil constructor" into tm-dev am: 9a8f44227e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17981601
Change-Id: Ibfa6243c7bb5757515ed2388f2acec1547c023d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-28 20:41:46 +00:00
Quang Luong
aa7a544c93
Merge "Use WifiEntry.getBandString() to show band for Frequency preference"
2022-04-28 20:29:40 +00:00
Weng Su
5e3d75a6f9
Show restricted message in Wi-Fi Direct summary
...
- See the result screenshot in b/203168953#comment9
Bug: 203168953
Test: manual test
make RunSettingsRoboTests \
ROBOTEST_FILTER=WifiP2PPreferenceControllerTest
Change-Id: I87ad6d7554fbb4aa86d4617438fa359c67544812
2022-04-29 03:41:56 +08:00
Alex Spradlin
626169306f
Merge [Settings] Code refactor for combining TelephonyCallback with Lifecycle into tm-dev am: 3fc05a917e
am: e8619c8d08
am: 13ae7a955c
...
This is to unstick Automerger.
Bug: 230457013
Change-Id: If8bc472fbfe961daa48c64e37fe80a3cc0383bae
2022-04-28 19:26:17 +00:00
Bill Yi
fa29c0c3bc
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: aedbfeb8b8
2p: 737ee1e1a7
...
Blank merge reason: parent was merged -s ours
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18062875
Bug: 205460459
Change-Id: Ic315f239b7f44fccb3ffdf859a920c7bbdda7602
2022-04-28 18:52:14 +00:00
Bill Yi
737ee1e1a7
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: aedbfeb8b8
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18062875
Bug: 205460459
Change-Id: I51afb40dfedcc3495b937de9d81e15c82a3bf90b
2022-04-28 18:51:58 +00:00
Bill Yi
bf87406634
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: aedbfeb8b8
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18062875
Bug: 205460459
Change-Id: Ia2ea434fb2d27315227d57f23eb63bae7ecb821a
2022-04-28 18:51:57 +00:00
Bill Yi
b81da264a8
Import translations. DO NOT MERGE ANYWHERE
...
BUG:205460459
Auto-generated-cl: translation import
Change-Id: I93c43875f9bc7b4cb45bb663c70410fa3fcaeead
2022-04-28 18:48:59 +00:00
Bill Yi
aedbfeb8b8
Import translations. DO NOT MERGE ANYWHERE
...
BUG:205460459
Auto-generated-cl: translation import
Change-Id: I5bb2a5d970bbdff0ea715cef8f0fca7bd052a670
2022-04-28 18:46:21 +00:00
Bill Yi
42c15dc26c
Import translations. DO NOT MERGE ANYWHERE
...
BUG:205460459
Auto-generated-cl: translation import
Change-Id: Ie80b96d07d3e8bd2c55b86e0af83bdb6a418b3fc
2022-04-28 18:43:59 +00:00
Bill Yi
ac6b0bdef6
Import translations. DO NOT MERGE ANYWHERE
...
BUG:205460459
Auto-generated-cl: translation import
Change-Id: I669099ad00ba7d90013836e3d456d530ae725b2f
2022-04-28 18:39:25 +00:00
Weng Su
4e34e65228
Show restricted message in Wi-Fi hotspot summary
...
- Refine WifiTetherPreferenceController
- See the result screenshot in b/203168953#comment8
Bug: 203168953
Test: manual test
make RunSettingsRoboTests \
ROBOTEST_FILTER=WifiTetherPreferenceControllerTest
Change-Id: If094178eb0cd9ccf20ff3899dc4b087b45c66f6b
2022-04-28 18:28:49 +00:00
Bill Yi
392df50da0
Import translations. DO NOT MERGE ANYWHERE
...
BUG:205460459
Auto-generated-cl: translation import
Change-Id: I67386b7749b6575747c0507e3841fa404c6a69f4
2022-04-28 18:23:10 +00:00
ykhung
c12b9500e6
Refine the BatteryUsageStats close() method invoke timing
...
Refine invoke batteryUsageStats.close() timing to 1) avoid closing it before the UI is ready to ignore showing the battery usage app list data for AOSP version, and 2) avoid close the BatteryUsageStats which is passed from caller components in the BatteryInfo with unexpected behavior.
Bug: 220717612
Test: make RunSettingsRoboTests -j56 ROBOTEST_FILTER="com.android.settings.fuelgauge"
Change-Id: I0f75580ac68d72b41fa9a7f43aa6ea694f0992ff
2022-04-28 17:16:04 +00:00
Prabal Singh
9a8f44227e
Merge "Remove extra argument WorkPolicyUtil constructor" into tm-dev
2022-04-28 17:12:28 +00:00
Jan Tomljanovic
c15fb9ed81
Update the SafetyCenter icon
...
Test: manual
Bug: 230731934
Change-Id: I11a82348b77b5e162e9dfaf5bfa91642db709f6f
2022-04-28 17:09:05 +01:00
Chaohui Wang
ddedb31f6e
Fix flicker for Mobile data & Wi-Fi page
...
Both "Mobile data usage" & "Non-carrier data usage".
By,
1. Add header in onCreate() instead of onViewCreated()
2. Keep the space for Spinner, and preload initial cycles
3. Keep the space for 3 usage summaries
Bug: 191730864
Test: manual
Change-Id: I8c309c5f51ce6290383a2d10f75e41d0f207d61a
2022-04-28 23:00:57 +08:00
Prabal Singh
3e2d7f4581
Remove extra argument WorkPolicyUtil constructor
...
Only constructor is required for WorkPolicyInfo constructor. The other
dependencies can be derives
Test: make ROBOTEST_FILTER=EnterprisePrivacyFeatureProviderImplTest RunSettingsRoboTests -j40
Change-Id: I7f35e5ed344d452190b333aad7fa823a010d17b3
2022-04-28 15:21:18 +01:00
tom hsu
b899bd3690
[Panlingual] Avoid activity restart during rotation
...
Bug: 230680942
Test: local
Change-Id: Ib64509fb73fb363ad4dd5c2163659346295f581d
2022-04-28 21:32:33 +08:00
Automerger Merge Worker
40be7a2d38
Merge "Merge "[Settings] Link to incorrect SIM after SIM swap" into tm-dev am: 783314ae4f
am: f9be4c5a5c" into tm-d1-dev-plus-aosp am: 7e2bf6724a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17950991
Change-Id: I48a68315d6964d38390fd2d64d7ac4be29356781
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-28 13:02:49 +00:00
Bonian Chen
2c0598c3f5
Merge "[Settings] Link to incorrect SIM after SIM swap" into tm-dev am: 783314ae4f
am: 69aa69a45d
am: ae297c8f19
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17950991
Change-Id: I3c7646d6f98761ac9fae4676d5b2baa1eaed7198
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-28 13:02:32 +00:00