Commit Graph

94213 Commits

Author SHA1 Message Date
Automerger Merge Worker
e28351b5bd Merge "Merge "Remove CDM entries in Connected Device." into sc-dev am: abd0f6a5f6 am: bc0cf0d87f am: 48efcc5547" into sc-v2-dev-plus-aosp am: 6f1fa17967
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15486674

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

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

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

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

Change-Id: I523cd10e6aa0d26bf6823685139c9521df848fe7
2021-08-18 18:31:35 +00:00
Automerger Merge Worker
6f1fa17967 Merge "Merge "Remove CDM entries in Connected Device." into sc-dev am: abd0f6a5f6 am: bc0cf0d87f am: 48efcc5547" into sc-v2-dev-plus-aosp 2021-08-18 18:31:28 +00:00
Neha Jain
ba1178c72d Merge "Remove CDM entries in Connected Device." into sc-dev am: abd0f6a5f6 am: bc0cf0d87f am: 48efcc5547
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15486674

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

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

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

Change-Id: I7abe37232b3d60328d1c67f36b61057ea2399b76
2021-08-18 18:30:59 +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
29e559d242 Merge "Remove CDM entries in Connected Device." into sc-dev am: abd0f6a5f6 am: fa31f577ca
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15486674

Change-Id: I700a833898d2e34bfd9a0621ef85d9005ff5628b
2021-08-18 18:25:42 +00:00
Neha Jain
48efcc5547 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: I59640625b9f47dd7493acb0d919b6680e1f25660
2021-08-18 18:12:52 +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
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
fa31f577ca 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: I56b549ffb3b76f8004b447e973e2e35e6d77e53c
2021-08-18 18:11:21 +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
79d30d2fcc Merge "Remove unnecessary condition" into sc-qpr1-dev am: abb8a6abdc am: 186ea2cd3b am: f2711c3e59
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15542134

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

Change-Id: I4c658c6069af494db9c01c5a7b809c45a5c38b5f
2021-08-18 07:17:05 +00: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
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
menghanli
5af9c64110 [Material Next] Accessibility gesture tutorial dialog
Problem: The dialog does not follow the Material Next guideline
Proposal:
1. Apply the dynamic color by removing SettingsTutorialDialogWrapperActivity which set extra theme
2. Hanlde the recreate case if shows the dialog directly
3. Update new Illustration in Pixel Lottie asset

Bug: 195980595
Test: Manual test
Change-Id: Ib6267128bbe5522ac8720c15fc2720c9a78f8671
2021-08-18 11:22:08 +08:00
Edgar Wang
969b2a1ef1 Update Memory progressbar style in Developer options
Fixes: 192259873
Test: visual verify
Change-Id: If121ded592ec55abdd69764f040eab1a91e25021
2021-08-18 02:45:07 +00:00
TreeHugger Robot
b7680ac22a [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: c27be2ae19 -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: Ib350f5e2c470d1745cc6ca3aea90e56113d6bd98
2021-08-18 01:43:29 +00:00
TreeHugger Robot
0a314e4ce0 [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: 4910632334 -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: Id7660351ee19aa7118be81272f15e29f6f721e96
2021-08-18 01:42:35 +00:00
TreeHugger Robot
fbee52192e [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: 95d74f01f5 -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: I599fd30b8a054ee33340186ee9cdf9f5f4a7789f
2021-08-18 01:41:28 +00:00
Bill Yi
94d6ca6d72 [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: 2b29686be9 -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: I38c290797387f32d1bbb0f1e91c7648628218ada
2021-08-18 01:40:30 +00:00
Bill Yi
2ca2c8668d [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: 8e9f6de18c -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: I628490c5c4cfb828b99d30a92fa0062e9565c604
2021-08-18 01:39:59 +00:00
Bill Yi
6506c456b9 [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: 1a11a32a56 -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: Ia030f32954b8c0d24b3f6a749513850c0243c995
2021-08-18 01:39:13 +00:00
Bill Yi
227448ae2b [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: a618b7d2a3 -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: I603331ec100ee06ba4644135ceaa5f8dec30f8d6
2021-08-18 01:38:28 +00:00
Bill Yi
026e1df278 [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: cd7094b9a9 -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: I67cb574b2c6cc90574386eabf0ea54ac3600b202
2021-08-18 01:37:22 +00:00
Bill Yi
0a0ac24557 [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: 1804f4e0af -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: I5a10dc4bb6c6fbd7aceb2793f002636df07185e6
2021-08-18 01:36:54 +00:00
Bill Yi
d4467ece43 Merge changes from topic "presubmit-am-cdddcf78595b4111a60c29aad3e575f9" into sc-dev-plus-aosp am: 6b6e3e88b9 am: aeb3f24e59 am: 08d2af9e10
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15591587

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

Change-Id: Ie0c9affad374a02c47e02a07384243424d4ac821
2021-08-18 01:34:16 +00:00
Bill Yi
95b6f76082 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 21392f9ffb am: cd0d73535b -s ours am: dabdae9adb -s ours am: 1d630b2e6e -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: I5b58d546425070fdf24327b2a0635809ddaa2184
2021-08-18 01:34:14 +00:00
TreeHugger Robot
abcdb9b66f [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: cb38d31a13 -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: If144a01bbda00baaddd6ed6862a2e8166eeb8b2f
2021-08-18 01:29:48 +00:00