Commit Graph

35078 Commits

Author SHA1 Message Date
Fan Zhang
6292c8eab4 Merge "Fix nav up button from running process details." into oc-dev am: 5ebfe92f09
am: 28e5589fcd

Change-Id: If852b5f08a8604865a083ad763544fd2120107e0
2017-04-12 02:34:41 +00:00
Daniel Nishi
2a9c93d896 Merge "Fake the cache size to be 0 bytes when cleared." into oc-dev am: 375c22d031
am: cb472bef7b  -s ours

Change-Id: I38041c6e740ba805ddfad5514ad18e88fc3cfe1b
2017-04-12 02:34:27 +00:00
Fan Zhang
28e5589fcd Merge "Fix nav up button from running process details." into oc-dev
am: 5ebfe92f09

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

Change-Id: I2672ff3a908272feb1b1e8c2fd8584be745d71f1
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
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
TreeHugger Robot
26f5848862 Merge "Import translations. DO NOT MERGE" 2017-04-11 23:15:29 +00:00
Jesse Evans
edfd92ee75 Merge "Fixes instant apps on the Opening links screen" into oc-dev am: 15f963bed9
am: 708a85065d

Change-Id: I3fe5f98c77b91364340d357e9c9c86737ee8cba5
2017-04-11 23:01:39 +00: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
Christine Franks
e12bf697b0 Use correct title when opening from notification
Bug: 36070413
Test: tap system alert window notification, which brings up Settings
with the correct title.

Change-Id: I6f346a7336a71c046cbc58b7291a851a7537d5ac
2017-04-11 14:57:33 -07: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
Lei Yu
44446f670b Merge "Add textAlignment for preference_widget_summary" into oc-dev am: 8bb9f33c6f
am: af95b3d3c2

Change-Id: I9f40f699a617dd889805bb71c5e6344e3f71ec2e
2017-04-11 19:46:46 +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
Charles He
646d42fe2d VPN settings: better a11y voice for legacy dialog
Previously, the user input fields in the legacy VPN config dialog would
simply be read out as "edit box", "drop-down list", etc., without
reference to their corresponding labels. This is not optimal for
low-vision users.

In this CL, we add a "labelFor" attribute to the prompt TextView of each
field. The resulting input fields would instead be read out as "edit box
for username", "drop-down list for type", etc., which are much less
ambiguous than before.

Bug: 37202471
Test: make SettingsGoogle and navigate the dialog with TalkBack on
Change-Id: Id23d0563984e3de4a4a3d03a587ca130b50508fc
2017-04-11 19:37:05 +01: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
Lei Yu
af95b3d3c2 Merge "Add textAlignment for preference_widget_summary" into oc-dev
am: 8bb9f33c6f

Change-Id: Icece4eeeeefa2da5ce0a0d9318757b1270dcfce6
2017-04-11 17:34:58 +00:00
Lei Yu
8bb9f33c6f Merge "Add textAlignment for preference_widget_summary" into oc-dev 2017-04-11 17:10:08 +00: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
Fan Zhang
1d44df7ca0 Update string char limits am: d017f22372
am: 2700a3148f

Change-Id: I42c1e08c4c59c63b422749360333c168a2294096
2017-04-11 16:42:14 +00:00
Fan Zhang
2700a3148f Update string char limits
am: d017f22372

Change-Id: Ia91e931c93a53d77a1c1ad554d60982b0c0c084a
2017-04-11 16:27:17 +00:00
Evan Laird
b8ddcd4fb4 Merge "Add "Current screen saver" string" into oc-dev am: 42a1cb9e12
am: 5c51987432

Change-Id: I93566c8e18f1607ab91a514d5f9f0a9dd384456a
2017-04-11 16:11:10 +00:00