From: rikky <rikky@ffa7fe5e-494d-0410-b361-a75ebd5db220>
Date: Sat, 28 Apr 2012 22:53:13 +0000 (+0000)
Subject: Fix:Android:Make compatible to android API < 5 again
X-Git-Tag: navit-0.5.0.5194svn~143
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=65435e18a5fbe23858910279633de1bd765ed023;p=profile%2Fivi%2Fnavit.git

Fix:Android:Make compatible to android API < 5 again

git-svn-id: https://navit.svn.sourceforge.net/svnroot/navit/trunk@5052 ffa7fe5e-494d-0410-b361-a75ebd5db220
---

diff --git a/navit/navit/android/src/org/navitproject/navit/NavitDownloadSelectMapActivity.java b/navit/navit/android/src/org/navitproject/navit/NavitDownloadSelectMapActivity.java
index 5e2bc7c..adf236f 100644
--- a/navit/navit/android/src/org/navitproject/navit/NavitDownloadSelectMapActivity.java
+++ b/navit/navit/android/src/org/navitproject/navit/NavitDownloadSelectMapActivity.java
@@ -19,9 +19,7 @@
 
 package org.navitproject.navit;
 
-import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.List;
 
 import android.app.Activity;
 import android.app.AlertDialog;
@@ -31,7 +29,6 @@ import android.content.Intent;
 import android.os.Bundle;
 import android.os.Message;
 import android.util.Log;
-import android.util.Pair;
 import android.view.View;
 import android.widget.ExpandableListView;
 import android.widget.RelativeLayout;
@@ -40,9 +37,7 @@ import android.widget.TextView;
 
 public class NavitDownloadSelectMapActivity extends ExpandableListActivity {
 
-	private static Pair<List<HashMap<String, String>>, ArrayList<ArrayList<HashMap<String, String>>> >
-    mapMenu                                = null;
-
+	private NavitMapDownloader.MapMenu   mapMenu                                = null;
 
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
@@ -52,21 +47,14 @@ public class NavitDownloadSelectMapActivity extends ExpandableListActivity {
 
 		SimpleExpandableListAdapter adapter =
 		        new SimpleExpandableListAdapter(this,
-		        		mapMenu.first,
-		                android.R.layout.simple_expandable_list_item_1, // Group itemlayout XML.
-		                new String[] { "category_name" }, // the key of group item.
-		                new int[] { android.R.id.text1 }, // ID of each group
-		                                             // item.-Data under the key
-		                                             // goes into this
-		                mapMenu.second, // childData describes second-level
-		                                   // entries.
-		                android.R.layout.simple_expandable_list_item_1, // Layout for sub-level
-		                                    // entries(second level).
-		                new String[] { "map_name" }, // Keys in childData maps
-		                                             // to display.
-		                new int[] { android.R.id.text1 } // Data under the keys
-		                                             // above go into these
-		                                             // TextViews.
+		        		mapMenu.groupList,
+		                android.R.layout.simple_expandable_list_item_1,
+		                new String[] { "category_name" },
+		                new int[] { android.R.id.text1 },
+		                mapMenu.childList,
+		                android.R.layout.simple_expandable_list_item_1, 
+		                new String[] { "map_name" },
+		                new int[] { android.R.id.text1 }
 		        );
 		setListAdapter(adapter);
 		setTitle(String.valueOf(NavitMapDownloader.getFreeSpace()/1024/1024) + "MB available");
@@ -76,8 +64,8 @@ public class NavitDownloadSelectMapActivity extends ExpandableListActivity {
 	public boolean onChildClick(ExpandableListView parent, View v, int groupPosition, int childPosition, long id) {
 		super.onChildClick(parent, v, groupPosition, childPosition, id);
 		Log.d("Navit", "p:" + groupPosition + ", child_pos:" + childPosition);
-		HashMap<String, String> map = mapMenu.second.get(groupPosition).get(childPosition);
-		
+		HashMap<String, String> map = mapMenu.childList.get(groupPosition).get(childPosition);
+
 		String map_index = map.get("map_index");
 		if (map_index != null) {
 			Intent resultIntent = new Intent();
diff --git a/navit/navit/android/src/org/navitproject/navit/NavitMapDownloader.java b/navit/navit/android/src/org/navitproject/navit/NavitMapDownloader.java
index 336048d..2035332 100644
--- a/navit/navit/android/src/org/navitproject/navit/NavitMapDownloader.java
+++ b/navit/navit/android/src/org/navitproject/navit/NavitMapDownloader.java
@@ -36,7 +36,6 @@ import java.util.List;
 
 import android.os.StatFs;
 import android.util.Log;
-import android.util.Pair;
 
 public class NavitMapDownloader extends Thread
 {
@@ -63,6 +62,17 @@ public class NavitMapDownloader extends Thread
 			this.level = level;
 		}
 	}
+	
+	public static class MapMenu {
+		List<HashMap<String, String>>                 groupList;
+		ArrayList<ArrayList<HashMap<String, String>>> childList;
+
+		MapMenu(List<HashMap<String, String>> groups, ArrayList<ArrayList<HashMap<String, String>>> childs) {
+			groupList = groups;
+			childList = childs;
+		}
+	}
+
 	//
 	// define the maps here
 	//
@@ -340,7 +350,7 @@ public class NavitMapDownloader extends Thread
 		this.map_values = osm_maps[map_id];
 	}
 
-	public static Pair<List<HashMap<String, String>>, ArrayList<ArrayList<HashMap<String, String>>>> getMenu() {
+	public static MapMenu getMenu() {
 		ArrayList<HashMap<String, String>> resultGroups = new ArrayList<HashMap<String, String>>();
 		ArrayList<ArrayList<HashMap<String, String>>> resultChilds =
 		        new ArrayList<ArrayList<HashMap<String, String>>>();
@@ -383,8 +393,7 @@ public class NavitMapDownloader extends Thread
 		}
 		resultChilds.add(secList);
 
-		return new Pair<List<HashMap<String, String>>, ArrayList<ArrayList<HashMap<String, String>>>>(resultGroups,
-		        resultChilds);
+		return new MapMenu(resultGroups, resultChilds);
 	}
 
 	public int download_osm_map(osm_map_values map_values)