PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
61,881 Commits 1 Branch 0 Tags
ae8fbea47a2c93f80cabd46fbaed48d153bdd34c
Commit Graph

61881 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Automerger Merge Worker
d7d02ee912 Merge "Disable 5G Scanning in NetworkScanHelper" into rvc-dev am: a8bee76d11 am: 43c4fa35da 
Change-Id: I7dba7d4af1b3b8fe5ab12b2dea1a56456fc9f471
 2020-03-10 17:19:17 +00:00
Automerger Merge Worker
b61ad6c1b4 Merge "Disable 5G Scanning in NetworkScanHelper" into rvc-dev am: a8bee76d11 am: 17718f979a 
Change-Id: Ifae11bdeae6f9be5cbbfc7caa64c8aab66b1e7ac
 2020-03-10 17:19:14 +00:00
Automerger Merge Worker
66d4405d1d Merge "Secret code fix - uses public symbol for secret" am: 716c06f700 
Change-Id: Ic2025dbfe0dcaf21b5a3a50c8caa778242440b6d
 2020-03-10 16:59:32 +00:00
Automerger Merge Worker
43c4fa35da Merge "Disable 5G Scanning in NetworkScanHelper" into rvc-dev am: a8bee76d11 
Change-Id: I8727fec517436adf608b26fc1372c7c43cfa504a
 2020-03-10 16:58:34 +00:00
Automerger Merge Worker
17718f979a Merge "Disable 5G Scanning in NetworkScanHelper" into rvc-dev am: a8bee76d11 
Change-Id: I4421beef3f7468b58d3b83c444fcebaf1a758d83
 2020-03-10 16:58:22 +00:00
Nathan Harold
a8bee76d11 Merge "Disable 5G Scanning in NetworkScanHelper" into rvc-dev 2020-03-10 16:35:02 +00:00
Daniel Bright
716c06f700 Merge "Secret code fix - uses public symbol for secret" 2020-03-10 16:31:01 +00:00
Kenny Guy
37295f86bf DO NOT MERGE 
Update battery manager toggle to support on / off summary.

Screenshots attached to the bug.

Bug: 148847755
Test: Visual - on blueline aosp build / boot / check settings pages
Test: Visual - on blueline eng build / boot / check settings pages
Change-Id: I44b1c74baf4bafa549519d4f20fa470389cd5e0b
(cherry picked from commit 1a289bdeba)
 2020-03-10 16:10:29 +00:00
Automerger Merge Worker
cee77ebb7c Merge "The text contrast of "disconnected" in Switch media output panel is insufficient." into rvc-dev am: 1334a7e986 am: 2f2d8d5949 am: 548a47fa63 am: 90d62de46c am: f7180505c2 
Change-Id: I04ae421d39b3ec6e944ed88c532c235ea90cddee
 2020-03-10 16:04:10 +00:00
Automerger Merge Worker
f7180505c2 Merge "The text contrast of "disconnected" in Switch media output panel is insufficient." into rvc-dev am: 1334a7e986 am: 2f2d8d5949 am: 548a47fa63 am: 90d62de46c 
Change-Id: I9f0ed28ecc313316dfcf9226b2d8d03f20e9b24d
 2020-03-10 15:58:02 +00:00
Automerger Merge Worker
91472ac405 Merge "Merge "The text contrast of "disconnected" in Switch media output panel is insufficient." into rvc-dev am: 1334a7e986 am: 379902636b" into rvc-d1-dev-plus-aosp am: 8f2a1abc03 am: 78c551fee7 
Change-Id: I67e199d2e29010fbd33a0c8e261788013f49b380
 2020-03-10 15:57:57 +00:00
Automerger Merge Worker
97e9b51191 Merge "The text contrast of "disconnected" in Switch media output panel is insufficient." into rvc-dev am: 1334a7e986 am: 2f2d8d5949 am: ce61a52720 am: 3dfbb8fe24 
Change-Id: Ia4d59bb39e8c06cf3039363a455fe7bcc8383fa6
 2020-03-10 15:57:46 +00:00
Automerger Merge Worker
78c551fee7 Merge "Merge "The text contrast of "disconnected" in Switch media output panel is insufficient." into rvc-dev am: 1334a7e986 am: 379902636b" into rvc-d1-dev-plus-aosp am: 8f2a1abc03 
Change-Id: I5fdd3603b01b30715e4a6e88babd090517ad11e0
 2020-03-10 15:41:21 +00:00
