Christine Franks
594d15386c
Merge "Use correct title when opening from notification" into oc-dev am: f61d4f38be
...
am: c783d634a3
2017-04-12 18:04:59 +00:00
Christine Franks
c783d634a3
Merge "Use correct title when opening from notification" into oc-dev
...
am: f61d4f38be
2017-04-12 17:33:29 +00:00
Christine Franks
f61d4f38be
Merge "Use correct title when opening from notification" into oc-dev
2017-04-12 17:19:40 +00:00
Charles He
c879dfc11f
Merge "VPN settings: better a11y voice for legacy dialog" into oc-dev am: 2371009a22
...
am: 38752c4f48
2017-04-12 11:28:15 +00:00
Niels Egberts
4523b38356
Remove unused xml file. am: 07e3f619eb
...
am: 0b51491a46
2017-04-12 11:28:01 +00:00
Charles He
38752c4f48
Merge "VPN settings: better a11y voice for legacy dialog" into oc-dev
...
am: 2371009a22
2017-04-12 11:22:47 +00:00
Niels Egberts
0b51491a46
Remove unused xml file.
...
am: 07e3f619eb
2017-04-12 11:22:31 +00:00
TreeHugger Robot
2371009a22
Merge "VPN settings: better a11y voice for legacy dialog" into oc-dev
2017-04-12 11:20:09 +00:00
Niels Egberts
07e3f619eb
Remove unused xml file.
...
Bug: 36741587
Test: mmma packages/apps/Settings
Change-Id: I35eee7fb442a1cdeb54d8a9f54426322c75e3f99
(cherry picked from commit ecb613bd8d
2017-04-12 08:55:21 +00:00
Doris Ling
395c70370a
Merge "Remove hotspot receiver from manifest." into oc-dev am: 44cfdcc9a7
...
am: 31b6dfdef8
2017-04-12 08:33:40 +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
27ea581cbe
Merge "Wi-Fi network details page fixes." into oc-dev am: 52cf25d03d
...
am: 35caf331df
2017-04-12 04:59:20 +00:00
Suprabh Shukla
fdc69a5452
Merge "Renaming intent action for unknown sources" into oc-dev am: 3fa963b28e
...
am: eb2e6c7add
2017-04-12 04:55:28 +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
Suprabh Shukla
eb2e6c7add
Merge "Renaming intent action for unknown sources" into oc-dev
...
am: 3fa963b28e
2017-04-12 04:45:58 +00:00
TreeHugger Robot
52cf25d03d
Merge "Wi-Fi network details page fixes." into oc-dev
2017-04-12 04:40:11 +00:00
Suprabh Shukla
3fa963b28e
Merge "Renaming intent action for unknown sources" into oc-dev
2017-04-12 04:32:51 +00:00
Fan Zhang
888bc4694e
Merge "Add placeholder summary to stablize app info pref height" into oc-dev am: 0bc2aaea70
...
am: 752f902c2a
2017-04-12 02:51:01 +00:00
Fan Zhang
752f902c2a
Merge "Add placeholder summary to stablize app info pref height" into oc-dev
...
am: 0bc2aaea70
2017-04-12 02:45:56 +00:00
TreeHugger Robot
0bc2aaea70
Merge "Add placeholder summary to stablize app info pref height" into oc-dev
2017-04-12 02:36:12 +00:00
Fan Zhang
6292c8eab4
Merge "Fix nav up button from running process details." into oc-dev am: 5ebfe92f09
...
am: 28e5589fcd
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
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
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
1562848a24
Merge "Remove divider above ExpandPreference." into oc-dev am: abac8823b2
...
am: 138d38a789
2017-04-12 00:37:48 +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
61492e99d7
Merge "Fix sketchy usage of new PreferenceScreen" into oc-dev am: 69faf046c0
...
am: d9200e5ba4
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
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
2017-04-11 23:48:37 +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
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
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
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
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
a38202fb5e
Merge "Sort channels and groups by id" into oc-dev am: 665c1ced58
...
am: 80f06dc54c
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
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
2017-04-11 19:46:46 +00:00
Julia Reynolds
80f06dc54c
Merge "Sort channels and groups by id" into oc-dev
...
am: 665c1ced58
2017-04-11 19:43:06 +00:00
