Commit Graph

16618 Commits

Author SHA1 Message Date
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
1562848a24 Merge "Remove divider above ExpandPreference." into oc-dev am: abac8823b2
am: 138d38a789

Change-Id: If7bad49dc87322f1b8eb1a507fff2df968ad9af6
2017-04-12 00:37:48 +00:00
Andrew Sapperstein
138d38a789 Merge "Remove divider above ExpandPreference." into oc-dev
am: abac8823b2

Change-Id: Id03d2e44fe8da8dc98b1a6694b2281d29c72a04d
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
61492e99d7 Merge "Fix sketchy usage of new PreferenceScreen" into oc-dev am: 69faf046c0
am: d9200e5ba4

Change-Id: I4c125d7c62b94a351544a7b64547add0a774db3e
2017-04-11 23:56:08 +00:00
Fan Zhang
09641675af Merge "Don't show vpn info box when we don't have anything useful" into oc-dev am: d70abb53ee
am: 007b9e3cdd

Change-Id: I0686ca0de807f7dab72d261536da02faa0703847
2017-04-11 23:48:51 +00:00
Fan Zhang
57c1ce4980 Merge "Revert "Revert "Convert BT preference to use TwoTargetPreference""" into oc-dev am: fd29aada6b
am: 668dae22e7

Change-Id: Ib618566f6078793be3460070e65bd78b9d0f0a59
2017-04-11 23:48:37 +00:00
Tony Mantler
d9200e5ba4 Merge "Fix sketchy usage of new PreferenceScreen" into oc-dev
am: 69faf046c0

Change-Id: I6c8310037826f13e9d468e9b27dc26d347b11249
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

Change-Id: I98af02698f46eb483cf5d64380854dd632d26113
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

Change-Id: I30e9087f3e90055ccc1192743814c42f3a28a21e
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

Change-Id: I21b6b40c9abb52c52e525000b1e5f063a1c4c475
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
Christopher Tate
65cb0d6488 Use bg appop ALLOWED, not DEFAULT
DEFAULT is not actually the right thing; it's a subtlety used for
other things that have compound state.  ALLOWED is the proper
outright "let this thing run free" state for this appop.

Also, set the appop only for the target package, not for the
entire uid.

Bug 37226920
Bug 37242946
Test: make RunSettingsRoboTests

Change-Id: I8c0a995b9519f980685e8573da946dcc93ac4e7c
2017-04-11 14:07:00 -07:00
Julia Reynolds
18fcc05224 Notification sound field updates
- Show default and silent options
- Don't also update the default notification sound
- Display a better summary in case the sound isn't in media store

Change-Id: I42d537657a7bbddb8a1ce41fd03b8e5847899a82
Fixes: 36734113
Fixes: 36849670
Test: manual (silent sound, default sound, normal sound, private sound)
2017-04-11 16:57:57 -04: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
Doris Ling
aa805e70ed Allow settings preference title to span over multiple lines.
- add singleLineTitle=false to SettingsPreference style, so that it will
not confined the title to a single line.
- remove the custom multi line title from DividerPreference and
MasterSwitchPreference.

Change-Id: I5a78d2cd6ac00c4482e252b0789fd2d265bd9adf
Fix: 34886787
Test: manual
2017-04-11 13:17:38 -07:00
Julia Reynolds
a38202fb5e Merge "Sort channels and groups by id" into oc-dev am: 665c1ced58
am: 80f06dc54c

Change-Id: Ic8dbeaadda4f3f322f7afb60204fe817e19388fa
2017-04-11 19:47:16 +00:00
Hyunyoung Song
ad3843f4e4 Merge "Add shadow to AdaptiveIconDrawables using View level shadow" into oc-dev am: 9234a34a80
am: 71ba393033

Change-Id: I656587f889bdc4694cf0e8805a1f32feef7b8078
2017-04-11 19:47:01 +00:00
Julia Reynolds
80f06dc54c Merge "Sort channels and groups by id" into oc-dev
am: 665c1ced58

Change-Id: I3878ed917d63b9454b332f714ac83054452fab31
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

