summaryrefslogtreecommitdiffstats
path: root/samples/Support7Demos/res/layout/animated_recycler_view.xml
diff options
context:
space:
mode:
authorSteve Kondik <steve@cyngn.com>2016-03-10 18:13:45 -0800
committerSteve Kondik <steve@cyngn.com>2016-03-10 18:13:45 -0800
commit0a521f6d93206567c14bbacdc13819bf4baf82d3 (patch)
tree2e11b47c9856368387b394b6831726f2526bf6dd /samples/Support7Demos/res/layout/animated_recycler_view.xml
parent171957c0bdc547ae6013daddffc03c8ec3ac2e3e (diff)
parentadce814038b96c87ea66fc1e5bfd85ab28d80590 (diff)
downloadandroid_development-stable/cm-13.0-ZNH2K.tar.gz
android_development-stable/cm-13.0-ZNH2K.tar.bz2
android_development-stable/cm-13.0-ZNH2K.zip
Merge tag 'android-6.0.1_r22' of https://android.googlesource.com/platform/development into cm-13.0staging/cm-13.0+r22stable/cm-13.0-ZNH2KBstable/cm-13.0-ZNH2K
Android 6.0.1 release 22
Diffstat (limited to 'samples/Support7Demos/res/layout/animated_recycler_view.xml')
-rw-r--r--samples/Support7Demos/res/layout/animated_recycler_view.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/samples/Support7Demos/res/layout/animated_recycler_view.xml b/samples/Support7Demos/res/layout/animated_recycler_view.xml
index 29a23e26a..e5ff03760 100644
--- a/samples/Support7Demos/res/layout/animated_recycler_view.xml
+++ b/samples/Support7Demos/res/layout/animated_recycler_view.xml
@@ -26,9 +26,9 @@
android:layout_height="wrap_content"/>
<CheckBox
- android:id="@+id/enableChangeAnimations"
+ android:id="@+id/enableInPlaceChange"
android:checked="false"
- android:text="@string/enableChangeAnimations"
+ android:text="@string/enableInPlaceChange"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>