Doris Ling
943b6af1fc
Merge "Allow settings preference title to span over multiple lines." into oc-dev am: d09c7e61f4
...
am: c6f5261619
2017-04-12 18:41:50 +00:00
Doris Ling
c6f5261619
Merge "Allow settings preference title to span over multiple lines." into oc-dev
...
am: d09c7e61f4
2017-04-12 18:10:41 +00:00
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
TreeHugger Robot
d09c7e61f4
Merge "Allow settings preference title to span over multiple lines." into oc-dev
2017-04-12 17:57:28 +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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
2017-04-11 09:45:27 -07:00
Fan Zhang
1d44df7ca0
Update string char limits am: d017f22372
...
am: 2700a3148f
2017-04-11 16:42:14 +00:00
Fan Zhang
2700a3148f
Update string char limits
...
am: d017f22372
2017-04-11 16:27:17 +00:00
Evan Laird
b8ddcd4fb4
Merge "Add "Current screen saver" string" into oc-dev am: 42a1cb9e12
...
am: 5c51987432
2017-04-11 16:11:10 +00:00
Fan Zhang
d017f22372
Update string char limits
...
Fix: 36852178
Fix: 36851715
Fix: 36657781
Fix: 36700992
Fix: 36650008
Fix: 36657636
Test: builds and robotests
Change-Id: I14c21b2cb37b911c14dff40343fa094d7150f201
2017-04-11 09:09:23 -07:00
Evan Laird
5c51987432
Merge "Add "Current screen saver" string" into oc-dev
...
am: 42a1cb9e12
2017-04-11 15:55:18 +00:00
TreeHugger Robot
42a1cb9e12
Merge "Add "Current screen saver" string" into oc-dev
2017-04-11 15:44:30 +00:00
Doris Ling
759c9cb5ea
Merge "Update text for security preference." into oc-dev am: 74eee7838c
...
am: 47a44f0fea
2017-04-11 15:36:44 +00:00
Doris Ling
47a44f0fea
Merge "Update text for security preference." into oc-dev
...
am: 74eee7838c
2017-04-11 15:31:43 +00:00
Doris Ling
74eee7838c
Merge "Update text for security preference." into oc-dev
2017-04-11 15:24:44 +00: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
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
2017-04-11 07:47:36 +00:00
