Mercurial Mercurial > hedgewars / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
android: fix compatibility with donut
authorXeli
Sat, 26 Nov 2011 11:39:41 +0100
changeset 6433 c8e4b3f29e1e
parent 6432 ffb18b44415d
child 6434 bf8bfc6ceca0
android: fix compatibility with donut
project_files/Android-build/SDL-android-project/res/layout/download_confirmdialog.xml file | annotate | diff | comparison | revisions
project_files/Android-build/SDL-android-project/res/layout/download_info.xml file | annotate | diff | comparison | revisions
project_files/Android-build/SDL-android-project/res/layout/download_listactivity.xml file | annotate | diff | comparison | revisions
project_files/Android-build/SDL-android-project/res/layout/download_progress.xml file | annotate | diff | comparison | revisions 
--- a/project_files/Android-build/SDL-android-project/res/layout/download_confirmdialog.xml	Fri Nov 25 19:36:03 2011 +0100
+++ b/project_files/Android-build/SDL-android-project/res/layout/download_confirmdialog.xml	Sat Nov 26 11:39:41 2011 +0100
@@ -2,7 +2,7 @@
 <RelativeLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="wrap_content"
-    android:layout_height="match_parent"
+    android:layout_height="fill_parent"
     android:padding="5dip">
   	<TextView 
       	android:id="@+id/text"
@@ -13,7 +13,7 @@
        	android:maxWidth="200dip"/>
 
 	<LinearLayout
-	    android:layout_width="match_parent"
+	    android:layout_width="fill_parent"
 	    android:layout_height="wrap_content"
 	    android:layout_below="@+id/text"
 	    android:layout_alignLeft="@id/text"
@@ -23,17 +23,17 @@
 
 	    <Button
 	        android:id="@+id/yes"
-	        android:layout_width="match_parent"
-	        android:layout_height="match_parent"
+	        android:layout_width="fill_parent"
+	        android:layout_height="fill_parent"
 	        android:layout_weight="1"
 	        android:text="@android:string/yes" />
 
 	    <Button
 	        android:id="@+id/no"
-	        android:layout_width="match_parent"
-	        android:layout_height="match_parent"
+	        android:layout_width="fill_parent"
+	        android:layout_height="fill_parent"
 	        android:layout_weight="1"
 	        android:text="@android:string/no" />
 	</LinearLayout>
    	
-</RelativeLayout>
\ No newline at end of file
+</RelativeLayout>
--- a/project_files/Android-build/SDL-android-project/res/layout/download_info.xml	Fri Nov 25 19:36:03 2011 +0100
+++ b/project_files/Android-build/SDL-android-project/res/layout/download_info.xml	Sat Nov 26 11:39:41 2011 +0100
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
     android:orientation="horizontal"
     android:gravity="center_vertical">
     <ImageView
         android:id="@+id/arrow"
-        android:layout_width="match_parent"
+        android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:layout_weight="8"
         android:src="@drawable/arrow"
@@ -14,8 +14,8 @@
     
     <RelativeLayout
         android:id="@+id/container"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
         android:layout_weight="1"
         android:gravity="center"
         android:background="@drawable/box_dark">        
@@ -43,4 +43,4 @@
     </RelativeLayout>
     
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
--- a/project_files/Android-build/SDL-android-project/res/layout/download_listactivity.xml	Fri Nov 25 19:36:03 2011 +0100
+++ b/project_files/Android-build/SDL-android-project/res/layout/download_listactivity.xml	Sat Nov 26 11:39:41 2011 +0100
@@ -1,39 +1,39 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent">
     
    <include layout="@layout/background"/>
     
 	<LinearLayout 
-	    android:layout_width="match_parent"
-	    android:layout_height="match_parent"
+	    android:layout_width="fill_parent"
+	    android:layout_height="fill_parent"
 	    android:orientation="horizontal"
 	    android:background="@android:color/transparent">	    
 	    <fragment class="org.hedgewars.hedgeroid.Downloader.DownloadListFragment"
 	        android:id="@+id/downloadList"
-	        android:layout_width="match_parent"
-	        android:layout_height="match_parent"
+	        android:layout_width="fill_parent"
+	        android:layout_height="fill_parent"
 	        android:layout_weight="1"/>
 	    
 	    <FrameLayout 
 	        android:id="@+id/downloadFrameLayout"
-	        android:layout_width="match_parent"
-	        android:layout_height="match_parent"
+	        android:layout_width="fill_parent"
+	        android:layout_height="fill_parent"
 	        android:layout_weight="1"
 	        android:background="@android:color/transparent">
 	        
 	        <ScrollView
-	            android:layout_width="match_parent"
-	        	android:layout_height="match_parent">
+	            android:layout_width="fill_parent"
+	        	android:layout_height="fill_parent">
 	            
 	            <LinearLayout
 	                android:id="@+id/downloadQueueContainer"
-	                android:layout_width="match_parent"
-	        		android:layout_height="match_parent"
+	                android:layout_width="fill_parent"
+	        		android:layout_height="fill_parent"
 	        		android:orientation="vertical"/>	        		
 	        </ScrollView>
 	    </FrameLayout>
 	
 	</LinearLayout>
-</FrameLayout>
\ No newline at end of file
+</FrameLayout>
--- a/project_files/Android-build/SDL-android-project/res/layout/download_progress.xml	Fri Nov 25 19:36:03 2011 +0100
+++ b/project_files/Android-build/SDL-android-project/res/layout/download_progress.xml	Sat Nov 26 11:39:41 2011 +0100
@@ -3,14 +3,15 @@
 	android:id="@+id/container"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
+    android:minWidth="250dip"
     android:padding="5dp"
     android:background="@drawable/box">
     <ProgressBar
     	android:id="@+id/progressbar"
     	android:layout_width="wrap_content"
     	android:layout_height="wrap_content"
-    	android:layout_alignLeft="@+id/background"
-    	android:layout_alignRight="@+id/cancelDownload"
+    	android:layout_alignParentLeft="true"
+    	android:layout_alignParentRight="true"
     	android:progressDrawable="@android:drawable/progress_horizontal"
 		android:indeterminate="false" 
 		android:indeterminateOnly="false"/>
@@ -19,25 +20,27 @@
     	android:layout_width="wrap_content"
     	android:layout_height="wrap_content"
     	android:layout_below="@id/progressbar"
-    	android:layout_alignLeft="@+id/background"
-    	android:layout_alignRight="@+id/cancelDownload"
+    	android:layout_alignParentLeft="true"
+    	android:layout_alignParentRight="true"
     	android:text="@string/download_queued"
     	android:textColor="#FFF"
     	android:textSize="14dp"
     	android:gravity="center"/> 	
-    <Button
+    <!--  <Button
     	android:id="@id/background"
     	android:layout_width="wrap_content"
     	android:layout_height="wrap_content"
     	android:layout_below="@id/progressbar_sub"
-    	android:text="@string/download_background"/>
+    	android:text="@string/download_background"/>-->
     <Button
     	android:id="@+id/cancelDownload"
     	android:layout_width="wrap_content"
     	android:layout_height="wrap_content"
     	android:layout_below="@id/progressbar_sub"
-    	android:layout_toRightOf="@id/background"
+    	
+    	android:layout_centerHorizontal="true"
     	android:text="@string/download_cancel"/>
+    <!-- android:layout_toRightOf="@id/background"-->
     	
 </RelativeLayout>
hedgewars