Automated import from //branches/donutburger/...@140648,140648

6 files changed, 6 insertions, 13 deletions

diff --git a/res/drawable/ic_launcher_application.png b/res/drawable/ic_launcher_application.png
index 75024841d..3b28cc63b 100644
--- a/res/drawable/ic_launcher_application.png
+++ b/res/drawable/ic_launcher_application.png
diff --git a/res/drawable/ic_launcher_empty.png b/res/drawable/ic_launcher_empty.png
deleted file mode 100644
index 59bb6c506..000000000
--- a/res/drawable/ic_launcher_empty.png
+++ /dev/null
diff --git a/res/drawable/ic_launcher_folder_live.png b/res/drawable/ic_launcher_folder_live.png
new file mode 100644
index 000000000..214574705
--- /dev/null
+++ b/res/drawable/ic_launcher_folder_live.png
diff --git a/res/drawable/ic_launcher_shortcut.png b/res/drawable/ic_launcher_shortcut.png
new file mode 100644
index 000000000..d6c0ef460
--- /dev/null
+++ b/res/drawable/ic_launcher_shortcut.png
diff --git a/res/drawable/ic_search_widget.png b/res/drawable/ic_search_widget.png
index 0a4d8f467..37bf77e9f 100644
--- a/res/drawable/ic_search_widget.png
+++ b/res/drawable/ic_search_widget.png
diff --git a/src/com/android/launcher/AddAdapter.java b/src/com/android/launcher/AddAdapter.java
index 996c619a9..245a7a0c5 100644
--- a/src/com/android/launcher/AddAdapter.java
+++ b/src/com/android/launcher/AddAdapter.java
@@ -31,8 +31,7 @@ import java.util.ArrayList;
  * Adapter showing the types of items that can be added to a {@link Workspace}.
  */
 public class AddAdapter extends BaseAdapter {
-    
-    private final Launcher mLauncher;
+
     private final LayoutInflater mInflater;
     
     private final ArrayList<ListItem> mItems = new ArrayList<ListItem>();
@@ -66,9 +65,8 @@ public class AddAdapter extends BaseAdapter {
     
     public AddAdapter(Launcher launcher) {
         super();
-        
-        mLauncher = launcher;
-        mInflater = (LayoutInflater) mLauncher.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+
+        mInflater = (LayoutInflater) launcher.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
         
         // Create default actions
         Resources res = launcher.getResources();
@@ -77,18 +75,13 @@ public class AddAdapter extends BaseAdapter {
                 R.drawable.ic_launcher_application, ITEM_APPLICATION));
         
         mItems.add(new ListItem(res, R.string.group_shortcuts,
-                R.drawable.ic_launcher_empty, ITEM_SHORTCUT));
-        
-        if (false) {
-            mItems.add(new ListItem(res, R.string.group_search,
-                    R.drawable.ic_search_widget, ITEM_SEARCH));
-        }
-        
+                R.drawable.ic_launcher_shortcut, ITEM_SHORTCUT));
+
         mItems.add(new ListItem(res, R.string.group_widgets,
                 R.drawable.ic_launcher_appwidget, ITEM_APPWIDGET));
         
         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,
                 R.drawable.ic_launcher_folder, ITEM_FOLDER));