am eda065a4: Merge "Add StaggeredGridLayoutManagerActivity to Support7Demos" into lmp-mr1-ub-dev

* commit 'eda065a4b89d1964e87db8f15b4b586968eba42c':
  Add StaggeredGridLayoutManagerActivity to Support7Demos
This commit is contained in:
Vladislav Kaznacheev
2015-05-22 19:03:41 +00:00
committed by Android Git Automerger
3 changed files with 69 additions and 0 deletions

View File

@@ -149,6 +149,7 @@
<string name="animated_recycler_view">RecyclerView/AnimatedRecyclerView</string>
<string name="linear_layout_manager">RecyclerView/Linear Layout Manager</string>
<string name="grid_layout_manager">RecyclerView/Grid Layout Manager</string>
<string name="staggered_grid_layout_manager">RecyclerView/Staggered Grid Layout Manager</string>
<string name="checkbox_orientation">Horz.</string>
<string name="checkbox_reverse">Rev.</string>
<string name="checkbox_layout_dir">Layout Dir</string>
@@ -199,4 +200,5 @@
<string name="drag">drag me</string>
<string name="swipe">swipe me</string>
<string name="swiping">swiping</string>
<string name="vertical">vertical</string>
</resources>