diff options
author | Sascha Haeberling <haeberling@google.com> | 2014-05-16 15:49:53 -0700 |
---|---|---|
committer | Sascha Haeberling <haeberling@google.com> | 2014-05-16 15:49:53 -0700 |
commit | b8b26f32295d4b4e3405c219c9211f5954ece1e5 (patch) | |
tree | 97470a0813ea6eb0b1333db27a23cc10ff47b646 /res/layout-port | |
parent | f27f634824dcbd483a724ee05fb5d5f2bb7df01e (diff) | |
download | android_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-port')
-rw-r--r-- | res/layout-port/aspect_ratio_dialog_content.xml | 11 | ||||
-rw-r--r-- | res/layout-port/location_dialog_content.xml | 5 |
2 files changed, 5 insertions, 11 deletions
diff --git a/res/layout-port/aspect_ratio_dialog_content.xml b/res/layout-port/aspect_ratio_dialog_content.xml index c6dc04c90..54081438e 100644 --- a/res/layout-port/aspect_ratio_dialog_content.xml +++ b/res/layout-port/aspect_ratio_dialog_content.xml @@ -28,7 +28,7 @@ android:textColor="@color/dialog_text_color" android:layout_marginTop="28dp" android:layout_marginBottom="56dp" /> - <include layout="@layout/aspect_ratio_selector"/> + <include layout="@layout/aspect_ratio_selector" /> <TextView android:layout_width="match_parent" android:layout_height="0dp" @@ -39,14 +39,11 @@ android:layout_marginRight="28dp" 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" + style="@style/BlueButton" android:layout_marginTop="28dp" android:layout_marginBottom="28dp" - android:background="@color/dialog_button_color" - android:text="@string/confirm_button_text" - android:textColor="@android:color/white"/> + android:text="@string/confirm_button_text" /> </LinearLayout>
\ No newline at end of file diff --git a/res/layout-port/location_dialog_content.xml b/res/layout-port/location_dialog_content.xml index cb1533eb3..6ca50d8a2 100644 --- a/res/layout-port/location_dialog_content.xml +++ b/res/layout-port/location_dialog_content.xml @@ -51,11 +51,8 @@ <Button android:id="@+id/confirm_button" - android:layout_width="144dp" - android:layout_height="48dp" + style="@style/BlueButton" android:text="@string/startup_dialog_button_next" - android:textColor="@android:color/white" - android:background="@color/dialog_button_color" android:layout_marginBottom="28dp" android:layout_marginTop="28dp"/> </LinearLayout>
\ No newline at end of file |