PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
77,557 Commits 1 Branch 0 Tags
8ab555fbde3fd8878ce95d00d0ae6f5ed90a8e9c
Commit Graph

77557 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
4d942baf0a Merge "Fix color lint errors" am: e732daa386 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12723424

Change-Id: I2b3381a410c936f99eb6f8ed280562ac3c1c0759
 2020-09-30 12:30:39 +00:00
TreeHugger Robot
e732daa386 Merge "Fix color lint errors" 2020-09-30 12:10:14 +00:00
Tsung-Mao Fang
6e4d250a8e Fix color lint errors 
Fix: 169704254
Test: Upload cl successfully.
Change-Id: I3d2e6d64b6bf39010f4b4b48766d5f13dfca8c75
 2020-09-30 16:09:05 +08:00
TreeHugger Robot
b1f73d71f3 Merge "Do nothing when choosing file transfer when in accessory mode" am: 5709f7a083 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12717066

Change-Id: I4423d5e2b8851c699aa37a7d02c4c2dcf9945498
 2020-09-30 07:21:44 +00:00
TreeHugger Robot
5709f7a083 Merge "Do nothing when choosing file transfer when in accessory mode" 2020-09-30 06:54:29 +00:00
Betty Chang
a3db8bf749 Merge "[Testing] Use AndroidJUnit4 instead in CellDataPreferenceTest" am: e8fa746299 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12533603

Change-Id: I9d196a9a1f9488dc370178190cb2ca99887176af
 2020-09-30 06:38:43 +00:00
Betty Chang
e8fa746299 Merge "[Testing] Use AndroidJUnit4 instead in CellDataPreferenceTest" 2020-09-30 06:12:31 +00:00
Hugh Chen
3251a04ba3 Do nothing when choosing file transfer when in accessory mode 
- Before this CL, the device will be disconnected and reconnected
  to accessory mode when choosing "File transfer/Android Auto" in
  accessory mode. Because the USB menu didn't check state of
  function, it should do nothing when choosing
  "File transfer/Android Auto" in accessory mode.

  This CL add condition to check state of function, it will do
  nothing when choosing "File transfer/Android Auto" in
  accessory mode.

Bug: 162451162
Test: make -j42 RunSettingsRoboTests
Change-Id: I1749c6c43d2a192e4ce1bf1ae5343ff8deafbe48
 2020-09-30 11:19:31 +08:00
Kevin Chyn
587bd62dff Update settings together with frameworks/base 
Bug: 169459906
Test: Builds

Exempt-From-Owner-Approval: Name change

Change-Id: I453d743fe29c33776a784942863dcba19c67c26a
 2020-09-29 18:19:16 -07:00
TreeHugger Robot
33f148e51b Merge "Add DNS warning message" am: ab45ca09bc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12723416

Change-Id: I44f8bd6c4dc96814cefe856b638684c7658d3eca
 2020-09-29 15:48:20 +00:00
TreeHugger Robot
ab45ca09bc Merge "Add DNS warning message" 2020-09-29 15:34:20 +00:00
Weng Su
2059abd84b Add DNS warning message 
When private DNS (DNS over TLS) is active,
that setting a DNS for a static IP configuration will have no effect.

Add DNS warning message as below screenshot.
https://screenshot.googleplex.com/8JHK328tX6HxrYZ

Bug: 157620236
Test: Manual verify by WiFi Settings UI
Change-Id: Ibed34ceda32670f481d84b85b431d855af478dc3
 2020-09-29 14:14:25 +00:00
Treehugger Robot
46f640dcce [automerger skipped] Merge "[Testing] Use AndroidJUnit4 instead in TelephonyBasePreferenceControllerTest" am: 177533ddbb am: fc6cb188b5 am: be8b195fe1 am: 2f068a914e am: 159de41477 -s ours am: a4dfd60335 -s ours 
am skip reason: Change-Id Iabe24aef0b7a5c3aa9d7be275f0c4ed552cdd2e8 with SHA-1 933e4df3c9 is in history

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