Automerger Merge Worker
90d62de46c Merge "The text contrast of "disconnected" in Switch media output panel is insufficient." into rvc-dev am: 1334a7e986 am: 2f2d8d5949 am: 548a47fa63 
Change-Id: I4d1b553a81bce90ca9dea5d93935012378fc45b4
 2020-03-10 15:41:15 +00:00
Automerger Merge Worker
3dfbb8fe24 Merge "The text contrast of "disconnected" in Switch media output panel is insufficient." into rvc-dev am: 1334a7e986 am: 2f2d8d5949 am: ce61a52720 
Change-Id: Id37e1e7ad4a142112a50c2ec3c3139be82ecd4d6
 2020-03-10 15:41:12 +00:00
Automerger Merge Worker
8f2a1abc03 Merge "Merge "The text contrast of "disconnected" in Switch media output panel is insufficient." into rvc-dev am: 1334a7e986 am: 379902636b" into rvc-d1-dev-plus-aosp 2020-03-10 15:16:13 +00:00
Automerger Merge Worker
548a47fa63 Merge "The text contrast of "disconnected" in Switch media output panel is insufficient." into rvc-dev am: 1334a7e986 am: 2f2d8d5949 
Change-Id: I0bae6ab0e8783f46f189ec7eb7bdd8c2e739f1ef
 2020-03-10 15:16:06 +00:00
Automerger Merge Worker
1035d589ea Merge "The text contrast of "disconnected" in Switch media output panel is insufficient." into rvc-dev am: 1334a7e986 am: 379902636b 
Change-Id: Ia97c8d3286b9ab95fa8e7d5a5de96aaa071c1a6a
 2020-03-10 15:16:06 +00:00
Automerger Merge Worker
ce61a52720 Merge "The text contrast of "disconnected" in Switch media output panel is insufficient." into rvc-dev am: 1334a7e986 am: 2f2d8d5949 
Change-Id: I0ad2bf3fc2c50cd29776a939ea4d907dd4db9c9a
 2020-03-10 15:16:03 +00:00
Automerger Merge Worker
379902636b Merge "The text contrast of "disconnected" in Switch media output panel is insufficient." into rvc-dev am: 1334a7e986 
Change-Id: If8964911c25b2d5cc8a38e4dd319ceb91ce95fe2
 2020-03-10 15:02:13 +00:00
Automerger Merge Worker
2f2d8d5949 Merge "The text contrast of "disconnected" in Switch media output panel is insufficient." into rvc-dev am: 1334a7e986 
Change-Id: I4bfd5350cbf0365770f3504206febce23ef2c09f
 2020-03-10 15:02:04 +00:00
TreeHugger Robot
1334a7e986 Merge "The text contrast of "disconnected" in Switch media output panel is insufficient." into rvc-dev 2020-03-10 14:45:46 +00:00
Automerger Merge Worker
36113fe03c Merge "[Wi-Fi] Use startActivityForResult instead of startActivity to launch google help page" into rvc-dev am: 7c2979c340 am: 9bc76d1b50 am: 5c874710a3 am: b5ee8d3119 am: d20d78ef42 
Change-Id: Id2fd16af0068f2bf496958d0dcb48b711d7a8221
 2020-03-10 13:34:31 +00:00
Automerger Merge Worker
d20d78ef42 Merge "[Wi-Fi] Use startActivityForResult instead of startActivity to launch google help page" into rvc-dev am: 7c2979c340 am: 9bc76d1b50 am: 5c874710a3 am: b5ee8d3119 
Change-Id: Id2620f5360b9dc67e5dc4575f9f852a1cea8a230
 2020-03-10 13:27:07 +00:00
Automerger Merge Worker
6a9d3f659e Merge "[Wi-Fi] Use startActivityForResult instead of startActivity to launch google help page" into rvc-dev am: 7c2979c340 am: 0a6442df22 am: dbb18e85e4 am: d28ca51a44 
Change-Id: Ifac8dabae4d17a3585ca15ee35d943c17e01461a
 2020-03-10 13:27:04 +00:00
Automerger Merge Worker
e5a9590eb5 Merge "[Wi-Fi] Use startActivityForResult instead of startActivity to launch google help page" into rvc-dev am: 7c2979c340 am: 9bc76d1b50 am: 8cab6d80f9 am: 5c9b3e86ff 
Change-Id: Idfcc1a72b9c9ddd3216694209226c4104238c26d
 2020-03-10 13:26:54 +00:00
