Commit Graph

74782 Commits

Author SHA1 Message Date
Kevin Maurin
cf3b11a3d6 Merge "Display "Android Auto" in Connected Devices summary text." into rvc-dev am: 56cefaf3d6 am: f0ba8a7f80 am: 42ae04a88e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11400390

Change-Id: I803917f983eb6060ef88c21dd27cf1b0f188c634
2020-07-28 19:01:42 +00:00
TreeHugger Robot
7a114e518d Merge "[Wi-Fi] Enhance Wifi Settings unit test cases." into rvc-dev am: a76a871653 am: b9065a0d8c am: 897d16da4b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11390114

Change-Id: Ide1cb976d3e6226db22c0b2697b029597dc44864
2020-07-28 19:01:36 +00:00
Bonian Chen
8de96bcd5e Merge "[Settings] Mobile network not updated based on SIM change" into rvc-dev am: 3a132d7c9a am: a78fbae982 am: ca4f3bc48a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11367599

Change-Id: I2b534d1fac3873c5003c92349e1b143e1318e43c
2020-07-28 19:01:30 +00:00
Kevin Maurin
42ae04a88e Merge "Display "Android Auto" in Connected Devices summary text." into rvc-dev am: 56cefaf3d6 am: f0ba8a7f80
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11400390

Change-Id: I5b32696608d4d7492c0758f1f11e41a475c06d4c
2020-07-28 19:00:30 +00:00
TreeHugger Robot
897d16da4b Merge "[Wi-Fi] Enhance Wifi Settings unit test cases." into rvc-dev am: a76a871653 am: b9065a0d8c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11390114

Change-Id: I358b3cfd2ec25dbaaa5a8ab243ad5151510c323b
2020-07-28 19:00:19 +00:00
Bonian Chen
ca4f3bc48a Merge "[Settings] Mobile network not updated based on SIM change" into rvc-dev am: 3a132d7c9a am: a78fbae982
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11367599

Change-Id: I14c6d839107df050f928cf9967a68e8cd4f68f7a
2020-07-28 18:59:57 +00:00
tim peng
2dbfedb25d Merge "Update "Play media to" to "Play <APP> on"" into rvc-dev am: b8e18b4fb1 am: 30a4d31d6b am: 64ba56f44d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11367601

Change-Id: I902480c21109e86e09b2fbbfda86a797abe3e61a
2020-07-28 18:51:07 +00:00
TreeHugger Robot
3221bb7113 Merge "Fix the layout direction problem in RTL locale" into rvc-dev am: a49498f048 am: bb136fe79d am: 22211103c2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11393054

Change-Id: I9f7f47bb3b55f46060711c8f330f677875510567
2020-07-28 18:50:57 +00:00
TreeHugger Robot
ca118dc599 Merge "Fix the tutorial title is inconsistent with the description under Talkback." into rvc-dev am: cb8be1de6f am: 68c0ac7d15 am: 15b565fb6d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11390113

Change-Id: I2c494ab7f101faff63f600d9a4ed0daab2ab38df
2020-07-28 18:50:51 +00:00
tim peng
64ba56f44d Merge "Update "Play media to" to "Play <APP> on"" into rvc-dev am: b8e18b4fb1 am: 30a4d31d6b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11367601

Change-Id: I64bac6ce4610ac0ca0edb35b292700ffc06485da
2020-07-28 18:50:05 +00:00
TreeHugger Robot
22211103c2 Merge "Fix the layout direction problem in RTL locale" into rvc-dev am: a49498f048 am: bb136fe79d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11393054

Change-Id: Ifb778cac140075670ee480ce4d39c157a6a325ad
2020-07-28 18:49:50 +00:00
TreeHugger Robot
15b565fb6d Merge "Fix the tutorial title is inconsistent with the description under Talkback." into rvc-dev am: cb8be1de6f am: 68c0ac7d15
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11390113

Change-Id: Id2e391273056031f541dfce3b97bf69465b5beab
2020-07-28 18:49:25 +00:00
Marco Ballesio
1edeec88cb Merge "Developer option for the app freezer" into rvc-dev am: 97483a978a am: 3703b15c93 am: 62abbfac07
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11343474

Change-Id: I1d2fbef21b45e09ec97da64d11fdb789069ecb67
2020-07-28 18:17:08 +00:00
Tim Peng
78c798152a PanelSlicesAdapterTest failure am: 901e1503f5 am: 6056783954 am: 68fc7625d2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11393053

Change-Id: I6fdd7cbc0b58ebb5c4dd1a6b1bc0260cdbcae993
2020-07-28 18:16:51 +00:00
TreeHugger Robot
3de851def3 Merge "Stop usb tethering when user cancel it" into rvc-dev am: 53c6c9a672 am: 0563f93000 am: 26a43d1a4e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11389451

Change-Id: I325f0c5fc7e47b564fcaaea7300d5720afefe7b1
2020-07-28 18:16:27 +00:00
Yi-Ling Chuang
fb4a634ed8 Merge "Revert "Display "Android Auto" in Connected Devices summary text."" into rvc-dev am: 153b336baa am: edffa96f2f am: 560c7b0132
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11390110

