summaryrefslogtreecommitdiffstats
path: root/samples/Support7Demos
diff options
context:
space:
mode:
authorVladislav Kaznacheev <kaznacheev@google.com>2015-05-22 19:03:41 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-05-22 19:03:41 +0000
commit66ca00a6a27e113ef8cbafa638240e20ec381eb8 (patch)
treedb518f76320a27b6f51a08710b4631112577ddb1 /samples/Support7Demos
parent27d827158fb0c80ad3f16e7ccb1df5ca57ff7289 (diff)
parenteda065a4b89d1964e87db8f15b4b586968eba42c (diff)
downloadandroid_development-66ca00a6a27e113ef8cbafa638240e20ec381eb8.tar.gz
android_development-66ca00a6a27e113ef8cbafa638240e20ec381eb8.tar.bz2
android_development-66ca00a6a27e113ef8cbafa638240e20ec381eb8.zip
am eda065a4: Merge "Add StaggeredGridLayoutManagerActivity to Support7Demos" into lmp-mr1-ub-dev
* commit 'eda065a4b89d1964e87db8f15b4b586968eba42c': Add StaggeredGridLayoutManagerActivity to Support7Demos
Diffstat (limited to 'samples/Support7Demos')
-rw-r--r--samples/Support7Demos/AndroidManifest.xml9
-rw-r--r--samples/Support7Demos/res/values/strings.xml2
-rw-r--r--samples/Support7Demos/src/com/example/android/supportv7/widget/StaggeredGridLayoutManagerActivity.java58
3 files changed, 69 insertions, 0 deletions
diff --git a/samples/Support7Demos/AndroidManifest.xml b/samples/Support7Demos/AndroidManifest.xml
index 5c5bf1405..038fd635e 100644
--- a/samples/Support7Demos/AndroidManifest.xml
+++ b/samples/Support7Demos/AndroidManifest.xml
@@ -393,6 +393,15 @@
</intent-filter>
</activity>
+ <activity android:name=".widget.StaggeredGridLayoutManagerActivity"
+ android:label="@string/staggered_grid_layout_manager"
+ android:theme="@style/Theme.AppCompat">
+ <intent-filter>
+ <action android:name="android.intent.action.MAIN" />
+ <category android:name="com.example.android.supportv7.SAMPLE_CODE" />
+ </intent-filter>
+ </activity>
+
<activity android:name=".view.CardViewActivity"
android:label="@string/card_view"
android:theme="@style/Theme.AppCompat">
diff --git a/samples/Support7Demos/res/values/strings.xml b/samples/Support7Demos/res/values/strings.xml
index 843de1a0d..820aa0ebd 100644
--- a/samples/Support7Demos/res/values/strings.xml
+++ b/samples/Support7Demos/res/values/strings.xml
@@ -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>
diff --git a/samples/Support7Demos/src/com/example/android/supportv7/widget/StaggeredGridLayoutManagerActivity.java b/samples/Support7Demos/src/com/example/android/supportv7/widget/StaggeredGridLayoutManagerActivity.java
new file mode 100644
index 000000000..39d865719
--- /dev/null
+++ b/samples/Support7Demos/src/com/example/android/supportv7/widget/StaggeredGridLayoutManagerActivity.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.example.android.supportv7.widget;
+
+import com.example.android.supportv7.R;
+import com.example.android.supportv7.widget.util.ConfigToggle;
+
+import android.support.v7.widget.StaggeredGridLayoutManager;
+
+public class StaggeredGridLayoutManagerActivity
+ extends BaseLayoutManagerActivity<StaggeredGridLayoutManager> {
+
+ private boolean mVertical = true;
+
+ @Override
+ protected StaggeredGridLayoutManager createLayoutManager() {
+ if (mVertical) {
+ return new StaggeredGridLayoutManager(3, StaggeredGridLayoutManager.VERTICAL);
+ } else {
+ return new StaggeredGridLayoutManager(3, StaggeredGridLayoutManager.HORIZONTAL);
+ }
+ }
+
+ @Override
+ ConfigToggle[] createConfigToggles() {
+ return new ConfigToggle[] {
+ new ConfigToggle(this, R.string.vertical) {
+ @Override
+ public boolean isChecked() {
+ return mVertical;
+ }
+
+ @Override
+ public void onChange(boolean newValue) {
+ if (mVertical == newValue) {
+ return;
+ }
+ mVertical = newValue;
+ mRecyclerView.setLayoutManager(createLayoutManager());
+ }
+ }
+ };
+ }
+}