Commit Graph

85578 Commits

Author SHA1 Message Date
TreeHugger Robot
ed09bc316c Merge "LPP will now always launch either GlobalActions or the Assistant." into sc-dev am: 6bf17de139 am: f4977c5e36
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15603279

Change-Id: I9280c56af13dd05d67641fad0043b2b9b7811fab
2021-08-18 22:10:17 +00:00
TreeHugger Robot
9def67d894 Merge "LPP will now always launch either GlobalActions or the Assistant." into sc-dev am: 6bf17de139 am: 27f9d9ce04
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15603279

Change-Id: Ic349cb0e82e5c6a596ab232d3b23e333b1723241
2021-08-18 22:09:41 +00:00
TreeHugger Robot
f4977c5e36 Merge "LPP will now always launch either GlobalActions or the Assistant." into sc-dev am: 6bf17de139
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15603279

Change-Id: Id383cf7ad45bed45a88fdc1c5583097357634248
2021-08-18 21:56:42 +00:00
TreeHugger Robot
27f9d9ce04 Merge "LPP will now always launch either GlobalActions or the Assistant." into sc-dev am: 6bf17de139
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15603279

Change-Id: I8d7ecb3c01a7480669e39e0f371030a9ffa905f7
2021-08-18 21:55:56 +00:00
TreeHugger Robot
6bf17de139 Merge "LPP will now always launch either GlobalActions or the Assistant." into sc-dev 2021-08-18 21:38:32 +00:00
Neha Jain
7e8d554a59 Merge "Remove CDM entries in Connected Device." into sc-dev am: abd0f6a5f6 am: 59fb9ccac7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15486674

Change-Id: Iba630d04864c8f2ee8df3387a2454a5274ea7397
2021-08-18 18:26:08 +00:00
Neha Jain
92171172ec Merge "Remove CDM entries in Connected Device." into sc-dev am: abd0f6a5f6 am: bc0cf0d87f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15486674

Change-Id: I575d9f32e028249f49360b37dacfab9df9404e7f
2021-08-18 18:12:40 +00:00
TreeHugger Robot
a513ecb2da Merge "Move Automatic System Updates from Developer Options to System" into sc-qpr1-dev am: 190603f53d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15552651

Change-Id: Ia854e365a828137bcc3f6d112695ed2b1c051313
2021-08-18 18:12:32 +00:00
Neha Jain
bc0cf0d87f Merge "Remove CDM entries in Connected Device." into sc-dev am: abd0f6a5f6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15486674

Change-Id: I04fdc7c76285de7ad43b83846de10a377eb4f151
2021-08-18 18:12:08 +00:00
Neha Jain
59fb9ccac7 Merge "Remove CDM entries in Connected Device." into sc-dev am: abd0f6a5f6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15486674

Change-Id: If854986d16aeca997c309da10b5153600131389e
2021-08-18 18:11:06 +00:00
Neha Jain
abd0f6a5f6 Merge "Remove CDM entries in Connected Device." into sc-dev 2021-08-18 18:01:00 +00:00
TreeHugger Robot
190603f53d Merge "Move Automatic System Updates from Developer Options to System" into sc-qpr1-dev 2021-08-18 17:56:51 +00:00
Daniel Sandler
509670cb0d LPP will now always launch either GlobalActions or the Assistant.
Previously, on devices that default to launching Assistant
on long-press power, toggling this checkbox in Settings
would switch between that default (launching Assistant) and
a no-op. Those devices now toggle between Assistant and
GlobalActions (the power menu), just like devices that have
the old default behavior of LPP launching GlobalActions.

Change-Id: Id36031e70825da195f9c30ce05b3ae3d5e49b5fb
Test: make RunSettingsRoboTests \
	ROBOTEST_FILTER=LongPressPowerButtonPreferenceControllerTest
Bug: 192946325
2021-08-18 11:06:54 -04:00
Weng Su
fb29dc8a51 Fix Settings crash issue
- Add conditional checks to avoid UI updates when the fragment is
finishing or destoryed.

- Add conditional checks to avoid UI updates if the fragment resource is
not ready.

Bug: 185756174
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=NetworkProviderSettingsTest

