summaryrefslogtreecommitdiffstats
path: root/res/layout-land
diff options
context:
space:
mode:
authorSascha Haeberling <haeberling@google.com>2014-05-16 15:49:53 -0700
committerSascha Haeberling <haeberling@google.com>2014-05-16 15:49:53 -0700
commitb8b26f32295d4b4e3405c219c9211f5954ece1e5 (patch)
tree97470a0813ea6eb0b1333db27a23cc10ff47b646 /res/layout-land
parentf27f634824dcbd483a724ee05fb5d5f2bb7df01e (diff)
downloadandroid_packages_apps_Camera2-b8b26f32295d4b4e3405c219c9211f5954ece1e5.tar.gz
android_packages_apps_Camera2-b8b26f32295d4b4e3405c219c9211f5954ece1e5.tar.bz2
android_packages_apps_Camera2-b8b26f32295d4b4e3405c219c9211f5954ece1e5.zip
Unify the blue button styles across the app.
Bug: 14901436 Change-Id: I9603806a47c41896e25d2e5509a898758e82aebd
Diffstat (limited to 'res/layout-land')
-rw-r--r--res/layout-land/aspect_ratio_dialog_content.xml11
-rw-r--r--res/layout-land/location_dialog_content.xml7
2 files changed, 6 insertions, 12 deletions
diff --git a/res/layout-land/aspect_ratio_dialog_content.xml b/res/layout-land/aspect_ratio_dialog_content.xml
index 677b69d1f..69e678162 100644
--- a/res/layout-land/aspect_ratio_dialog_content.xml
+++ b/res/layout-land/aspect_ratio_dialog_content.xml
@@ -24,7 +24,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_weight="1">
- <include layout="@layout/aspect_ratio_selector"/>
+ <include layout="@layout/aspect_ratio_selector" />
</FrameLayout>
<LinearLayout
android:layout_width="0dp"
@@ -49,13 +49,10 @@
android:textSize="20sp"
android:textColor="@color/dialog_text_color"
android:gravity="center_horizontal"
- android:text="@string/photo_aspect_ratio_selection_content"/>
+ android:text="@string/photo_aspect_ratio_selection_content" />
<Button
android:id="@+id/confirm_button"
- android:layout_width="144dp"
- android:layout_height="48dp"
- android:background="@color/dialog_button_color"
- android:text="@string/confirm_button_text"
- android:textColor="@android:color/white"/>
+ style="@style/BlueButton"
+ android:text="@string/confirm_button_text" />
</LinearLayout>
</LinearLayout> \ No newline at end of file
diff --git a/res/layout-land/location_dialog_content.xml b/res/layout-land/location_dialog_content.xml
index ef4eb2e66..16acd421f 100644
--- a/res/layout-land/location_dialog_content.xml
+++ b/res/layout-land/location_dialog_content.xml
@@ -61,12 +61,9 @@
android:textSize="16sp" />
<Button
android:id="@+id/confirm_button"
- android:layout_width="144dp"
- android:layout_height="48dp"
+ style="@style/BlueButton"
android:layout_gravity="bottom|center_horizontal"
- android:background="@color/dialog_button_color"
- android:text="@string/startup_dialog_button_next"
- android:textColor="@android:color/white" />
+ android:text="@string/startup_dialog_button_next" />
</FrameLayout>
</FrameLayout>