LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

am cc303b81: merge from froyo-plus-aosp

Browse Source
This commit is contained in:
The Android Open Source Project
2010-06-07 16:45:07 -07:00
committed by Android Git Automerger
parent 9c4991f1ec cc303b81e4
commit 5d0050f35f
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
samples/ApiDemos/src/com/example/android/apis/ApiDemos.java
View File

@@ -52,8 +52,8 @@ public class ApiDemos extends ListActivity {
getListView().setTextFilterEnabled(true); getListView().setTextFilterEnabled(true);
} }
protected List getData(String prefix) { protected List<Map<String, Object>> getData(String prefix) {
List<Map> myData = new ArrayList<Map>(); List<Map<String, Object>> myData = new ArrayList<Map<String, Object>>();
Intent mainIntent = new Intent(Intent.ACTION_MAIN, null); Intent mainIntent = new Intent(Intent.ACTION_MAIN, null);
mainIntent.addCategory(Intent.CATEGORY_SAMPLE_CODE); mainIntent.addCategory(Intent.CATEGORY_SAMPLE_CODE);
@@ -107,10 +107,11 @@ public class ApiDemos extends ListActivity {
return myData; return myData;
} }
private final static Comparator<Map> sDisplayNameComparator = new Comparator<Map>() { private final static Comparator<Map<String, Object>> sDisplayNameComparator =
new Comparator<Map<String, Object>>() {
private final Collator collator = Collator.getInstance(); private final Collator collator = Collator.getInstance();
public int compare(Map map1, Map map2) { public int compare(Map<String, Object> map1, Map<String, Object> map2) {
return collator.compare(map1.get("title"), map2.get("title")); return collator.compare(map1.get("title"), map2.get("title"));
} }
}; };
@@ -128,7 +129,7 @@ public class ApiDemos extends ListActivity {
return result; return result;
} }
protected void addItem(List<Map> data, String name, Intent intent) { protected void addItem(List<Map<String, Object>> data, String name, Intent intent) {
Map<String, Object> temp = new HashMap<String, Object>(); Map<String, Object> temp = new HashMap<String, Object>();
temp.put("title", name); temp.put("title", name);
temp.put("intent", intent); temp.put("intent", intent);
@@ -136,11 +137,11 @@ public class ApiDemos extends ListActivity {
} }
@Override @Override
@SuppressWarnings("unchecked")
protected void onListItemClick(ListView l, View v, int position, long id) { protected void onListItemClick(ListView l, View v, int position, long id) {
Map map = (Map) l.getItemAtPosition(position); Map<String, Object> map = (Map<String, Object>)l.getItemAtPosition(position);
Intent intent = (Intent) map.get("intent"); Intent intent = (Intent) map.get("intent");
startActivity(intent); startActivity(intent);
} }
} }