Chad Brubaker
c72031f323
Merge "Send ACTION_KEYCHAIN_CHANGED when installing a cert" into oc-dev
...
am: 85eba52794
2017-04-12 17:33:45 +00:00
Chad Brubaker
85eba52794
Merge "Send ACTION_KEYCHAIN_CHANGED when installing a cert" into oc-dev
2017-04-12 17:21:09 +00:00
Doris Ling
31b6dfdef8
Merge "Remove hotspot receiver from manifest." into oc-dev
...
am: 44cfdcc9a7
2017-04-12 08:27:20 +00:00
TreeHugger Robot
44cfdcc9a7
Merge "Remove hotspot receiver from manifest." into oc-dev
2017-04-12 08:20:06 +00:00
Amin Shaikh
35caf331df
Merge "Wi-Fi network details page fixes." into oc-dev
...
am: 52cf25d03d
2017-04-12 04:50:14 +00:00
TreeHugger Robot
52cf25d03d
Merge "Wi-Fi network details page fixes." into oc-dev
2017-04-12 04:40:11 +00:00
Fan Zhang
28e5589fcd
Merge "Fix nav up button from running process details." into oc-dev
...
am: 5ebfe92f09
2017-04-12 01:35:30 +00:00
Daniel Nishi
cb472bef7b
Merge "Fake the cache size to be 0 bytes when cleared." into oc-dev
...
am: 375c22d031
2017-04-12 01:35:15 +00:00
TreeHugger Robot
5ebfe92f09
Merge "Fix nav up button from running process details." into oc-dev
2017-04-12 01:25:36 +00:00
TreeHugger Robot
375c22d031
Merge "Fake the cache size to be 0 bytes when cleared." into oc-dev
2017-04-12 01:25:21 +00:00
Andrew Sapperstein
138d38a789
Merge "Remove divider above ExpandPreference." into oc-dev
...
am: abac8823b2
2017-04-12 00:20:08 +00:00
TreeHugger Robot
abac8823b2
Merge "Remove divider above ExpandPreference." into oc-dev
2017-04-12 00:03:06 +00:00
Tony Mantler
d9200e5ba4
Merge "Fix sketchy usage of new PreferenceScreen" into oc-dev
...
am: 69faf046c0
2017-04-11 23:48:17 +00:00
TreeHugger Robot
69faf046c0
Merge "Fix sketchy usage of new PreferenceScreen" into oc-dev
2017-04-11 23:43:27 +00:00
Fan Zhang
007b9e3cdd
Merge "Don't show vpn info box when we don't have anything useful" into oc-dev
...
am: d70abb53ee
2017-04-11 23:43:01 +00:00
Fan Zhang
668dae22e7
Merge "Revert "Revert "Convert BT preference to use TwoTargetPreference""" into oc-dev
...
am: fd29aada6b
2017-04-11 23:42:46 +00:00
TreeHugger Robot
d70abb53ee
Merge "Don't show vpn info box when we don't have anything useful" into oc-dev
2017-04-11 23:35:39 +00:00
TreeHugger Robot
fd29aada6b
Merge "Revert "Revert "Convert BT preference to use TwoTargetPreference""" into oc-dev
2017-04-11 23:35:13 +00:00
Amin Shaikh
399e1a5810
Wi-Fi network details page fixes.
...
- Fix NPE in WifiDetailPreferenceController#setIpText
- Add MAC address preference in the details section
- Set subnet mask and gateway preferences
- Do not show IP information preferences if no information is available
- Fix string capitalization errors
- Only show IPv4 DNS servers under "Network details" section
Bug: 36483230
Bug: 37096448
Bug: 36482499
Bug: 37165860
Test: m RunSettingsRoboTests
Change-Id: I0e3f0ccfc4a8d802b51ed6b3be81c75e384dd06f
2017-04-11 16:25:53 -07:00
Jesse Evans
708a85065d
Merge "Fixes instant apps on the Opening links screen" into oc-dev
...
am: 15f963bed9
2017-04-11 22:52:09 +00:00
TreeHugger Robot
15f963bed9
Merge "Fixes instant apps on the Opening links screen" into oc-dev
2017-04-11 22:36:31 +00:00
Fan Zhang
7685987af1
Fix nav up button from running process details.
...
Change-Id: I08fbbc1dab886dd26e7d780c0fc1b50c98a0e2f8
Fix: 36667083
Test: manual
2017-04-11 13:41:31 -07:00
Julia Reynolds
80f06dc54c
Merge "Sort channels and groups by id" into oc-dev
...
am: 665c1ced58
2017-04-11 19:43:06 +00:00
Hyunyoung Song
71ba393033
Merge "Add shadow to AdaptiveIconDrawables using View level shadow" into oc-dev
...
am: 9234a34a80
2017-04-11 19:42:47 +00:00
Andrew Sapperstein
c9469cddbc
Remove divider above ExpandPreference.
...
Change-Id: Ib1841d99025af3f97495efd6d6186b328af33f84
Fixes: 36479214
Test: manual, visual update
2017-04-11 19:41:34 +00:00
Julia Reynolds
665c1ced58
Merge "Sort channels and groups by id" into oc-dev
2017-04-11 19:18:53 +00:00
Doris Ling
f94401b06d
Remove hotspot receiver from manifest.
...
The hotspot receiver if used to cancel any tethering alarm set when wifi
ap state changes. Removing it from the manifest, and only register the
receiver when we schedule the tethering alarm.
Change-Id: I97c3be6e2a374949208bbdd4ac5ccc2fabf0291a
Fix: 35968322
Test: make RunSettingsRoboTests
2017-04-11 12:03:54 -07:00
Fan Zhang
b0509b48c6
Don't show vpn info box when we don't have anything useful
...
Change-Id: I12a71b38486cab8a6a188c299e90a7674926dc98
Fix: 36068109
Test: make RunSettingsRoboTests -j40
2017-04-11 12:02:29 -07:00
Daniel Nishi
1359d4fe0e
Fake the cache size to be 0 bytes when cleared.
...
The fast track storage calculation returns a non-zero answer after
the storage has been cleared. The simplest workaround here is to
fake the size as 0 bytes in the view after cache clearing.
It will not be zero if the user exits and comes back, but this
should be fine.
MARK IT ZERO!
Change-Id: Ia012c2cf2842040d5eac3d4a72539ec7dcfb9570
Fixes: 34965659
Test: Settings Robotest
(cherry picked from commit bf1f8e9ca7
2017-04-11 18:23:55 +00:00
Hyunyoung Song
9234a34a80
Merge "Add shadow to AdaptiveIconDrawables using View level shadow" into oc-dev
2017-04-11 18:11:49 +00:00
Tony Mantler
76f46fc869
Fix sketchy usage of new PreferenceScreen
...
Things get weird if you don't use PreferenceManager#createPreferenceScreen
Bug: 37216851
Test: Compiles and runs
Change-Id: I7cebec133c4f27f7eeda83c95d8acb4823f67dc4
2017-04-11 10:35:24 -07:00
Fan Zhang
00d8ff5d6e
Revert "Revert "Convert BT preference to use TwoTargetPreference""
...
This reverts commit 457c3cbec2
2017-04-11 09:45:27 -07:00
Paul Stewart
14633029d2
Merge "Allow user to specify EAP-SIM under PEAP" into oc-dev
...
am: 6d7f210c0b
2017-04-11 07:47:36 +00:00
TreeHugger Robot
6d7f210c0b
Merge "Allow user to specify EAP-SIM under PEAP" into oc-dev
2017-04-11 07:22:52 +00:00
Matthew Fritze
5bb64aeb59
Merge "Reindex on OTA and locale change" into oc-dev
...
am: f84c8d3480
2017-04-11 00:19:36 +00:00
TreeHugger Robot
f84c8d3480
Merge "Reindex on OTA and locale change" into oc-dev
2017-04-10 23:54:55 +00:00
Honglu Yin
381570cda2
Merge "Title is different after tapping "Memory used by apps"" am: 7d9146e10a am: 4604741c51
...
am: b9b563d243
2017-04-10 23:23:44 +00:00
Honglu Yin
b9b563d243
Merge "Title is different after tapping "Memory used by apps"" am: 7d9146e10a
...
am: 4604741c51
2017-04-10 23:22:49 +00:00
Jack He
075ee6109f
Merge "Add developer menu entry to enable Bluetooth inband ringing" am: 3d08bedba2 am: 9e1e430f06
...
am: 336a7ccca7
2017-04-10 23:20:34 +00:00
Jack He
336a7ccca7
Merge "Add developer menu entry to enable Bluetooth inband ringing" am: 3d08bedba2
...
am: 9e1e430f06
2017-04-10 23:11:42 +00:00
Treehugger Robot
7d9146e10a
Merge "Title is different after tapping "Memory used by apps""
2017-04-10 22:53:09 +00:00
Jack He
3d08bedba2
Merge "Add developer menu entry to enable Bluetooth inband ringing"
2017-04-10 22:47:55 +00:00
Hyunyoung Song
ebc17237c3
Add shadow to AdaptiveIconDrawables using View level shadow
...
Test: $ make RunSettingsRoboTests -j40
RunSettingsRoboTests: ......
RunSettingsRoboTests: Time: 151.394
RunSettingsRoboTests:
RunSettingsRoboTests: OK (1355 tests)
RunSettingsRoboTests:
Bug: 36088922
Change-Id: I5b5651d2305ab65e1358609a4110e248dee9eab2
2017-04-10 14:43:02 -07:00
Matthew Fritze
a0d03178d0
Reindex on OTA and locale change
...
When the user gets an OTA or changes language, settings
will clear the database and reindex it.
Test: make RunSettingsRoboTests
Change-Id: I379ece86b2d41d673bbbffbcf947774f3ccd4cb9
Fixes: 36859162
2017-04-10 14:28:39 -07:00
Garfield Tan
cea8a43a92
Merge "Fix the intent to launch storage details." into oc-dev
...
am: 66871d8531
2017-04-10 20:41:47 +00:00
Garfield Tan
66871d8531
Merge "Fix the intent to launch storage details." into oc-dev
2017-04-10 20:24:20 +00:00
Chad Brubaker
68baa35adb
Send ACTION_KEYCHAIN_CHANGED when installing a cert
...
Change-Id: I846162511b5d75d937d4c543d47d535894e1d688
Fixes: 36492950
Test: Verified that installing a cert via UI triggers the broadcast
2017-04-10 10:33:52 -07:00
Daniel Nishi
f4af2774ee
Merge "Add user icon to the other user preferences." into oc-dev
...
am: b1c336de5f
2017-04-10 17:32:27 +00:00
Daniel Nishi
b1c336de5f
Merge "Add user icon to the other user preferences." into oc-dev
2017-04-10 17:27:25 +00:00
Lei Yu
964de0d7be
Merge "Add log for BatteryUtils" into oc-dev
...
am: 27dc9b69ac
2017-04-10 17:13:22 +00:00
