PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
86,899 Commits 1 Branch 0 Tags
61687b51a0c4edbd40e37d3292877f17ddb65f71
Commit Graph

86899 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
TreeHugger Robot
e39485b4b2 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: Ibe5966344f9c2ca2e13b40bdc6b69ebb0342f169
 2021-08-18 18:12:23 +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
Calvin Pan
f2711c3e59 Merge "Remove unnecessary condition" into sc-qpr1-dev am: abb8a6abdc am: 186ea2cd3b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15542134

Change-Id: I9c002966cafac1352c1f5e731b36316b31c2bd4f
 2021-08-18 07:06:13 +00:00
Calvin Pan
cad9603b2e Merge "Remove unnecessary condition" into sc-qpr1-dev am: abb8a6abdc am: f687c1ea61 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15542134

Change-Id: I9fef74a954ee2ab03037e4c3abaa2539749f8d9e
 2021-08-18 07:05:33 +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
186ea2cd3b 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: I78ee6b2fb68ba44682e33cc6dbaaee6a64cba608
 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
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
c27be2ae19 [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: a395f188e1 -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: Ied5a4636e2d76cae82c28aa7665704677c50c682
 2021-08-18 00:21:13 +00:00
TreeHugger Robot
4910632334 [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: 87231f645a -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: I2b39b07cd852ec1507c9f0910bc15116537eecf8
 2021-08-18 00:13:19 +00:00
TreeHugger Robot
95d74f01f5 [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: f30d081a94 -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: I0248828382944e954ce8324fcf55538d1f6c95fa
 2021-08-18 00:13:00 +00: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
a395f188e1 [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: Ia4aaed3b31e0c1b618df506beff15d7bf1c4f37b
 2021-08-18 00:01:39 +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
2b29686be9 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 28dea4a78c -s ours am: 2aa1ba2fba -s ours am: dda7bf46cf -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: I4d3f4dad0b2c407f447d8385733102217b8a80ef
 2021-08-17 22:53:44 +00:00
Bill Yi
8e9f6de18c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 0fe195f2b0 -s ours am: 88e247bfe9 -s ours am: fa45968616 -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: If6853aa771f6a39ae52d8c577d5e58ea82d0a6b2
 2021-08-17 22:53:16 +00:00
Bill Yi
1a11a32a56 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 28dea4a78c -s ours am: 2aa1ba2fba -s ours am: 634884e7ba -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: Ia0e997ded32be1f5c5de95658ebaee15b3ab3c50
 2021-08-17 22:48:17 +00:00
Bill Yi
a618b7d2a3 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 0fe195f2b0 -s ours am: 88e247bfe9 -s ours am: 28c5c2fdb6 -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: Icf48f6b42db52108acfe133fc3f84b3fb65ea648
 2021-08-17 22:48:11 +00:00
Bill Yi
cd7094b9a9 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 28dea4a78c -s ours am: f3da5afffa -s ours am: db14bcbe3b -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: Id6fdb9fd2aa421a99cdf333d7ee96cc2589ff7d3
 2021-08-17 22:47:54 +00:00
Bill Yi
1804f4e0af [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 0fe195f2b0 -s ours am: 63f455688c -s ours am: 1492ac1bfd -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: I2adec905266a51717027bffcdb3eadd01e138e9c
 2021-08-17 22:47:25 +00:00
Bill Yi
08d2af9e10 Merge changes from topic "presubmit-am-cdddcf78595b4111a60c29aad3e575f9" into sc-dev-plus-aosp am: 6b6e3e88b9 am: aeb3f24e59 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15591587

Change-Id: I8c09f6f8a1cc535e49fdabbeb843e6483517c8b7
 2021-08-17 22:47:02 +00:00
Bill Yi
d12cbd225b [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d1e4f888fb am: 635d7a2949 -s ours am: 743457a225 -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: I9b5d71b5fc06d7d70c45121149c35b770813917e
 2021-08-17 22:47:00 +00:00
Bill Yi
1da245f5af Merge changes from topic "presubmit-am-febb5148f3864699b2afc6cf79966010" into sc-dev-plus-aosp am: 4d1a339b98 am: 1abe5e1740 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15591583

Change-Id: Idb9a9e8e2aa5bd76c221a8dff9b7eb029e642a2d
 2021-08-17 22:45:17 +00:00
Bill Yi
1d630b2e6e [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 21392f9ffb am: cd0d73535b -s ours am: dabdae9adb -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: I739744a35dd45f3b422323fe46355f6fd6b62f7d
 2021-08-17 22:45:15 +00:00
TreeHugger Robot
cb38d31a13 [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: dc69206b6e -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: I522d2068fcb1c7b452cbe03227ae87807e24ee37
 2021-08-17 22:38:40 +00:00
Bill Yi
06955416e4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6f047583bc -s ours am: 3e49192ffc -s ours am: f8f7afe889 -s ours am: 79e8d066ef -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: I3607bc7ec83978f68e6f535980bdcb80e445254a
 2021-08-17 22:37:50 +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
dda7bf46cf [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: I8a6815761255f52f0865dc41daf1a16c692585d7
 2021-08-17 22:35:59 +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
fa45968616 [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: I181e7d01777a2fb0618848c4e776704b181dc306
 2021-08-17 22:35:17 +00:00
Bill Yi
b0173be441 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f82b80a567 -s ours am: fa3505fdd8 -s ours am: 1ca3b46718 -s ours am: 11895d923a -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: Ie859c51b68e2879ec082887c791a81d05f9ab623
 2021-08-17 22:35:01 +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