Merge branch 'dev'

tinyeeliu · tinyeeliu · commit 57847424d467 · 2012-09-12T15:09:32.000+08:00
Conflicts:
	dist/build-full.jardesc
	dist/build.jardesc
	src/com/androidquery/util/Constants.java
diff --git a/demo/res/layout/source_activity.xml b/demo/res/layout/source_activity.xml
@@ -64,6 +64,8 @@
 	        android:visibility="gone"
 	   	/>
 	    
+		
+		
 	    <ProgressBar 
 			android:id="@+id/progress"	
 			android:layout_width="wrap_content" 
@@ -73,15 +75,25 @@
 		/>
 	    
 	    
-	    <ProgressBar 
-			android:id="@+id/progress_bar"	
+	    
+		<LinearLayout 
+	        android:id="@+id/progress_box"	
 			android:layout_width="fill_parent" 
 			android:layout_height="wrap_content"
-			android:layout_margin="5dip"
-			style="@android:style/Widget.ProgressBar.Horizontal"
 			android:layout_gravity="center_horizontal" 
-			android:visibility="gone"
-		/>
+	        >
+			
+		    <ProgressBar 
+				android:id="@+id/progress_bar"	
+				android:layout_width="fill_parent" 
+				android:layout_height="wrap_content"
+				android:layout_margin="5dip"
+				style="@android:style/Widget.ProgressBar.Horizontal"
+				android:layout_gravity="center_horizontal" 
+				android:visibility="gone"
+			/>
+	    
+	    </LinearLayout>
 	    
 		<ImageView
 			android:id="@+id/image"				
diff --git a/demo/src/com/androidquery/test/image/ImageLoadingActivity.java b/demo/src/com/androidquery/test/image/ImageLoadingActivity.java
@@ -170,7 +170,7 @@ public void image_progress_bar(){
 		String imageUrl = "http://farm6.static.flickr.com/5035/5802797131_a729dac808_b.jpg";		
 		aq.id(R.id.image).progress(R.id.progress_bar).image(imageUrl, false, false);
 		
-		
+		//aq.id(R.id.image).progress(R.id.progress_box).image(imageUrl, false, false);
 	}
 
 	public void image_animation(){
diff --git a/dist/build-full.jardesc b/dist/build-full.jardesc
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="WINDOWS-1252" standalone="no"?>
 <jardesc>
-    <jar path="AndroidQuery/dist/android-query-full.0.23.15.jar"/>
+
+    <jar path="AndroidQuery/dist/android-query-full.0.23.16.jar"/>
+
     <options buildIfNeeded="true" compress="true" descriptionLocation="/AndroidQuery/dist/build-full.jardesc" exportErrors="true" exportWarnings="true" includeDirectoryEntries="false" overwrite="true" saveDescription="true" storeRefactorings="false" useSourceFolders="false"/>
     <storedRefactorings deprecationInfo="true" structuralOnly="false"/>
     <selectedProjects/>
diff --git a/dist/build.jardesc b/dist/build.jardesc
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="WINDOWS-1252" standalone="no"?>
 <jardesc>
-    <jar path="AndroidQuery/dist/android-query-0.23.15.jar"/>
+
+    <jar path="AndroidQuery/dist/android-query.0.23.16.jar"/>
+
     <options buildIfNeeded="true" compress="true" descriptionLocation="/AndroidQuery/dist/build.jardesc" exportErrors="true" exportWarnings="true" includeDirectoryEntries="false" overwrite="true" saveDescription="true" storeRefactorings="false" useSourceFolders="false"/>
     <storedRefactorings deprecationInfo="true" structuralOnly="false"/>
     <selectedProjects/>
diff --git a/src/com/androidquery/util/Common.java b/src/com/androidquery/util/Common.java
@@ -511,7 +511,7 @@ public static void showProgress(Object p, String url, boolean show){
 					if(tag == null || tag.equals(url)){
 						pv.setTag(AQuery.TAG_URL, null);	
 						
-						if(pbar != null && pbar.isIndeterminate()){
+						if(pbar == null || pbar.isIndeterminate()){
 							pv.setVisibility(View.GONE);						
 						}
 					}
diff --git a/src/com/androidquery/util/Constants.java b/src/com/androidquery/util/Constants.java
@@ -19,7 +19,9 @@
 public interface Constants {
 
 
-	public static final String VERSION = "0.23.15";
+
+	public static final String VERSION = "0.23.16";
+
 	
 	public static final int LAYER_TYPE_SOFTWARE = 1;
 	public static final int LAYER_TYPE_HARDWARE = 2;

Original file line number	Diff line number	Diff line change
`@@ -170,7 +170,7 @@ public void image_progress_bar(){`
`170`	`170`	`String imageUrl = "http://farm6.static.flickr.com/5035/5802797131_a729dac808_b.jpg";`
`171`	`171`	`aq.id(R.id.image).progress(R.id.progress_bar).image(imageUrl, false, false);`
`172`	`172`
`173`		`-`
	`173`	`+ //aq.id(R.id.image).progress(R.id.progress_box).image(imageUrl, false, false);`
`174`	`174`	`}`
`175`	`175`
`176`	`176`	`public void image_animation(){`
Original file line number	Diff line number	Diff line change
`@@ -511,7 +511,7 @@ public static void showProgress(Object p, String url, boolean show){`
`511`	`511`	`if(tag == null \|\| tag.equals(url)){`
`512`	`512`	`pv.setTag(AQuery.TAG_URL, null);`
`513`	`513`
`514`		`- if(pbar != null && pbar.isIndeterminate()){`
	`514`	`+ if(pbar == null \|\| pbar.isIndeterminate()){`
`515`	`515`	`pv.setVisibility(View.GONE);`
`516`	`516`	`}`
`517`	`517`	`}`