Change-Id: I506ee81985158b8992529440a31d2d5cfe81f441
Merged-In: I506ee81985158b8992529440a31d2d5cfe81f441
(cherry picked from commit 1caaf7447d)
2021-08-18 07:46:39 +00:00
Weng Su
c7c7a813fb [Provider Model] Correct the Settings shortcut of the Settings Widget
The Settings is used the "Internet" settings instead of "Wi-Fi" settings
after Provider Model enabled.

The Settings shortcut of the Settings widget should update below.
  - Remove "Wi-Fi" shortcut from the Settings widget
  - Correct the "Network & internet" shortcut to "Internet"

Bug: 194644851
Test: manual test
  atest -c SettingsUnitTests
  make RunSettingsRoboTests
Change-Id: I488327a01f5e539ecbe315b7016f65084dfd59a1
Merged-In: I488327a01f5e539ecbe315b7016f65084dfd59a1
(cherry picked from commit 658a417205)
2021-08-18 07:45:55 +00:00
Calvin Pan
f687c1ea61 Merge "Remove unnecessary condition" into sc-qpr1-dev am: abb8a6abdc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15542134

Change-Id: I27ae050157e9143c0472d4e18ad7c29dab42d8c2
2021-08-18 06:56:25 +00:00
Calvin Pan
abb8a6abdc Merge "Remove unnecessary condition" into sc-qpr1-dev 2021-08-18 06:43:59 +00:00
Bill Yi
88a0994ed8 Import translations. DO NOT MERGE ANYWHERE
BUG:167403112

Auto-generated-cl: translation import
Change-Id: Id5c579245cf72f10f4d15fcb69d24bcf58dd281a
2021-08-17 22:14:24 -07:00
Bill Yi
f391df2089 Import translations. DO NOT MERGE ANYWHERE
BUG:167403112

Auto-generated-cl: translation import
Change-Id: I64cf73c3bf8cfc4e1135a40d5c6fa26066fc287e
2021-08-17 22:10:17 -07:00
Bill Yi
15b602ca6e Import translations. DO NOT MERGE ANYWHERE
BUG:167403112

Auto-generated-cl: translation import
Change-Id: I6301742cc4a1941e287bd8824a55ef5f17f72f4d
2021-08-17 22:02:57 -07:00
TreeHugger Robot
87231f645a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: a26ca75570 -s ours am: cee3e9bfce -s ours am: ebdc111881 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I22c1fc7d7c0c7b0b0750a2431d6851b8cb917290
2021-08-18 00:02:02 +00:00
TreeHugger Robot
f30d081a94 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: a26ca75570 -s ours am: cee3e9bfce -s ours am: c3d27dad60 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ifb21bb093047d9628bce7f6c911750b4d5fab8a5
2021-08-17 23:56:06 +00:00
TreeHugger Robot
ebdc111881 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: a26ca75570 -s ours am: cee3e9bfce -s ours
am skip reason: subject contains skip directive

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

Change-Id: I46a0db7c5e375574da88ac20db52790c3ccf29ea
2021-08-17 23:43:42 +00:00
TreeHugger Robot
c3d27dad60 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: a26ca75570 -s ours am: cee3e9bfce -s ours
am skip reason: subject contains skip directive

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

