Updated tips text per rwest's suggestions.

Also squashed a few bugs:

Bug: 2592676 (tapping widget too soon causes it not
to show any tips at all)

Bug: 2593376 (used some layout magic to get existing tip
text to fit in landscape)

Change-Id: I97785cde481ca6dc115e14f462b18ff169afbc2d

6 files changed, 133 insertions, 65 deletions

diff --git a/res/layout-land/widget.xml b/res/layout-land/widget.xml
new file mode 100644
index 0000000..b447bca
--- /dev/null
+++ b/res/layout-land/widget.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2010 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.
+-->
+
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/widget"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:padding="1dip"
+    >
+
+    <include layout="@layout/droid" />
+    <include layout="@layout/bubble" />
+</RelativeLayout>
diff --git a/res/layout/bubble.xml b/res/layout/bubble.xml
new file mode 100644
index 0000000..8a97f6c
--- /dev/null
+++ b/res/layout/bubble.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2010 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.
+-->
+
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/tip_bubble"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:layout_toLeftOf="@+id/bugdroid"
+    android:layout_centerVertical="true"
+    android:gravity="center_vertical|left"
+    android:layout_marginRight="2dip"
+    android:visibility="invisible"
+    android:background="@drawable/droid_widget"
+    >
+    <TextView
+        android:id="@+id/tip_footer"
+        style="@style/TipText.Footer"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:layout_alignParentRight="true"
+        />
+    <ImageView
+        android:id="@+id/tip_callout"
+        android:layout_width="wrap_content"
+        android:layout_height="fill_parent"
+        android:gravity="center"
+        android:layout_alignParentTop="true"
+        android:layout_alignParentRight="true"
+        android:layout_above="@id/tip_footer"
+        android:visibility="gone"
+        android:padding="4dip"
+        />
+    <TextView
+        android:id="@+id/tip_header"
+        style="@style/TipText.Header"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignParentTop="true"
+        android:layout_toLeftOf="@id/tip_callout"
+        android:layout_alignWithParentIfMissing="true"
+        android:layout_marginTop="0dip"
+        android:layout_marginLeft="2dip"
+        />
+    <TextView
+        android:id="@+id/tip_message"
+        style="@style/TipText.Message"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/tip_header"
+        android:layout_alignLeft="@id/tip_header"
+        android:layout_alignRight="@id/tip_header"
+        android:layout_marginTop="1dip"
+        />
+</RelativeLayout>
+
diff --git a/res/layout/droid.xml b/res/layout/droid.xml
new file mode 100644
index 0000000..68496f2
--- /dev/null
+++ b/res/layout/droid.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2010 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.
+-->
+
+<ImageView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/bugdroid"
+    android:src="@drawable/droidman_down_closed"
+    android:scaleType="center"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_alignParentRight="true"
+    android:layout_centerVertical="true"
+    />
+
diff --git a/res/layout/widget.xml b/res/layout/widget.xml
index 43d8e85..37c2c1b 100644
--- a/res/layout/widget.xml
+++ b/res/layout/widget.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
+<!-- Copyright (C) 2010 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.
@@ -22,64 +22,6 @@
     android:padding="5dip"
     >
 
-    <ImageView
-        android:id="@+id/bugdroid"
-        android:src="@drawable/droidman_down_closed"
-        android:scaleType="center"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentRight="true"
-        android:layout_centerVertical="true"
-        />
-    <RelativeLayout
-        android:id="@+id/tip_bubble"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:layout_toLeftOf="@id/bugdroid"
-        android:layout_centerVertical="true"
-        android:gravity="center_vertical|left"
-        android:layout_marginRight="2dip"
-        android:visibility="invisible"
-        android:background="@drawable/droid_widget"
-        >
-        <ImageView
-            android:id="@+id/tip_callout"
-            android:layout_width="wrap_content"
-            android:layout_height="fill_parent"
-            android:gravity="center"
-            android:layout_alignParentTop="true"
-            android:layout_alignParentRight="true"
-            android:visibility="gone"
-            android:padding="4dip"
-            />
-        <TextView
-            android:id="@+id/tip_header"
-            style="@style/TipText.Header"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:layout_alignParentTop="true"
-            android:layout_toLeftOf="@id/tip_callout"
-            android:layout_alignWithParentIfMissing="true"
-            android:layout_marginTop="0dip"
-            android:layout_marginLeft="2dip"
-            />
-        <TextView
-            android:id="@+id/tip_message"
-            style="@style/TipText.Message"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/tip_header"
-            android:layout_alignLeft="@id/tip_header"
-            android:layout_alignRight="@id/tip_header"
-            android:layout_marginTop="1dip"
-            />
-        <TextView
-            android:id="@+id/tip_footer"
-            style="@style/TipText.Footer"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentBottom="true"
-            android:layout_alignParentRight="true"
-            />
-    </RelativeLayout>
+    <include layout="@layout/droid" />
+    <include layout="@layout/bubble" />
 </RelativeLayout>
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 1d737bb..96a7041 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -4,18 +4,20 @@
         <item>See all your apps.</item>
         <item>Add items to your Home screen.</item>
         <item>Rearrange your Home screen.</item>
-        <item>Multiple Home screens.</item>
         <item>Remove items.</item>
+        <item>Multiple Home screens.</item>
         <item>See notifications.</item>
         <item>Configure your phone.</item>
+        <item>Done with this widget?</item>
     </string-array>
     <string-array name="tips">
-        <item>Touch the Launcher icon at the bottom of the screen. @drawable/all_apps</item>
+        <item>Touch the Launcher icon. @drawable/all_apps</item>
         <item>Touch &amp; hold an empty spot to add shortcuts or widgets.</item>
         <item>Touch &amp; hold an item and when it vibrates, drag it where you want.</item>
-        <item>Swipe left or right to switch. Move items to other screens.</item>
         <item>Touch &amp; hold an item and when it vibrates, drag it to the Trash icon. @drawable/trash</item>
-        <item>Pull the Status bar down from the top of the screen.</item>
+        <item>Swipe left or right to switch. Drag items to other screens.</item>
+        <item>Drag the Status bar down from the top of the screen.</item>
         <item>Press the Menu button and touch Settings.</item>
+        <item>Touch &amp; hold it and when it vibrates, drag it to the Trash icon.</item>
     </string-array>
 </resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index d2a36ce..77ca5bb 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -13,5 +13,7 @@
     </style>
     <style name="TipText.Footer">
         <item name="android:textSize">10sp</item>
+        <item name="android:textStyle">bold</item>
+        <item name="android:textColor">#AAAAAA</item>
     </style>
 </resources>