Commit Graph

72444 Commits

Author SHA1 Message Date
Peter Wang
b4f375fdc4 Merge "Add an intent filter for MobileNetworkListActivity to enable access from the LPA" am: ffccb8a611
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1554772

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia9cd23da0ae90f7f5c38fae54900b30e7ca12bad
2021-01-27 22:03:32 +00:00
Peter Wang
ffccb8a611 Merge "Add an intent filter for MobileNetworkListActivity to enable access from the LPA" 2021-01-27 21:39:51 +00:00
Yo Chiang
06bf3f1993 Merge "Remove feature flag "settings_dynamic_system"" am: df58c6505d am: 7ac7030d49
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1540949

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I11d9849150aac649b704cfa129256deba6ac862b
2021-01-26 23:08:05 +00:00
Yo Chiang
7ac7030d49 Merge "Remove feature flag "settings_dynamic_system"" am: df58c6505d
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1540949

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I141aeae1f09a535aad5084f335c6ecbed696bfde
2021-01-26 11:34:53 +00:00
Yo Chiang
df58c6505d Merge "Remove feature flag "settings_dynamic_system"" 2021-01-26 10:53:54 +00:00
android-build-team Robot
07414f0e08 Snap for 7100068 from d70a7f7442 to rvc-qpr3-release
Change-Id: Ie94e3d73342ba140a9d49edfd378ac54bf0319c7
2021-01-24 22:09:53 +00:00
Bill Yi
195b137800 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d70a7f7442 -s ours
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0c33d55aab01e1a4bfc168b995dd4f6bd0e452b3
2021-01-24 17:17:21 +00:00
Bill Yi
d70a7f7442 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I31f2d5d2686777c42e311f92bc352efd150eb164
2021-01-24 00:41:08 -08:00
Peter Wang
7e8d24e073 Add an intent filter for MobileNetworkListActivity to enable access
from the LPA