Change-Id: Id4f3c9bb60e62bf2ad589116dec04bb91f04c89c
 2020-09-29 06:41:04 +00:00
Treehugger Robot
a4dfd60335 [automerger skipped] Merge "[Testing] Use AndroidJUnit4 instead in TelephonyBasePreferenceControllerTest" am: 177533ddbb am: fc6cb188b5 am: be8b195fe1 am: 2f068a914e am: 159de41477 -s ours 
am skip reason: Change-Id Iabe24aef0b7a5c3aa9d7be275f0c4ed552cdd2e8 with SHA-1 933e4df3c9 is in history

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

Change-Id: If913ad6394001e9c917ac80d8c391b441dc929cf
 2020-09-29 06:29:36 +00:00
Treehugger Robot
a792e4ec06 [automerger skipped] Merge "[Testing] Use AndroidJUnit4 instead in TelephonyBasePreferenceControllerTest" am: 93cec35cea am: b4093123de am: e13fa41a29 am: 722f9f4ea8 am: c0dbafc438 -s ours am: b1fcf50050 -s ours 
am skip reason: Change-Id Iabe24aef0b7a5c3aa9d7be275f0c4ed552cdd2e8 with SHA-1 933e4df3c9 is in history

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

Change-Id: I34b7df6f6aa10cd99eeb0daec110059c99d50d57
 2020-09-29 06:19:14 +00:00
Treehugger Robot
3d2cc9a738 [automerger skipped] Merge "[Testing] use AndroidJUnit4 in new MobileDataPreferenceControllerTest" am: 27806fde5e am: e0890849cd am: 000159f6db am: 6513978872 am: 580963266b -s ours am: b2c1e02077 -s ours 
am skip reason: Change-Id I1a2d7b38023681f3db3320aa9f315109280cfbd0 with SHA-1 ff6bc3ce27 is in history

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

Change-Id: I9cad31203f0ac63a62ea2132f9976cea6a2532cf
 2020-09-29 06:19:08 +00:00
Treehugger Robot
5cc85a9759 [automerger skipped] Merge "[Testing] use AndroidJUnit4 in new EuiccPreferenceControllerTest" am: 1cd8904fc5 am: 8c58bd4520 am: e570e80eb8 am: 24dc71f7e8 am: 4d513437aa -s ours am: 41f8651ff9 -s ours 
am skip reason: Change-Id I028ca81d38252beb3abccef9e938988510f3f55e with SHA-1 4126ec2d32 is in history

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

Change-Id: I47d602714e3c08262916123e8f256374d57f608f
 2020-09-29 06:18:52 +00:00
Treehugger Robot
c203328d29 [automerger skipped] Merge "[Testing] use AndroidJUnit4 in new MultiNetworkHeaderControllerTest" am: 3eeb8b44c2 am: 27978c5d47 am: 5f81bb9a07 am: bb98b793e5 am: 6ace0ecdde -s ours am: 32a6bba2df -s ours 
am skip reason: Change-Id Ic66425aca4047d2eacd04509f3bfb315f6dd57fc with SHA-1 a1aaccf670 is in history

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

Change-Id: I3e5c34c4dab467d104d753260700b6a24903e94f
 2020-09-29 06:18:45 +00:00
Treehugger Robot
159de41477 Merge "[Testing] Use AndroidJUnit4 instead in TelephonyBasePreferenceControllerTest" am: 177533ddbb am: fc6cb188b5 am: be8b195fe1 am: 2f068a914e 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1427809

Change-Id: Iafcefc2aa64cf3c50b1d139ec0204a315be29da7
 2020-09-29 06:18:19 +00:00
