Cleanup buttons after recording text. Bug 5140011
Change-Id: I6dcbd299d66af5e66aea0cab98f45b5892628e10
diff --git a/res/layout-land/main.xml b/res/layout-land/main.xml
index a23c817..e76aa2a 100644
--- a/res/layout-land/main.xml
+++ b/res/layout-land/main.xml
@@ -101,15 +101,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerInParent="true" >
-
- <Button android:id="@+id/acceptButton"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:text="@string/accept"
- android:layout_weight="1"
- android:layout_marginRight="2dip"
- android:layout_marginLeft="50dip" />
-
+
<Button android:id="@+id/discardButton"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -117,7 +109,14 @@
android:layout_weight="1"
android:layout_marginLeft="2dip"
android:layout_marginRight="50dip" />
-
+
+ <Button android:id="@+id/acceptButton"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:text="@string/accept"
+ android:layout_weight="1"
+ android:layout_marginRight="2dip"
+ android:layout_marginLeft="50dip" />
</LinearLayout>
<RelativeLayout
diff --git a/res/layout-port/main.xml b/res/layout-port/main.xml
index 8856dba..8b41ba3 100644
--- a/res/layout-port/main.xml
+++ b/res/layout-port/main.xml
@@ -98,15 +98,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerInParent="true" >
-
- <Button android:id="@+id/acceptButton"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:text="@string/accept"
- android:layout_weight="1"
- android:layout_marginLeft="15dip"
- android:layout_marginRight="2dip" />
-
+
<Button android:id="@+id/discardButton"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -114,7 +106,14 @@
android:layout_weight="1"
android:layout_marginLeft="2dip"
android:layout_marginRight="15dip" />
-
+
+ <Button android:id="@+id/acceptButton"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:text="@string/accept"
+ android:layout_weight="1"
+ android:layout_marginLeft="15dip"
+ android:layout_marginRight="2dip" />
</LinearLayout>
<RelativeLayout
diff --git a/res/layout-xlarge/main.xml b/res/layout-xlarge/main.xml
index 89221c1..48cae46 100644
--- a/res/layout-xlarge/main.xml
+++ b/res/layout-xlarge/main.xml
@@ -99,14 +99,6 @@
android:layout_height="wrap_content"
android:layout_centerInParent="true" >
- <Button android:id="@+id/acceptButton"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:text="@string/accept"
- android:layout_weight="1"
- android:layout_marginLeft="15dip"
- android:layout_marginRight="2dip" />
-
<Button android:id="@+id/discardButton"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -115,6 +107,13 @@
android:layout_marginLeft="2dip"
android:layout_marginRight="15dip" />
+ <Button android:id="@+id/acceptButton"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:text="@string/accept"
+ android:layout_weight="1"
+ android:layout_marginLeft="15dip"
+ android:layout_marginRight="2dip" />
</LinearLayout>
<RelativeLayout
diff --git a/res/values/strings.xml b/res/values/strings.xml
index b91e865..0a50700 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -42,7 +42,7 @@
<string name="sec_available"><xliff:g id="seconds">%d</xliff:g>s available</string>
<!-- button to accept the current recording and return it to the caller -->
- <string name="accept">Use this recording</string>
+ <string name="accept">Done</string>
<!-- button to discard the current recording and return to the caller -->
<string name="discard">Discard</string>
<!-- acknowlegement button in a number of dialogs -->
