Merge "Polishing accessibility tutorial UI."

5 files changed, 54 insertions, 56 deletions

diff --git a/res/layout-sw600dp/accessibility_tutorial_container.xml b/res/layout-sw600dp/accessibility_tutorial_container.xml
index 2895a29..d649354 100644
--- a/res/layout-sw600dp/accessibility_tutorial_container.xml
+++ b/res/layout-sw600dp/accessibility_tutorial_container.xml
@@ -74,6 +74,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical">
+
         <View
             android:layout_marginBottom="16dip"
             style="@style/AccessibilityTutorialDivider" />
@@ -81,25 +82,40 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            android:gravity="right">
-
-            <Button
-                android:id="@+id/back_button"
-                style="@style/AccessibilityTutorialButton"
-                android:text="@string/accessibility_tutorial_back" />
+            android:orientation="horizontal">
 
             <Button
-                android:id="@+id/next_button"
+                android:id="@+id/skip_button"
                 style="@style/AccessibilityTutorialButton"
-                android:text="@string/accessibility_tutorial_next" />
-
-            <Button
-                android:id="@+id/finish_button"
-                style="@style/AccessibilityTutorialButton"
-                android:text="@string/accessibility_tutorial_finish"
+                android:text="@string/accessibility_tutorial_skip"
                 android:visibility="gone" />
 
+            <LinearLayout
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                android:gravity="right">
+
+                <Button
+                    android:id="@+id/back_button"
+                    style="@style/AccessibilityTutorialButton"
+                    android:text="@string/accessibility_tutorial_back"
+                    android:visibility="gone" />
+
+                <Button
+                    android:id="@+id/next_button"
+                    style="@style/AccessibilityTutorialButton"
+                    android:text="@string/accessibility_tutorial_next"
+                    android:visibility="gone" />
+
+                <Button
+                    android:id="@id/finish_button"
+                    style="@style/AccessibilityTutorialButton"
+                    android:text="@string/accessibility_tutorial_finish"
+                    android:visibility="gone" />
+
+            </LinearLayout>
+
         </LinearLayout>
 
     </LinearLayout>
diff --git a/res/layout/accessibility_tutorial_1.xml b/res/layout/accessibility_tutorial_1.xml
index 710e327..b2bb40d 100644
--- a/res/layout/accessibility_tutorial_1.xml
+++ b/res/layout/accessibility_tutorial_1.xml
@@ -19,8 +19,8 @@
     android:id="@+id/all_apps"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
-    android:columnWidth="72dip"
+    android:columnWidth="96dip"
     android:numColumns="auto_fit"
     android:verticalSpacing="10dip"
-    android:horizontalSpacing="10dip"
+    android:horizontalSpacing="20dip"
     android:stretchMode="columnWidth" />
\ No newline at end of file
diff --git a/res/layout/accessibility_tutorial_container.xml b/res/layout/accessibility_tutorial_container.xml
index e949d2a..4ee72f5 100644
--- a/res/layout/accessibility_tutorial_container.xml
+++ b/res/layout/accessibility_tutorial_container.xml
@@ -21,32 +21,6 @@
     android:layout_width="fill_parent">
 
     <LinearLayout
-        android:orientation="vertical"
-        android:layout_height="wrap_content"
-        android:layout_width="wrap_content"
-        android:paddingLeft="15dip"
-        android:paddingRight="15dip">
-
-        <TextView
-            android:id="@+id/title"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textAppearance="@style/AccessibilityTutorialTitle"
-            android:layout_marginTop="11dip" />
-
-        <View
-            android:layout_width="fill_parent"
-            android:layout_height="1dip"
-            android:layout_gravity="center"
-            android:background="@color/divider_color"
-            android:layout_marginTop="14dip"
-            android:layout_marginBottom="13dip"
-            android:focusable="false"
-            android:clickable="false" />
-
-    </LinearLayout>
-
-    <LinearLayout
         android:id="@+id/content"
         android:orientation="vertical"
         android:layout_height="0dip"
@@ -88,28 +62,29 @@
         android:background="@android:drawable/bottom_bar">
 
         <Button
+            android:id="@+id/skip_button"
+            style="@style/AccessibilityTutorialButton"
+            android:layout_alignParentLeft="true"
+            android:text="@string/accessibility_tutorial_skip"
+            android:visibility="gone" />
+
+        <Button
             android:id="@+id/back_button"
-            android:layout_width="150dip"
-            android:layout_height="wrap_content"
-            android:layout_margin="5dip"
+            style="@style/AccessibilityTutorialButton"
             android:layout_alignParentLeft="true"
-            android:drawablePadding="3dip"
-            android:text="@string/accessibility_tutorial_back" />
+            android:text="@string/accessibility_tutorial_back"
+            android:visibility="gone" />
 
         <Button
             android:id="@+id/next_button"
-            android:layout_width="150dip"
-            android:layout_height="wrap_content"
-            android:layout_margin="5dip"
+            style="@style/AccessibilityTutorialButton"
             android:layout_alignParentRight="true"
-            android:drawablePadding="3dip"
-            android:text="@string/accessibility_tutorial_next" />
+            android:text="@string/accessibility_tutorial_next"
+            android:visibility="gone" />
 
         <Button
             android:id="@+id/finish_button"
-            android:layout_width="150dip"
-            android:layout_height="wrap_content"
-            android:layout_margin="5dip"
+            style="@style/AccessibilityTutorialButton"
             android:layout_alignParentRight="true"
             android:text="@string/accessibility_tutorial_finish"
             android:visibility="gone" />
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 84c3eb6..b5cbce3 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -3530,7 +3530,7 @@ found in the list of installed applications.</string>
     <!-- Button label to exit the touch explorationtutorial. [CHAR LIMIT=10] -->
     <string name="accessibility_tutorial_finish">Finish</string>
     <!-- Button label to skip the touch exploration tutorial. [CHAR LIMIT=10] -->
-    <string name="accessibility_tutorial_skip">Skip</string>
+    <string name="accessibility_tutorial_skip">Skip tutorial</string>
 
     <!-- Title for touch exploration tutorial lesson 1. -->
     <string name="accessibility_tutorial_lesson_1_title">Exploring the screen</string>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index d214d48..210a284 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -158,6 +158,13 @@
         <item name="android:layout">@layout/preference_inputmethod</item>
         <item name="android:widgetLayout">@layout/preference_inputmethod_widget</item>
     </style>
+    
+    <stlye name="AcessibilityTutorialButton">
+        <item name="android:layout_width">150dip</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_margin">5dip</item>
+        <item name="android:drawablePadding">3dip</item>
+    </stlye>
 
     <style name="AccessibilityTutorialDivider">
         <item name="android:layout_width">match_parent</item>