Merge "Make classes that extend ItemInfo public." into ub-now-mister-ugly

src/com/android/launcher3/AppInfo.java

@@ -31,7 +31,7 @@ import java.util.HashMap;
 /**
  * Represents an app in AllAppsView.
  */
-class AppInfo extends ItemInfo {
+public class AppInfo extends ItemInfo {
     private static final String TAG = "Launcher3.AppInfo";
 
     /**

src/com/android/launcher3/FolderInfo.java

@@ -23,7 +23,7 @@ import java.util.ArrayList;
 /**
  * Represents a folder containing shortcuts or apps.
  */
-class FolderInfo extends ItemInfo {
+public class FolderInfo extends ItemInfo {
 
     /**
      * Whether this folder has been opened

src/com/android/launcher3/Launcher.java

@@ -1254,7 +1254,7 @@ public class Launcher extends Activity
             @Override
             public void onClick(View arg0) {
                 if (!mWorkspace.isSwitchingState()) {
-                    onClickAddWidgetButton();
+                    onClickAddWidgetButton(arg0);
                 }
             }
         });
@@ -1265,7 +1265,7 @@ public class Launcher extends Activity
             @Override
             public void onClick(View arg0) {
                 if (!mWorkspace.isSwitchingState()) {
-                    onClickWallpaperPicker();
+                    onClickWallpaperPicker(arg0);
                 }
             }
         });
@@ -1277,7 +1277,7 @@ public class Launcher extends Activity
                 @Override
                 public void onClick(View arg0) {
                     if (!mWorkspace.isSwitchingState()) {
-                        onClickSettingsButton();
+                        onClickSettingsButton(arg0);
                     }
                 }
             });
@@ -2525,7 +2525,7 @@ public class Launcher extends Activity
      * Event handler for the (Add) Widgets button that appears after a long press
      * on the home screen.
      */
-    protected void onClickAddWidgetButton() {
+    protected void onClickAddWidgetButton(View view) {
         if (LOGD) Log.d(TAG, "onClickAddWidgetButton");
         showAllApps(true, AppsCustomizePagedView.ContentType.Widgets, true);
     }
@@ -2534,7 +2534,7 @@ public class Launcher extends Activity
      * Event handler for the wallpaper picker button that appears after a long press
      * on the home screen.
      */
-    protected void onClickWallpaperPicker() {
+    protected void onClickWallpaperPicker(View v) {
         if (LOGD) Log.d(TAG, "onClickWallpaperPicker");
         final Intent pickWallpaper = new Intent(Intent.ACTION_SET_WALLPAPER);
         pickWallpaper.setComponent(getWallpaperPickerComponent());
@@ -2545,7 +2545,7 @@ public class Launcher extends Activity
      * Event handler for a click on the settings button that appears after a long press
      * on the home screen.
      */
-    protected void onClickSettingsButton() {
+    protected void onClickSettingsButton(View v) {
         if (LOGD) Log.d(TAG, "onClickSettingsButton");
     }
 

src/com/android/launcher3/LauncherAppWidgetInfo.java

@@ -23,7 +23,7 @@ import android.content.ContentValues;
 /**
  * Represents a widget (either instantiated or about to be) in the Launcher.
  */
-class LauncherAppWidgetInfo extends ItemInfo {
+public class LauncherAppWidgetInfo extends ItemInfo {
 
     /**
      * Indicates that the widget hasn't been instantiated yet.

src/com/android/launcher3/ShortcutInfo.java

@@ -31,7 +31,7 @@ import java.util.ArrayList;
 /**
  * Represents a launchable icon on the workspaces and in folders.
  */
-class ShortcutInfo extends ItemInfo {
+public class ShortcutInfo extends ItemInfo {
 
     /**
      * The intent used to start the application.