Bug: 170507492
Test: Local
Change-Id: I6e87d3a3c75c832354c3a3ad407889e8d2701cbd
Merged-In: I6e87d3a3c75c832354c3a3ad407889e8d2701cbd
2021-01-19 22:21:45 -08:00
android-build-team Robot
d2e188ce75 Snap for 7085329 from d0e76c6245 to rvc-qpr3-release
Change-Id: I603c059f05949631da1921e22c4cb6662f0f2a46
2021-01-16 00:10:21 +00:00
Bill Yi
f1d3def534 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d0e76c6245 -s ours
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I09ad3498255e42ca23debb04cb6eed6cfb5bc488
2021-01-15 07:48:35 +00:00
Bill Yi
d0e76c6245 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I84b4dc12bad46b115fabd1c1dd6a756d5705a712
2021-01-14 22:07:28 -08:00
Yo Chiang
f1065e359f Remove feature flag "settings_dynamic_system"
Bug: 176795908
Test: Presubmit
Test: DSULoader
Change-Id: Ib6b450489c63913c47858cf295e4785fd5d0cfbb
Merged-In: Ib6b450489c63913c47858cf295e4785fd5d0cfbb
2021-01-14 15:47:41 +08:00
android-build-team Robot
8822ac1014 Snap for 7080714 from bb974b69a0 to rvc-qpr3-release
Change-Id: I9c0a48ef0b28a0f2df3601201abab02c6353704c
2021-01-14 00:11:58 +00:00
TreeHugger Robot
a8b695c31f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: bb974b69a0 -s ours
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I890c875c147001a6d2318b95f7091327e9063c78
2021-01-13 18:42:26 +00:00
TreeHugger Robot
bb974b69a0 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-01-13 17:58:40 +00:00
Bill Yi
129b3b91d1 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Iaea90af3fb9836088e85de6a8a692b965b4419fa
2021-01-12 23:26:57 -08:00
android-build-team Robot
cde220a546 Snap for 7077839 from 07bb0280f6 to rvc-qpr3-release
Change-Id: I48c10ed7610648a4fa2c84d5a15198a471188024
2021-01-13 00:29:38 +00:00
Benjamin Franz
04bbd87254 Merge "Update constructor usage for CompatibilityChangeInfo" am: 39a920dd22 am: 9229794727
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1541372

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I91b4bd641afa6811cb5837763e60fbfd0decb82e
2021-01-12 16:41:53 +00:00
Benjamin Franz
9229794727 Merge "Update constructor usage for CompatibilityChangeInfo" am: 39a920dd22
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1541372

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4946065f619aac04cf681c310bfe04a6e5e68099
2021-01-12 16:22:18 +00:00
Benjamin Franz
39a920dd22 Merge "Update constructor usage for CompatibilityChangeInfo" 2021-01-12 15:38:01 +00:00
Alisher Alikhodjaev
a75273fe12 Merge "Fix robotests failure in connectivity settings" into rvc-qpr-dev am: 07bb0280f6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13298728

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia942e29d02f120905558779723fdb4a7b00117f5
2021-01-11 23:31:02 +00:00
Alisher Alikhodjaev
07bb0280f6 Merge "Fix robotests failure in connectivity settings" into rvc-qpr-dev 2021-01-11 23:08:40 +00:00
android-build-team Robot
337559c32e Snap for 7072549 from 4046f5c134 to rvc-qpr3-release
Change-Id: If395515f9caab0933c644283d185fb96bb907e21
2021-01-09 22:10:26 +00:00
android-build-team Robot
0fce20219d Snap for 7071694 from 1d5c247dbf to rvc-qpr3-release
Change-Id: I8d1f1b963e12f71a707bd01f7e3d4168d3be7254
2021-01-09 00:11:07 +00:00
TreeHugger Robot
07c98be876 Merge "Add adaptive charging to the top level settings menu" into rvc-qpr-dev am: 4046f5c134
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13287641

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie23c4efbf1923e89c4f077decb397251f6c70f28
2021-01-09 00:02:13 +00:00
TreeHugger Robot
4046f5c134 Merge "Add adaptive charging to the top level settings menu" into rvc-qpr-dev 2021-01-08 23:16:28 +00:00
Bill Yi
834bce20d7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1d5c247dbf -s ours
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ife4a611a82a86cb6ed3236ed244cb691d48ea985
2021-01-08 18:00:46 +00:00
Bill Yi
1d5c247dbf Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ic94d377a34a4c4e4df254418e06023ef13abb5b8
2021-01-08 07:36:39 -08:00
Treehugger Robot
f83f554a75 Merge "Fix too many receivers Exception" am: 2e6cde6b94 am: 8c2b2cc806
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1498417

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iac11b0261e6c2323558d974e7e81788c54661029
2021-01-08 10:14:26 +00:00
Treehugger Robot
8c2b2cc806 Merge "Fix too many receivers Exception" am: 2e6cde6b94
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1498417

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id69d676c8386f74a7e642984ea7387baacd2711c
2021-01-08 09:22:52 +00:00
Treehugger Robot
2e6cde6b94 Merge "Fix too many receivers Exception" 2021-01-08 05:35:46 +00:00
Bryan Ferris
1b11dbe557 [automerger skipped] Merge "RESTRICT AUTOMERGE Update String" into pi-dev am: 8a79a4314d -s ours am: 12033fe425 am: f5477b05d9 -s ours am: 857f330841 am: 421dce1928
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13276368

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifc4696861836d97e73a376f20280a16cc6f236ca
2021-01-08 04:16:46 +00:00
Bryan Ferris
421dce1928 [automerger skipped] Merge "RESTRICT AUTOMERGE Update String" into pi-dev am: 8a79a4314d -s ours am: 12033fe425 am: f5477b05d9 -s ours am: 857f330841
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13276368

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1b1f1188958d52b025bd67bc27c847725b38598f
2021-01-08 03:53:39 +00:00
Bryan Ferris
857f330841 [automerger skipped] Merge "RESTRICT AUTOMERGE Update String" into pi-dev am: 8a79a4314d -s ours am: 12033fe425 am: f5477b05d9 -s ours
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I41680fe10178c008dbf5a173f8c73892cb49422d
2021-01-08 03:17:10 +00:00
Bryan Ferris
f5477b05d9 [automerger skipped] Merge "RESTRICT AUTOMERGE Update String" into pi-dev am: 8a79a4314d -s ours am: 12033fe425
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13276368

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie1e8ff34d2a4976e89d5cbe03db797156dc764e5
2021-01-08 02:56:12 +00:00
Bryan Ferris
12033fe425 [automerger skipped] Merge "RESTRICT AUTOMERGE Update String" into pi-dev am: 8a79a4314d -s ours
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I23717e289650bb8996db1e51e601b78515cdd81b
2021-01-08 02:12:14 +00:00
Bryan Ferris
8a79a4314d Merge "RESTRICT AUTOMERGE Update String" into pi-dev 2021-01-08 01:35:51 +00:00
android-build-team Robot
3e640171df Snap for 7069213 from 072b5f4bda to rvc-qpr3-release
Change-Id: Id132ba8b1e6dc33ad9a9431b52b814e40594b186
2021-01-08 00:12:48 +00:00
TreeHugger Robot
8c2cbae90a Merge changes Ib9a3c4fa,Idc6ef558 into qt-dev am: c0cd669bef am: af29a157db am: 0b9260031d am: b9faf1cd4a am: 072b5f4bda
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13275409

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I43d14c1a953f1ae7183acfddd88bf0384f5637f5
2021-01-07 18:31:47 +00:00
Hugh Chen
99b1567fc2 [automerger skipped] RESTRICT AUTOMERGE Update String am: 19aeca103d am: 5108e1bd83 -s ours am: 13a927cb9c am: b16061d3ad am: b21ad75989
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13275409

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I29353db2b0e9063601aaa8d69baa037c146b943a
2021-01-07 18:31:46 +00:00
Hugh Chen
5338b30942 [automerger skipped] RESTRICT AUTOMERGE Update String am: 48ec74592d -s ours am: 57358903b3 -s ours am: 77d2c798e5 am: 84f9417fa2 -s ours am: fc0292dc19 am: 724278a1fa am: 0dd7f8dbef
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13275407

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I98f1e8a2518ee278963fd4f63edf7b043445dd14
2021-01-07 18:31:37 +00:00
Hugh Chen
6591058f84 [automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: 9037e43fa8 -s ours am: d6bc0a328f -s ours am: 5036eee733 am: 535f5ba053 -s ours am: d62def70c7 am: bfd2571c3b am: 28243b2996
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13275406

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I74b19a40f47bf2c67ba55cbd9c158c34320a75b8
2021-01-07 18:31:36 +00:00
TreeHugger Robot
0dd34e2c31 [automerger skipped] Merge "RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message" into pi-dev am: 1a6a1b12ef -s ours am: c5f7e582b4 am: 5bd40911f5 -s ours am: 6bae86bec6 am: 7ff97d7703 am: 17fd90a341
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13276367

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I82d2b0993fcd5c12491f43453cbb94479caf911f
2021-01-07 18:31:23 +00:00
Hugh Chen
cb79c659b5 RESTRICT AUTOMERGE Update String am: 085f70d48d am: 4b22b601f7 am: 26623c9572
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13275411

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I84520568c24220945c1ce226bafb82f7a40367af
2021-01-07 18:31:16 +00:00
Hugh Chen
9d153e6331 [automerger skipped] DO NOT MERGE: resolve merge conflicts of c17ec818af to rvc-qpr-dev am: dc2b694a54 -s ours
am skip reason: Change-Id Iec4d1963e626829b696c2047c5979a684119acf7 with SHA-1 18c06480b0 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7b45cbf704ffd1558b681a4835bc628dcc132894
2021-01-07 18:31:10 +00:00
TreeHugger Robot
072b5f4bda Merge changes Ib9a3c4fa,Idc6ef558 into qt-dev am: c0cd669bef am: af29a157db am: 0b9260031d am: b9faf1cd4a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13275409

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icdf9619be3a9f6dc1cfc69d2c838d4bc3029746b
2021-01-07 17:59:36 +00:00
Hugh Chen
b21ad75989 [automerger skipped] RESTRICT AUTOMERGE Update String am: 19aeca103d am: 5108e1bd83 -s ours am: 13a927cb9c am: b16061d3ad
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13275409

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I20fbb662bb62a0a9437b7164905d9bc1960a8460
2021-01-07 17:59:34 +00:00
Hugh Chen
0dd7f8dbef [automerger skipped] RESTRICT AUTOMERGE Update String am: 48ec74592d -s ours am: 57358903b3 -s ours am: 77d2c798e5 am: 84f9417fa2 -s ours am: fc0292dc19 am: 724278a1fa
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13275407

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I76108459fe13df49071b464214a19ea922e7ddbb
2021-01-07 17:59:27 +00:00
Hugh Chen
28243b2996 [automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: 9037e43fa8 -s ours am: d6bc0a328f -s ours am: 5036eee733 am: 535f5ba053 -s ours am: d62def70c7 am: bfd2571c3b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13275406

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I716d7f0489e21ffc81cfbbaee3736b9d518fbd72
2021-01-07 17:59:25 +00:00