Update to Libs to fix app.R problem on Eclipse

sphero-inc · Jan 4, 2012 · b652b05 · b652b05
1 parent 4df632a
commit b652b05
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 4 deletions.
diff --git a/library/RobotUILibrary/res/layout-land/hsb_color_picker.xml b/library/RobotUILibrary/res/layout-land/hsb_color_picker.xml
@@ -91,7 +91,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
                 android:layout_marginRight="20dip">
-                <orbotix.robot.app.HSBColorPickerView
+                <orbotix.robot.widgets.HSBColorPickerView
                     android:id="@+id/ColorPickerBase"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"

diff --git a/library/RobotUILibrary/res/layout-port/hsb_color_picker.xml b/library/RobotUILibrary/res/layout-port/hsb_color_picker.xml
@@ -73,7 +73,7 @@
         <RelativeLayout android:id="@+id/ColorWheelLayout"
             android:layout_width="match_parent"
             android:layout_height="wrap_content">
-            <orbotix.robot.app.HSBColorPickerView
+            <orbotix.robot.widgets.HSBColorPickerView
                 android:id="@+id/ColorPickerBase"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"

diff --git a/library/RobotUILibrary/src/orbotix/robot/widgets/CustomPopover.java b/library/RobotUILibrary/src/orbotix/robot/widgets/CustomPopover.java
@@ -8,7 +8,7 @@
 import android.view.ViewGroup.LayoutParams;
 import android.widget.ImageView;
 import android.widget.ScrollView;
-import orbotix.robot.R;
+import orbotix.robot.app.R;
 
 /**
  * A popover widget that can be filled with a custom layout. When shown, the popover will be displayed out of the anchor

diff --git a/library/RobotUILibrary/src/orbotix/robot/widgets/CustomPopupWindow.java b/library/RobotUILibrary/src/orbotix/robot/widgets/CustomPopupWindow.java
@@ -16,7 +16,7 @@
 import android.view.WindowManager;
 
 import android.widget.PopupWindow;
-import orbotix.robot.R;
+import orbotix.robot.app.R;
 
 public class CustomPopupWindow {
 	protected final View anchor;

diff --git a/library/libs/RobotLibrary.jar b/library/libs/RobotLibrary.jar