Treehugger Robot
26febb5ef8 [automerger skipped] Merge "[Testing] Use AndroidJUnit4 instead in TelephonyTogglePreferenceControllerTest" am: 71c667322c am: 48c399c18a am: 7c9cc5621b am: 7f3bbcddf0 am: 7b7382fdf2 -s ours am: 87daeb4f31 -s ours 
am skip reason: Change-Id I3d6c39f45cb1efb1742148f20f03372214eb0cbe with SHA-1 d2e9e42f32 is in history

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

Change-Id: Ifb8572119d82ec87c8f75f460bc75de4100d593f
 2020-09-29 06:18:16 +00:00
Treehugger Robot
2f068a914e Merge "[Testing] Use AndroidJUnit4 instead in TelephonyBasePreferenceControllerTest" am: 177533ddbb am: fc6cb188b5 am: be8b195fe1 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1427809

Change-Id: I63d1925ed0bb4347098b926e27dcd4b8887421a4
 2020-09-29 06:04:54 +00:00
Treehugger Robot
b1fcf50050 [automerger skipped] Merge "[Testing] Use AndroidJUnit4 instead in TelephonyBasePreferenceControllerTest" am: 93cec35cea am: b4093123de am: e13fa41a29 am: 722f9f4ea8 am: c0dbafc438 -s ours 
am skip reason: Change-Id Iabe24aef0b7a5c3aa9d7be275f0c4ed552cdd2e8 with SHA-1 933e4df3c9 is in history

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

Change-Id: Ie2c1e7c09dc8263f2230d708767866a43de0fa24
 2020-09-29 06:04:30 +00:00
Treehugger Robot
b2c1e02077 [automerger skipped] Merge "[Testing] use AndroidJUnit4 in new MobileDataPreferenceControllerTest" am: 27806fde5e am: e0890849cd am: 000159f6db am: 6513978872 am: 580963266b -s ours 
am skip reason: Change-Id I1a2d7b38023681f3db3320aa9f315109280cfbd0 with SHA-1 ff6bc3ce27 is in history

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

Change-Id: Idd0fa5686c61c0e575bca33e2990a1486429bbde
 2020-09-29 06:04:23 +00:00
Treehugger Robot
41f8651ff9 [automerger skipped] Merge "[Testing] use AndroidJUnit4 in new EuiccPreferenceControllerTest" am: 1cd8904fc5 am: 8c58bd4520 am: e570e80eb8 am: 24dc71f7e8 am: 4d513437aa -s ours 
am skip reason: Change-Id I028ca81d38252beb3abccef9e938988510f3f55e with SHA-1 4126ec2d32 is in history

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

Change-Id: Iba258a6fb4ac6baf8f784c9f9a433bf1388bd1ee
 2020-09-29 06:04:16 +00:00
Treehugger Robot
32a6bba2df [automerger skipped] Merge "[Testing] use AndroidJUnit4 in new MultiNetworkHeaderControllerTest" am: 3eeb8b44c2 am: 27978c5d47 am: 5f81bb9a07 am: bb98b793e5 am: 6ace0ecdde -s ours 
am skip reason: Change-Id Ic66425aca4047d2eacd04509f3bfb315f6dd57fc with SHA-1 a1aaccf670 is in history

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

Change-Id: Iab38a1060b1fb43dc105da9a095d587b2a241fe5
 2020-09-29 06:04:04 +00:00
Treehugger Robot
87daeb4f31 [automerger skipped] Merge "[Testing] Use AndroidJUnit4 instead in TelephonyTogglePreferenceControllerTest" am: 71c667322c am: 48c399c18a am: 7c9cc5621b am: 7f3bbcddf0 am: 7b7382fdf2 -s ours 
am skip reason: Change-Id I3d6c39f45cb1efb1742148f20f03372214eb0cbe with SHA-1 d2e9e42f32 is in history

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

Change-Id: I23e5dbb3a2cceeeab6b1d1dd1a89bee6f8fce21f
 2020-09-29 06:03:55 +00:00
Treehugger Robot
c0dbafc438 Merge "[Testing] Use AndroidJUnit4 instead in TelephonyBasePreferenceControllerTest" am: 93cec35cea am: b4093123de am: e13fa41a29 am: 722f9f4ea8 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1426565

