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
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
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
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
Jack He
0ff39bc114
Merge "Add developer menu entry to enable Bluetooth inband ringing" am: 3d08bedba2 am: 9e1e430f06 am: 336a7ccca7
...
am: 075ee6109f
2017-04-10 23:32:11 +00:00
Fan Zhang
6fabfc1f1d
Add placeholder summary to stablize app info pref height
...
Change-Id: I6a62a94bb02271cdde9873745432aa829d6d4460
Fix: 36900036
Test: rebuild and existing robotests
2017-04-10 23:24:34 +00:00
Sean Stout
40067bee4d
Remove Night Light suggestion. DO NOT MERGE
...
Test: make ROBOTEST_FILTER=SettingsSuggestionsTest RunSettingsRoboTests
Bug: 37207263
Change-Id: Ieeb660abdcbe07cb66f1ae3b6e86d8fd27a26478
2017-04-10 16:22:01 -07:00
Jack He
075ee6109f
Merge "Add developer menu entry to enable Bluetooth inband ringing" am: 3d08bedba2 am: 9e1e430f06
...
am: 336a7ccca7
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
2017-04-10 23:11:42 +00:00
Doris Ling
ca95a90c11
Update text for security preference.
...
Swap location to screen lock in title and summary.
Bug: 37161482
Test: builds
Change-Id: Ie95f1d8c984587bf3898a431edde0868b0e17fce
2017-04-10 15:21:18 -07:00
Hyunyoung Song
ebc17237c3
Add shadow to AdaptiveIconDrawables using View level shadow
...
Test: $ make RunSettingsRoboTests -j40
RunSettingsRoboTests: ......
RunSettingsRoboTests: Time: 151.394
RunSettingsRoboTests:
RunSettingsRoboTests: OK (1355 tests)
RunSettingsRoboTests:
Bug: 36088922
Change-Id: I5b5651d2305ab65e1358609a4110e248dee9eab2
2017-04-10 14:43:02 -07:00
Evan Laird
044001f991
Add "Current screen saver" string
...
This one was missed originally.
Test: none
Bug:35031991
Change-Id: I9b1bff9a9c834c306fe03e4405950bc1ac3ac3ac
2017-04-10 16:35:45 -04:00
TreeHugger Robot
99475b4c24
Merge "Import translations. DO NOT MERGE"
2017-04-08 08:19:01 +00:00
TreeHugger Robot
4c4f2a7c4c
Merge "Import translations. DO NOT MERGE" into oc-dev
2017-04-08 08:06:37 +00:00
Lei Yu
e57622d5a4
Merge "Extend the translation limit to 60" into oc-dev am: 2a3a92b513
...
am: 451964a124
2017-04-07 21:11:53 +00:00
Lei Yu
451964a124
Merge "Extend the translation limit to 60" into oc-dev
...
am: 2a3a92b513
2017-04-07 21:08:11 +00:00