Change-Id: Ifd9ce279ca65696167cac7acbecec15aee45acb2
2020-07-28 18:16:20 +00:00
Tsung-Mao Fang
48cacafd3f Merge "Update description when device allows guest user" into rvc-dev am: 6b82df2603 am: cfa8bb6a3c am: fdfbb7dedb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11317177

Change-Id: I75ac63a155e676e252c0b4003b09c281a5481afc
2020-07-28 18:16:13 +00:00
TreeHugger Robot
9edf542e3a Merge "In system nav settings, makes back inset animation full screen." into rvc-dev am: 9b940670c1 am: cccd089509 am: cb47334f19
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11386979

Change-Id: I8db240aa165a26f61f72b27310dbaf90ee5983d9
2020-07-28 18:15:52 +00:00
tim peng
ed515f3b04 Merge "Add 12dp padding above the first slice item" into rvc-dev am: 4ed5c3aac4 am: 08bee5a5a5 am: 2e49a0234a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11138560

Change-Id: I677d25fd7290fc0e8f8241a3477f133efbb96c50
2020-07-28 18:15:44 +00:00
TreeHugger Robot
aabee7ea9a Merge "Remove duplicate result for dark mode" into rvc-dev am: 6e68e34f2a am: 57d9bcc02f am: 415ee6f1a9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11367605

Change-Id: I62dc82b970cd43ee2744486aa50981c52d784f5c
2020-07-28 18:15:24 +00:00
Marco Ballesio
62abbfac07 Merge "Developer option for the app freezer" into rvc-dev am: 97483a978a am: 3703b15c93
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11343474

Change-Id: If277d8b4b2eaa0f6beb0f19e2c737b3f7ae643e7
2020-07-28 18:10:06 +00:00
Tim Peng
68fc7625d2 PanelSlicesAdapterTest failure am: 901e1503f5 am: 6056783954
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11393053

Change-Id: Ifffcfb78826017d03e53ae826579f3783abe3cff
2020-07-28 18:09:47 +00:00
TreeHugger Robot
26a43d1a4e Merge "Stop usb tethering when user cancel it" into rvc-dev am: 53c6c9a672 am: 0563f93000
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11389451

Change-Id: Ibc3d0ea2e28634ce6f821379d9ebf96176c9d3ea
2020-07-28 18:09:39 +00:00
Yi-Ling Chuang
560c7b0132 Merge "Revert "Display "Android Auto" in Connected Devices summary text."" into rvc-dev am: 153b336baa am: edffa96f2f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11390110

Change-Id: Ic0d7c4bc9f41f6a176fc2183e5578288fdad9f09
2020-07-28 18:09:31 +00:00
Tsung-Mao Fang
fdfbb7dedb Merge "Update description when device allows guest user" into rvc-dev am: 6b82df2603 am: cfa8bb6a3c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11317177

Change-Id: I21c6031237f05b502b5d7057b1fc8c945075e991
2020-07-28 18:09:16 +00:00
TreeHugger Robot
cb47334f19 Merge "In system nav settings, makes back inset animation full screen." into rvc-dev am: 9b940670c1 am: cccd089509
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11386979

Change-Id: I106c61e7402f1755103d6cdcc56cfc98dd371ca4
2020-07-28 18:08:55 +00:00
tim peng
2e49a0234a Merge "Add 12dp padding above the first slice item" into rvc-dev am: 4ed5c3aac4 am: 08bee5a5a5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11138560

Change-Id: I9d27023968280e0fca458c58eb97d14f1e143ebc
2020-07-28 18:08:44 +00:00
TreeHugger Robot
415ee6f1a9 Merge "Remove duplicate result for dark mode" into rvc-dev am: 6e68e34f2a am: 57d9bcc02f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11367605

Change-Id: I622ab1a3653a43a35a9734be3cda5ca5dc4c85bb
2020-07-28 18:08:29 +00:00
Amy Hsu
5b3f24f84b Merge "Change the UI strings of developer in Settings app" am: 2d4bb20219
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12244605

Change-Id: I38c9dae3695f51a88f862e549f41f87b6055468a
2020-07-28 14:04:55 +00:00
Amy Hsu
2d4bb20219 Merge "Change the UI strings of developer in Settings app" 2020-07-28 13:50:53 +00:00
Treehugger Robot
b203a04ede Merge "More inclusive language." am: 4be2b5c2f6 am: ef56fb20c3 am: b2a470166e am: 17c895b94c am: ce59418d0a am: 083045a9c2
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1373177

Change-Id: Ifc42836ca7d958f2db271b5156f4896232118d96
2020-07-28 11:47:04 +00:00
Treehugger Robot
083045a9c2 Merge "More inclusive language." am: 4be2b5c2f6 am: ef56fb20c3 am: b2a470166e am: 17c895b94c am: ce59418d0a
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1373177

Change-Id: I773bf1dd2fb3c8ef40681a598505cff004914966
2020-07-28 11:37:05 +00:00
Treehugger Robot
ce59418d0a Merge "More inclusive language." am: 4be2b5c2f6 am: ef56fb20c3 am: b2a470166e am: 17c895b94c
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1373177