Change-Id: I3f2fb62790ba30914d1b7a5555809954066e0455
 2020-09-29 05:29:52 +00:00
Treehugger Robot
580963266b Merge "[Testing] use AndroidJUnit4 in new MobileDataPreferenceControllerTest" am: 27806fde5e am: e0890849cd am: 000159f6db am: 6513978872 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1426553

Change-Id: Ia6cbd95f410a4763b5a4a066b942e1fcd44b0fb1
 2020-09-29 05:29:43 +00:00
Treehugger Robot
4d513437aa Merge "[Testing] use AndroidJUnit4 in new EuiccPreferenceControllerTest" am: 1cd8904fc5 am: 8c58bd4520 am: e570e80eb8 am: 24dc71f7e8 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1426562

Change-Id: I7ded23298875715dec1a48d9364a174639b7f92b
 2020-09-29 05:29:33 +00:00
Treehugger Robot
be8b195fe1 Merge "[Testing] Use AndroidJUnit4 instead in TelephonyBasePreferenceControllerTest" am: 177533ddbb am: fc6cb188b5 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1427809

Change-Id: I844668256cf7b87f6dc29272e3d01c7c51b813e5
 2020-09-29 05:29:24 +00:00
Treehugger Robot
6ace0ecdde Merge "[Testing] use AndroidJUnit4 in new MultiNetworkHeaderControllerTest" am: 3eeb8b44c2 am: 27978c5d47 am: 5f81bb9a07 am: bb98b793e5 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1426552

Change-Id: Ieb22f4b036c3a569acdf9ea4451fba7b5d7a9851
 2020-09-29 05:29:21 +00:00
Treehugger Robot
7b7382fdf2 Merge "[Testing] Use AndroidJUnit4 instead in TelephonyTogglePreferenceControllerTest" am: 71c667322c am: 48c399c18a am: 7c9cc5621b am: 7f3bbcddf0 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1427808

Change-Id: Ia130edabc0cb44a787ef107641e39ead544d81af
 2020-09-29 05:29:07 +00:00
Treehugger Robot
722f9f4ea8 Merge "[Testing] Use AndroidJUnit4 instead in TelephonyBasePreferenceControllerTest" am: 93cec35cea am: b4093123de am: e13fa41a29 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1426565

Change-Id: If21308e7f0e67eb39c791206f1e0ee05697b54e8
 2020-09-29 05:14:28 +00:00
Treehugger Robot
6513978872 Merge "[Testing] use AndroidJUnit4 in new MobileDataPreferenceControllerTest" am: 27806fde5e am: e0890849cd am: 000159f6db 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1426553

Change-Id: I9e08c98c28e15bc5833d4c23e569a83840d40172
 2020-09-29 05:14:19 +00:00
Treehugger Robot
24dc71f7e8 Merge "[Testing] use AndroidJUnit4 in new EuiccPreferenceControllerTest" am: 1cd8904fc5 am: 8c58bd4520 am: e570e80eb8 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1426562

Change-Id: I3bf65953a9751b8cfd9dab666f5b1ad400bbdd36
 2020-09-29 05:14:11 +00:00
Treehugger Robot
bb98b793e5 Merge "[Testing] use AndroidJUnit4 in new MultiNetworkHeaderControllerTest" am: 3eeb8b44c2 am: 27978c5d47 am: 5f81bb9a07 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1426552

Change-Id: Ic774e63dd14139999e96210bc89476edc095e02b
 2020-09-29 05:14:03 +00:00
Treehugger Robot
7f3bbcddf0 Merge "[Testing] Use AndroidJUnit4 instead in TelephonyTogglePreferenceControllerTest" am: 71c667322c am: 48c399c18a am: 7c9cc5621b 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1427808

Change-Id: I4397688b601c1a8bd53ce49b5ec6db16eff9db5a
 2020-09-29 05:13:51 +00:00
