合并代码

D-clock · D-clock · commit a0bae2db584d · 2016-08-01T10:54:36.000+08:00
diff --git a/src/main/java/com/clock/study/activity/AnimationTestActivity.java b/src/main/java/com/clock/study/activity/AnimationTestActivity.java
@@ -59,7 +59,7 @@ public long getItemId(int position) {
         @Override
         public View getView(int position, View convertView, ViewGroup parent) {
             if (convertView == null) {
-                convertView = View.inflate(parent.getContext(), R.layout.list_view_test_item, null);
+                convertView = View.inflate(parent.getContext(), R.layout.author_info_layout, null);
             }
             return convertView;
         }
diff --git a/src/main/res/layout/activity_animator.xml b/src/main/res/layout/activity_animator.xml
@@ -10,7 +10,7 @@
 
     <include
         android:id="@+id/anim_target"
-        layout="@layout/list_view_test_item" />
+        layout="@layout/author_info_layout" />
 
     <ScrollView
         android:layout_width="match_parent"
diff --git a/src/main/res/layout/author_info_layout.xml b/src/main/res/layout/author_info_layout.xml

Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ public long getItemId(int position) {`
`59`	`59`	`@Override`
`60`	`60`	`public View getView(int position, View convertView, ViewGroup parent) {`
`61`	`61`	`if (convertView == null) {`
`62`		`- convertView = View.inflate(parent.getContext(), R.layout.list_view_test_item, null);`
	`62`	`+ convertView = View.inflate(parent.getContext(), R.layout.author_info_layout, null);`
`63`	`63`	`}`
`64`	`64`	`return convertView;`
`65`	`65`	`}`