Change-Id: I25a0968edf534242130fdfda405bb6dfb8afc24a
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
Stephen Chen
2c4b42c0b7 Update "Open networks available" toggle to instead open notification channel preferences.
Bug: 36526438
Test: make ROBOTEST_FILTER=NotifyOpenNetworkPreferenceControllerTest RunSettingsRoboTests -j40
Change-Id: Idde3949856d050e62abff2c75a7b7db475a94d99
2017-04-11 11:54:51 -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
Daniel Nishi
d78cb7932e Merge "Fix storage settings crash." 2017-04-11 18:13:07 +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
Daniel Nishi
c717b54e5f Merge "Jostle the elements around in app storage settings." 2017-04-11 17:03:53 +00:00
Fan Zhang
00d8ff5d6e Revert "Revert "Convert BT preference to use TwoTargetPreference""
This reverts commit 457c3cbec2.

Revert with fix/test.
The fix is that we removed DevicePickerFragment#initDevicePreference(),
which incorrectly set a useless widget on preference, and removes the
gear icon from preference, preventing bind() call to go through

Change-Id: Ia70cdb51d13cca6035a4e7fe8008d195f7f00c6e
Fix: 36511169
Test: runtest --path tests/app/src/com/android/settings/bluetooth/DevicePickerActivityTest.java
2017-04-11 09:45:27 -07:00
Esteban Talavera
3ff052c089 Merge "Show when work profile notifications are blocked for listener" 2017-04-11 13:32:30 +00:00
Paul Stewart
bc95b6ee68 Merge "Allow user to specify EAP-SIM under PEAP" into oc-dev am: 6d7f210c0b
am: 14633029d2

Change-Id: I73e537e35502369ca54a0b00a790d562a397aec4
2017-04-11 08:03:48 +00:00
Paul Stewart
14633029d2 Merge "Allow user to specify EAP-SIM under PEAP" into oc-dev
am: 6d7f210c0b

Change-Id: I37c91c9df8e2b8ff86cf4e11ffbc8bbbfb8ad9dd
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
78bc33c327 Merge "Reindex on OTA and locale change" into oc-dev am: f84c8d3480
am: 5bb64aeb59

Change-Id: I5551e8502a162a40e80f0c1c5637fd22f5545094
2017-04-11 00:37:41 +00:00
Matthew Fritze
5bb64aeb59 Merge "Reindex on OTA and locale change" into oc-dev
am: f84c8d3480

Change-Id: Ia8730a65d7199eefc6054954d2f0f5923dd6aad0
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
1872bdef43 Merge "Title is different after tapping "Memory used by apps"" am: 7d9146e10a am: 4604741c51 am: b9b563d243
am: 381570cda2

Change-Id: Ifd8fbcfa5a4d0e5aa8598fb26b4158b01db230c3
2017-04-10 23:35:51 +00:00
Jack He
0ff39bc114 Merge "Add developer menu entry to enable Bluetooth inband ringing" am: 3d08bedba2 am: 9e1e430f06 am: 336a7ccca7
am: 075ee6109f

Change-Id: I6f525a905f9472aae6f227de3f3b1dd1eac5fcaa
2017-04-10 23:32:11 +00:00
Honglu Yin
381570cda2 Merge "Title is different after tapping "Memory used by apps"" am: 7d9146e10a am: 4604741c51
am: b9b563d243

Change-Id: Id276fbc68b12985074393454f729f950612685ed
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

Change-Id: I1168d6d5862745210045efea402f6d0f1e85acab
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

Change-Id: I1a7ff476de330fbe0c0b48ce27c8dd363cd49c8f
2017-04-10 23:20:34 +00:00
Daniel Nishi
1075d16c59 Jostle the elements around in app storage settings.
This much more closely resembles the later mocks for
this page. The spacing, fonts, and colors are still off
and will be corrected once the final mocks land.

Bug: 34766830
Test: Manual
Change-Id: Id131e3596a0d08cb43c924a9f5cd9eb25329d7de
2017-04-10 16:14:33 -07:00
Jack He
336a7ccca7 Merge "Add developer menu entry to enable Bluetooth inband ringing" am: 3d08bedba2
am: 9e1e430f06

Change-Id: I8fe93eebafb60a237bfbe1009652672e17411a3d
2017-04-10 23:11:42 +00:00