Treehugger Robot
fc6cb188b5 Merge "[Testing] Use AndroidJUnit4 instead in TelephonyBasePreferenceControllerTest" am: 177533ddbb 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1427809

Change-Id: I8342d2c6813115f9705ca2e5ef201125ea0f9576
 2020-09-29 05:13:43 +00:00
Treehugger Robot
177533ddbb Merge "[Testing] Use AndroidJUnit4 instead in TelephonyBasePreferenceControllerTest" 2020-09-29 05:03:06 +00:00
Treehugger Robot
e13fa41a29 Merge "[Testing] Use AndroidJUnit4 instead in TelephonyBasePreferenceControllerTest" am: 93cec35cea am: b4093123de 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1426565

Change-Id: I9af0af7bbb19cfb1c7337960dc83fbc8e59eeab4
 2020-09-29 05:00:53 +00:00
Treehugger Robot
000159f6db Merge "[Testing] use AndroidJUnit4 in new MobileDataPreferenceControllerTest" am: 27806fde5e am: e0890849cd 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1426553

Change-Id: I88eeb86872e17fa03385dad601ed5e11f9b176d7
 2020-09-29 05:00:44 +00:00
Treehugger Robot
e570e80eb8 Merge "[Testing] use AndroidJUnit4 in new EuiccPreferenceControllerTest" am: 1cd8904fc5 am: 8c58bd4520 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1426562

Change-Id: Ieb5efa13b99875a9177016ec90faadd5e2d17f67
 2020-09-29 05:00:35 +00:00
Treehugger Robot
5f81bb9a07 Merge "[Testing] use AndroidJUnit4 in new MultiNetworkHeaderControllerTest" am: 3eeb8b44c2 am: 27978c5d47 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1426552

Change-Id: If991989404484407853bd8ac42430761d1e37018
 2020-09-29 05:00:26 +00:00
Treehugger Robot
7c9cc5621b Merge "[Testing] Use AndroidJUnit4 instead in TelephonyTogglePreferenceControllerTest" am: 71c667322c am: 48c399c18a 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1427808

Change-Id: I716f8a88d3d6a6022d679736bb278d3f9eb638bb
 2020-09-29 05:00:12 +00:00
Treehugger Robot
b4093123de Merge "[Testing] Use AndroidJUnit4 instead in TelephonyBasePreferenceControllerTest" am: 93cec35cea 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1426565

Change-Id: Icf8adbe951a8ac435cf3b035bab59508f5f48d0e
 2020-09-29 04:46:44 +00:00
Treehugger Robot
e0890849cd Merge "[Testing] use AndroidJUnit4 in new MobileDataPreferenceControllerTest" am: 27806fde5e 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1426553

Change-Id: Ie004598ea8d432d931a54469c1229e1b215ea759
 2020-09-29 04:46:30 +00:00
Treehugger Robot
8c58bd4520 Merge "[Testing] use AndroidJUnit4 in new EuiccPreferenceControllerTest" am: 1cd8904fc5 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1426562

Change-Id: I8de47f938f94b000ba4274b3b4ef2ec77181b0e5
 2020-09-29 04:46:15 +00:00
Treehugger Robot
27978c5d47 Merge "[Testing] use AndroidJUnit4 in new MultiNetworkHeaderControllerTest" am: 3eeb8b44c2 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1426552

Change-Id: Ia304c487a41b82f67d51542b09585b52c64ab94c
 2020-09-29 04:45:57 +00:00
Treehugger Robot
48c399c18a Merge "[Testing] Use AndroidJUnit4 instead in TelephonyTogglePreferenceControllerTest" am: 71c667322c 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1427808

Change-Id: If68a407eac5837b85781ae4eb20c4bfad1436700
 2020-09-29 04:45:22 +00:00
Treehugger Robot
93cec35cea Merge "[Testing] Use AndroidJUnit4 instead in TelephonyBasePreferenceControllerTest" 2020-09-29 04:33:23 +00:00