Automerger Merge Worker
d28ca51a44 Merge "[Wi-Fi] Use startActivityForResult instead of startActivity to launch google help page" into rvc-dev am: 7c2979c340 am: 0a6442df22 am: dbb18e85e4 
Change-Id: I1593b59c5bb38a923f7127b7828c8de8ae684b5a
 2020-03-10 13:10:14 +00:00
Automerger Merge Worker
5c9b3e86ff Merge "[Wi-Fi] Use startActivityForResult instead of startActivity to launch google help page" into rvc-dev am: 7c2979c340 am: 9bc76d1b50 am: 8cab6d80f9 
Change-Id: Ib34b506d8394fb60aeac8c9c18a5fa3ecae2fdc6
 2020-03-10 13:10:08 +00:00
Automerger Merge Worker
b5ee8d3119 Merge "[Wi-Fi] Use startActivityForResult instead of startActivity to launch google help page" into rvc-dev am: 7c2979c340 am: 9bc76d1b50 am: 5c874710a3 
Change-Id: I0e5d07cd7c690eef446ff0c49ded2ced37478706
 2020-03-10 13:10:06 +00:00
Automerger Merge Worker
5c874710a3 Merge "[Wi-Fi] Use startActivityForResult instead of startActivity to launch google help page" into rvc-dev am: 7c2979c340 am: 9bc76d1b50 
Change-Id: Id7b516abb8e8f01bdf0eff32359925e8c517cd56
 2020-03-10 12:43:45 +00:00
Automerger Merge Worker
dbb18e85e4 Merge "[Wi-Fi] Use startActivityForResult instead of startActivity to launch google help page" into rvc-dev am: 7c2979c340 am: 0a6442df22 
Change-Id: Iec3c9cfebc740ec2b04ff315fc6e18282ccaa8bd
 2020-03-10 12:43:44 +00:00
Automerger Merge Worker
8cab6d80f9 Merge "[Wi-Fi] Use startActivityForResult instead of startActivity to launch google help page" into rvc-dev am: 7c2979c340 am: 9bc76d1b50 
Change-Id: I7c442aa3e7976fa0c8647108e14e02006286f0b8
 2020-03-10 12:43:31 +00:00
Automerger Merge Worker
0a6442df22 Merge "[Wi-Fi] Use startActivityForResult instead of startActivity to launch google help page" into rvc-dev am: 7c2979c340 
Change-Id: I5620a3a5c637aa142b3aa04f7b2a881f3e21ca76
 2020-03-10 12:29:00 +00:00
Automerger Merge Worker
9bc76d1b50 Merge "[Wi-Fi] Use startActivityForResult instead of startActivity to launch google help page" into rvc-dev am: 7c2979c340 
Change-Id: I5a5b4379c819f83bdc2296e2f0e4d1efb2479987
 2020-03-10 12:28:50 +00:00
TreeHugger Robot
7c2979c340 Merge "[Wi-Fi] Use startActivityForResult instead of startActivity to launch google help page" into rvc-dev 2020-03-10 12:12:46 +00:00
Edgar Wang
71099e7a54 Remove duplicated index search data 
Bug: 143055215
Test: manual & robotest
Change-Id: I82583efe37c44014b8949a40d7a695461a7382a9
 2020-03-10 19:47:40 +08:00
calvinpan
75867d8f63 Hide the 5G opiton when 5G has been disallowed 
1. Create PreferenceEntriesBuilder for 5G entry. In the past, the
preferred network type entries was based on CarrierConfigManger value
but 5G option is based on allowed netowork type and device access
family, so include 4G and 5G logic in PreferenceEntriesBuilder.

2. If user selected item not in preferred network option, settings will
auto selected on the first item. For example, if user selected on 5G and
device disallowed 5G(5G option will be hide), so settings will selected
on first item(4G).

Bug: 149721842
Test: EnabledNetworkModePreferenceControllerTest

Change-Id: Ic447a137f9db4cf1a0048a8e58487c29b402bb48
 2020-03-10 10:23:43 +00:00
Arc Wang
005fe6951c [Wi-Fi] Add STA+AP information in Hotspot & tethering footer 
Use WifiManager#isStaApConcurrencySupported() to check if a
device supports STA+AP and shows the footer information.