Change-Id: Ia6d55cdd8c42406e347175cdf6c769bfe7e4a83e
2020-07-28 11:25:00 +00:00
Treehugger Robot
17c895b94c Merge "More inclusive language." am: 4be2b5c2f6 am: ef56fb20c3 am: b2a470166e
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1373177

Change-Id: I9d4404f5d94a9b18682b260eb7ed6413fb540202
2020-07-28 11:14:07 +00:00
Treehugger Robot
b2a470166e Merge "More inclusive language." am: 4be2b5c2f6 am: ef56fb20c3
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1373177

Change-Id: I4cd918e07ced74d846b75f01550f57e447229d51
2020-07-28 10:58:05 +00:00
Treehugger Robot
ef56fb20c3 Merge "More inclusive language." am: 4be2b5c2f6
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1373177

Change-Id: I4848004145a681e49a75a3f2d6e267b32c424585
2020-07-28 10:42:13 +00:00
Treehugger Robot
4be2b5c2f6 Merge "More inclusive language." 2020-07-28 10:25:10 +00:00
Amy Hsu
d3835522a4 Change the UI strings of developer in Settings app
Bug: 161694718
Test: Manually check Settings app
Change-Id: I79a9b955aae70da5e19f93504b39b2191a151c8f
2020-07-28 13:48:03 +08:00
Alan Stokes
cd2c453cbd More inclusive language.
Test: Builds
Bug: 161896447
Change-Id: Ie4d64dca9f4720eea532b534162e47ed81aea03b
2020-07-27 18:21:56 +01:00
Kevin Chyn
72a61b887f Merge "1/n: Make ChooseLockSettingsHelper into a builder" am: 0ab0255f4a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12204688

Change-Id: I4206750d5ef880d008e02c1b000b7b776ef0517a
2020-07-27 05:49:14 +00:00
Kevin Chyn
0ab0255f4a Merge "1/n: Make ChooseLockSettingsHelper into a builder" 2020-07-27 05:33:44 +00:00
Bill Yi
4b29452c0a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d7b0e0a00e -s ours am: c410ef3a43 -s ours am: 953a2dc009 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I62d347a26b75573c520fb3c6baa977c484ca6b40
2020-07-26 15:12:16 +00:00
Bill Yi
953a2dc009 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d7b0e0a00e -s ours am: c410ef3a43 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I71709c813d3d1683c7ff7708b69758abdf08b41b
2020-07-26 14:55:32 +00:00
Bill Yi
c410ef3a43 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d7b0e0a00e -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iadd61c89433d1a0fe4d951715e369acda302eabb
2020-07-26 14:45:25 +00:00
Bill Yi
d7b0e0a00e Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I96f100c3d048b2b1fdb9a5969149eba0bd677b79
2020-07-25 18:33:55 -07:00
Arc Wang
bfc5b8555d [automerger skipped] Merge "Revert "[Wi-Fi] Refactor WifiConnectionPreferenceController with WifiTrackerLib"" into rvc-qpr-dev am: bd86a39c7d am: f420f94e7d -s ours am: fc51452b25 -s ours
am skip reason: Change-Id Id4901d632f7f4634461ebbbc096e36d348a33365 with SHA-1 fef7216ef9 is in history

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

Change-Id: I9f2fd3fba50743931b6c29dcb20ad8ba8942f29c
2020-07-25 01:28:33 +00:00
Arc Wang
fc51452b25 [automerger skipped] Merge "Revert "[Wi-Fi] Refactor WifiConnectionPreferenceController with WifiTrackerLib"" into rvc-qpr-dev am: bd86a39c7d am: f420f94e7d -s ours
am skip reason: Change-Id Id4901d632f7f4634461ebbbc096e36d348a33365 with SHA-1 fef7216ef9 is in history

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

Change-Id: I7faf8acb261b24cdbaf79e1e0286eaed20f06a36
2020-07-25 01:18:30 +00:00
Arc Wang
f420f94e7d Merge "Revert "[Wi-Fi] Refactor WifiConnectionPreferenceController with WifiTrackerLib"" into rvc-qpr-dev am: bd86a39c7d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12193284

Change-Id: I14788fb9f4ce105fc4f095ccd2fdd4862022bcc9
2020-07-25 01:03:34 +00:00
Arc Wang
bd86a39c7d Merge "Revert "[Wi-Fi] Refactor WifiConnectionPreferenceController with WifiTrackerLib"" into rvc-qpr-dev 2020-07-25 00:52:56 +00:00
Arc Wang
55bce77aea Revert "[Wi-Fi] Refactor WifiConnectionPreferenceController with WifiTrackerLib"
This reverts commit ebf8ffd8fd.

Reason for revert: b/161659380

Bug: 161659380
Test: manual, observe threads after launching 'Network & internet'.
Change-Id: I28773eac40c6bf194e3410b829a1a7b744f79597
Merged-In: Id4901d632f7f4634461ebbbc096e36d348a33365
2020-07-25 00:51:50 +00:00