clean up rollo / launcher2

5 files changed, 46 insertions, 6 deletions

diff --git a/res/layout-land/workspace_screen.xml b/res/layout-land/workspace_screen.xml
index 5207d7b9c..531bac242 100644
--- a/res/layout-land/workspace_screen.xml
+++ b/res/layout-land/workspace_screen.xml
@@ -21,8 +21,8 @@
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
 
-    launcher:cellWidth="106dip"
-    launcher:cellHeight="73dip"
+    launcher:cellWidth="@dimen/workspace_cell_width"
+    launcher:cellHeight="@dimen/workspace_cell_height"
     launcher:longAxisStartPadding="0dip"
     launcher:longAxisEndPadding="55dip"
     launcher:shortAxisStartPadding="0dip"
diff --git a/res/layout-port/workspace_screen.xml b/res/layout-port/workspace_screen.xml
index 6bbf6e951..531bac242 100644
--- a/res/layout-port/workspace_screen.xml
+++ b/res/layout-port/workspace_screen.xml
@@ -21,8 +21,8 @@
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
 
-    launcher:cellWidth="80dip"
-    launcher:cellHeight="100dip"
+    launcher:cellWidth="@dimen/workspace_cell_width"
+    launcher:cellHeight="@dimen/workspace_cell_height"
     launcher:longAxisStartPadding="0dip"
     launcher:longAxisEndPadding="55dip"
     launcher:shortAxisStartPadding="0dip"
diff --git a/res/raw/rollo.c b/res/raw/rollo.c
index 70d39545e..5ed562a48 100644
--- a/res/raw/rollo.c
+++ b/res/raw/rollo.c
@@ -128,12 +128,12 @@ int main(void* con, int ft, int launchID)
                 if (alpha > 0) {
                     color(1.0f, 1.0f, 1.0f, alpha);
 
-                    float ty = 605.f - y * 150.f;
+                    float ty = 654.f - y * 150.f;
 
                     ty = ty + 0.25f;
 
                     bindTexture(NAMED_PFText, 0, loadI32(3, index));
-                    drawRect(tx, ty, tx + 128.f, ty + 32.f, 0.5f);
+                    drawRect(tx, ty, tx + 128.f, ty + 64.f, 0.5f);
                 }
                 iconCount--;
                 index++;
diff --git a/res/values-land/dimens.xml b/res/values-land/dimens.xml
new file mode 100644
index 000000000..a9d5082f7
--- /dev/null
+++ b/res/values-land/dimens.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2009 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<resources>
+    <dimen name="workspace_cell_width">106dip</dimen>
+    <dimen name="workspace_cell_height">73dip</dimen>
+</resources>
diff --git a/res/values-port/dimens.xml b/res/values-port/dimens.xml
new file mode 100644
index 000000000..65a3fd3e4
--- /dev/null
+++ b/res/values-port/dimens.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2009 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<resources>
+    <dimen name="workspace_cell_width">80dip</dimen>
+    <dimen name="workspace_cell_height">100dip</dimen>
+</resources>