Bug: 121328949
Test: make RunSettingsRoboTests ROBOTEST_FILTER=TetherSettingsTest
      make RunSettingsRoboTests ROBOTEST_FILTER=WifiTetherFooterPreferenceControllerTest
Change-Id: I3446abb5cc9cdf76da8d17f5de31bd65715c165c
 2020-03-10 18:15:13 +08:00
Automerger Merge Worker
d93bbd6686 Merge "Change sticky card UI back to homepage card style" into rvc-dev am: e5110e9388 am: f6a24c2596 am: 03e6686a61 am: e7b21c94f1 am: 3a1a3b43b7 
Change-Id: I3da298361c8f9e626b46551c8715bfb57d2c4679
 2020-03-10 09:15:04 +00:00
Automerger Merge Worker
24f8522dff Merge "Add entry point at output switcher to do group operation" into rvc-dev am: 378ca1dac4 am: f77dab373b am: 4a76ef4d6f am: 857f165afc am: 95f0e15ec9 
Change-Id: I721b9d9b8de862d896397c2bede3684954baf880
 2020-03-10 09:14:57 +00:00
Automerger Merge Worker
12be2708fc Merge "Change sticky card UI back to homepage card style" into rvc-dev am: e5110e9388 am: cbc146d3f4 am: 169c70e586 am: feac85c7b0 
Change-Id: I408dda2634c215d6c21841c2c458407fff7c0625
 2020-03-10 09:14:51 +00:00
Automerger Merge Worker
70ce4b94b8 Merge "Change sticky card UI back to homepage card style" into rvc-dev am: e5110e9388 am: f6a24c2596 am: fa923a5e37 am: 0f2e2a664c 
Change-Id: Ia1f4e16be17426e968503011d0a52ad8ff5aeab6
 2020-03-10 09:14:34 +00:00
Automerger Merge Worker
8f218955ec Merge "Add entry point at output switcher to do group operation" into rvc-dev am: 378ca1dac4 am: f77dab373b am: d702b2a8b6 am: bf7d11549a 
Change-Id: Ib2327815e193277e259ae014bb1536f41a56d970
 2020-03-10 09:14:12 +00:00
Automerger Merge Worker
3a1a3b43b7 Merge "Change sticky card UI back to homepage card style" into rvc-dev am: e5110e9388 am: f6a24c2596 am: 03e6686a61 am: e7b21c94f1 
Change-Id: I16c6c1edc21d4a55a1018199dfbc2bb5c4dc0634
 2020-03-10 09:13:18 +00:00
Automerger Merge Worker
95f0e15ec9 Merge "Add entry point at output switcher to do group operation" into rvc-dev am: 378ca1dac4 am: f77dab373b am: 4a76ef4d6f am: 857f165afc 
Change-Id: Icc0a8b927050272b7a1c3488315a31f8da6affbd
 2020-03-10 09:13:13 +00:00
Automerger Merge Worker
07294f8c42 Merge "Add entry point at output switcher to do group operation" into rvc-dev am: 378ca1dac4 am: 48d161b7b0 am: 0ed90e5f4c am: b9289da489 
Change-Id: I6f170f8240293e906ea3ed44c8f318fd87541f92
 2020-03-10 09:12:52 +00:00
Automerger Merge Worker
feac85c7b0 Merge "Change sticky card UI back to homepage card style" into rvc-dev am: e5110e9388 am: cbc146d3f4 am: 169c70e586 
Change-Id: I128cc6d56d178e8e2a72342bf9e5bd95f875eab5
 2020-03-10 08:58:06 +00:00
Automerger Merge Worker
0f2e2a664c Merge "Change sticky card UI back to homepage card style" into rvc-dev am: e5110e9388 am: f6a24c2596 am: fa923a5e37 
Change-Id: I1d1ce0c67def33d4ce62e73e7fe408b6b56174e2
 2020-03-10 08:58:01 +00:00
Automerger Merge Worker
bf7d11549a Merge "Add entry point at output switcher to do group operation" into rvc-dev am: 378ca1dac4 am: f77dab373b am: d702b2a8b6 
Change-Id: Ie91c534a08650f82577907efa66c088e477066fe
 2020-03-10 08:57:40 +00:00
Automerger Merge Worker
e7b21c94f1 Merge "Change sticky card UI back to homepage card style" into rvc-dev am: e5110e9388 am: f6a24c2596 am: 03e6686a61 
Change-Id: If8ad476347207f711b2e09b9ff50bee896a2b2ab
 2020-03-10 08:57:12 +00:00