Merge "Add suggestions to settings"

This commit is contained in:
Jason Monk
2016-01-08 14:50:17 +00:00
committed by Android (Google) Code Review
14 changed files with 340 additions and 56 deletions

View File

@@ -103,8 +103,8 @@
<!-- Dashboard category panel elevation -->
<dimen name="dashboard_category_elevation">2dp</dimen>
<!-- Dashboard category title layout height -->
<dimen name="dashboard_category_title_height">48dp</dimen>
<!-- Dashboard category layout height -->
<dimen name="dashboard_category_height">48dp</dimen>
<!-- Dashboard category title margin start -->
<dimen name="dashboard_category_title_margin_start">16dp</dimen>
@@ -119,6 +119,8 @@
<dimen name="dashboard_tile_image_margin_start">16dp</dimen>
<dimen name="dashboard_tile_image_margin_end">32dp</dimen>
<dimen name="suggestion_arrow_margin">16dp</dimen>
<!-- SwitchBar margin start / end -->
<dimen name="switchbar_margin_start">16dp</dimen>
<dimen name="switchbar_margin_end">16dp</dimen>

View File

@@ -6776,4 +6776,10 @@
<!-- Summary of condition that background data is off [CHAR LIMIT=NONE] -->
<string name="condition_bg_data_summary">Background data is only available via Wi-Fi. This may affect some apps or services when Wi-Fi is not available.</string>
<!-- Title for the suggestions section on the dashboard [CHAR LIMIT=30] -->
<string name="suggestions_title">Suggestions (<xliff:g name="count" example="3">%1$d</xliff:g>)</string>
<!-- Name of option to remove a suggestion from the list [CHAR LIMIT=30] -->
<string name="suggestion_remove">Remove</string>
</resources>