Change-Id: I01a092f96b4633ff98b538c88e77d00a26484b98
2021-08-17 23:40:25 +00:00
TreeHugger Robot
cee3e9bfce [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: a26ca75570 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0c0963f016e83b020dcffc91517604cfd0197468
2021-08-17 23:27:43 +00:00
TreeHugger Robot
a26ca75570 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-08-17 23:08:15 +00:00
Bill Yi
634884e7ba [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 28dea4a78c -s ours am: 2aa1ba2fba -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic7d5d96ea07750d6d6e54a5c6f946c755f3e7629
2021-08-17 22:36:19 +00:00
Bill Yi
28c5c2fdb6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 0fe195f2b0 -s ours am: 88e247bfe9 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1f12e045a36ec8de65c9682575ebc9817769b659
2021-08-17 22:35:47 +00:00
Bill Yi
db14bcbe3b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 28dea4a78c -s ours am: f3da5afffa -s ours
am skip reason: subject contains skip directive

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

Change-Id: If65541ea0389dabf3ab0764ed4825b45f5ed16bd
2021-08-17 22:30:18 +00:00
Bill Yi
1492ac1bfd [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 0fe195f2b0 -s ours am: 63f455688c -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0f54867e8c75f7a4f98b1d802425ea1d051dd788
2021-08-17 22:29:04 +00:00
Bill Yi
aeb3f24e59 Merge changes from topic "presubmit-am-cdddcf78595b4111a60c29aad3e575f9" into sc-dev-plus-aosp am: 6b6e3e88b9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15591587

Change-Id: I644ec2547cf5dec240e7219e45936c7eb3310a32
2021-08-17 22:24:41 +00:00
Bill Yi
743457a225 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d1e4f888fb am: 635d7a2949 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4acff956f43f72294cd6059fcaadeb7def76a4c5
2021-08-17 22:24:40 +00:00
Bill Yi
2aa1ba2fba [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 28dea4a78c -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie4c9152e7641c926d505feac8b455bf6e6035cfc
2021-08-17 22:23:35 +00:00
Bill Yi
1abe5e1740 Merge changes from topic "presubmit-am-febb5148f3864699b2afc6cf79966010" into sc-dev-plus-aosp am: 4d1a339b98
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15591583

Change-Id: Id7b3c6cca84473fe053c7766171c223d5e7ba882
2021-08-17 22:22:51 +00:00
Bill Yi
dabdae9adb [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 21392f9ffb am: cd0d73535b -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia1d812892e37a4e5d992e22e7662a4171e2f1df3
2021-08-17 22:22:50 +00:00
TreeHugger Robot
dc69206b6e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: dd0e1a338c -s ours am: 9aeb396178 -s ours am: 345eec506d -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iaad69de065ade77be8285dcc6e5ef59f40d4fe48
2021-08-17 22:21:45 +00:00
Bill Yi
88e247bfe9 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 0fe195f2b0 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8ef47f44dbf017b6284cf14e2b7d7a2519c49f81
2021-08-17 22:21:42 +00:00
Bill Yi
f3da5afffa [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 28dea4a78c -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0ffaf93e46cb1a8899e3652283e7951142edf812
2021-08-17 22:20:52 +00:00
Bill Yi
63f455688c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 0fe195f2b0 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ifd215b3e05cdef6649aebde74f710bf559ca9c54
2021-08-17 22:20:34 +00:00
Bill Yi
79e8d066ef [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6f047583bc -s ours am: 3e49192ffc -s ours am: f8f7afe889 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ief7c74ce297f8552def699acb67520adc278a13a
2021-08-17 22:19:58 +00:00
Bill Yi
11895d923a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f82b80a567 -s ours am: fa3505fdd8 -s ours am: 1ca3b46718 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8457b3f3f9dd10594546a70baecceede1c4085ce
2021-08-17 22:18:22 +00:00
Bill Yi
28dea4a78c Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-08-17 22:06:14 +00:00
Bill Yi
6b6e3e88b9 Merge changes from topic "presubmit-am-cdddcf78595b4111a60c29aad3e575f9" into sc-dev-plus-aosp
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d1e4f888fb
  Import translations. DO NOT MERGE ANYWHERE
2021-08-17 22:06:14 +00:00
Bill Yi
4d1a339b98 Merge changes from topic "presubmit-am-febb5148f3864699b2afc6cf79966010" into sc-dev-plus-aosp
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 21392f9ffb
  Import translations. DO NOT MERGE ANYWHERE
2021-08-17 22:04:16 +00:00
Bill Yi
0fe195f2b0 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-08-17 22:04:16 +00:00
TreeHugger Robot
6ac0521fc9 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: dd0e1a338c -s ours am: 9aeb396178 -s ours am: 085d3c9360 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I88aba12bc51f3ee79ba47c76e85271afd8733453
2021-08-17 21:03:57 +00:00
Bill Yi
0ffadc1caf [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6f047583bc -s ours am: 3e49192ffc -s ours am: d02406dbe7 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib3c5fb241235d33f07b0cd6adae4a3a850b69c9b
2021-08-17 21:03:39 +00:00
TreeHugger Robot
085d3c9360 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: dd0e1a338c -s ours am: 9aeb396178 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8a40984c311e385afd08a66cd0f397391a8097fd
2021-08-17 20:47:16 +00:00
Bill Yi
d02406dbe7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6f047583bc -s ours am: 3e49192ffc -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7211a697224d6da927389795fee3ba9d109a32ca
2021-08-17 20:47:02 +00:00
TreeHugger Robot
345eec506d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: dd0e1a338c -s ours am: 9aeb396178 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I01f4d67deebe14482f976ff3086484ed79ed75ce
2021-08-17 20:43:37 +00:00