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
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
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
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
Julia Reynolds
665c1ced58
Merge "Sort channels and groups by id" into oc-dev
2017-04-11 19:18:53 +00: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
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
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
TreeHugger Robot
6d7f210c0b
Merge "Allow user to specify EAP-SIM under PEAP" into oc-dev
2017-04-11 07:22:52 +00:00
Sean Stout
79065d5a3c
Merge "Remove Night Light suggestion. DO NOT MERGE" into oc-dev am: e4c73c24bc
...
am: 2fcca5a647
2017-04-11 02:17:24 +00:00
Sean Stout
2fcca5a647
Merge "Remove Night Light suggestion. DO NOT MERGE" into oc-dev
...
am: e4c73c24bc
2017-04-11 02:05:52 +00:00
jackqdyulei
adcedce4e0
Add textAlignment for preference_widget_summary
...
To make sure the text are aligned to the "viewEnd".
Bug: 37159537
Test: Screenshot
Change-Id: Ifab03dda6c9954d6b83ce4db0708303e0c5d32bd
2017-04-10 18:57:12 -07:00
Bill Yi
ff7341385a
Import translations. DO NOT MERGE
...
Change-Id: I9a5c7e15111d3ba93e697b8be910230b5cf58751
Auto-generated-cl: translation import
2017-04-10 18:52:23 -07:00
TreeHugger Robot
e4c73c24bc
Merge "Remove Night Light suggestion. DO NOT MERGE" into oc-dev
2017-04-11 01:24:09 +00:00
TreeHugger Robot
4cf2523795
Merge "Add placeholder summary to stablize app info pref height"
2017-04-11 01:07:29 +00:00
Matthew Fritze
78bc33c327
Merge "Reindex on OTA and locale change" into oc-dev am: f84c8d3480
...
am: 5bb64aeb59
2017-04-11 00:37:41 +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
1872bdef43
Merge "Title is different after tapping "Memory used by apps"" am: 7d9146e10a am: 4604741c51 am: b9b563d243
...
am: 381570cda2
2017-04-10 23:35:51 +00:00
