Automated import from //branches/master/...@140651,140651

This commit is contained in:
Romain Guy 2009-03-24 18:10:17 -07:00 committed by The Android Open Source Project
parent a688e524b3
commit 7c7a07377f
6 changed files with 6 additions and 13 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.1 KiB

After

Width:  |  Height:  |  Size: 3.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 196 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.9 KiB

After

Width:  |  Height:  |  Size: 3.8 KiB

View File

@ -31,8 +31,7 @@ import java.util.ArrayList;
* Adapter showing the types of items that can be added to a {@link Workspace}. * Adapter showing the types of items that can be added to a {@link Workspace}.
*/ */
public class AddAdapter extends BaseAdapter { public class AddAdapter extends BaseAdapter {
private final Launcher mLauncher;
private final LayoutInflater mInflater; private final LayoutInflater mInflater;
private final ArrayList<ListItem> mItems = new ArrayList<ListItem>(); private final ArrayList<ListItem> mItems = new ArrayList<ListItem>();
@ -66,9 +65,8 @@ public class AddAdapter extends BaseAdapter {
public AddAdapter(Launcher launcher) { public AddAdapter(Launcher launcher) {
super(); super();
mLauncher = launcher; mInflater = (LayoutInflater) launcher.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
mInflater = (LayoutInflater) mLauncher.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
// Create default actions // Create default actions
Resources res = launcher.getResources(); Resources res = launcher.getResources();
@ -77,18 +75,13 @@ public class AddAdapter extends BaseAdapter {
R.drawable.ic_launcher_application, ITEM_APPLICATION)); R.drawable.ic_launcher_application, ITEM_APPLICATION));
mItems.add(new ListItem(res, R.string.group_shortcuts, mItems.add(new ListItem(res, R.string.group_shortcuts,
R.drawable.ic_launcher_empty, ITEM_SHORTCUT)); R.drawable.ic_launcher_shortcut, ITEM_SHORTCUT));
if (false) {
mItems.add(new ListItem(res, R.string.group_search,
R.drawable.ic_search_widget, ITEM_SEARCH));
}
mItems.add(new ListItem(res, R.string.group_widgets, mItems.add(new ListItem(res, R.string.group_widgets,
R.drawable.ic_launcher_appwidget, ITEM_APPWIDGET)); R.drawable.ic_launcher_appwidget, ITEM_APPWIDGET));
mItems.add(new ListItem(res, R.string.group_live_folders, mItems.add(new ListItem(res, R.string.group_live_folders,
R.drawable.ic_launcher_empty, ITEM_LIVE_FOLDER)); R.drawable.ic_launcher_folder_live, ITEM_LIVE_FOLDER));
mItems.add(new ListItem(res, R.string.group_folder, mItems.add(new ListItem(res, R.string.group_folder,
R.drawable.ic_launcher_folder, ITEM_FOLDER)); R.drawable.ic_launcher_folder, ITEM_FOLDER));