summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--res/layout-w1024dp/in_line_setting_picker.xml9
-rw-r--r--res/layout/in_line_setting_picker.xml15
-rw-r--r--res/layout/setting_item.xml2
3 files changed, 14 insertions, 12 deletions
diff --git a/res/layout-w1024dp/in_line_setting_picker.xml b/res/layout-w1024dp/in_line_setting_picker.xml
index f4ba7a4..72432a0 100644
--- a/res/layout-w1024dp/in_line_setting_picker.xml
+++ b/res/layout-w1024dp/in_line_setting_picker.xml
@@ -30,7 +30,7 @@
<Button android:id="@+id/decrement"
android:layout_width="72dp"
- android:layout_height="wrap_content"
+ android:layout_height="match_parent"
android:layout_gravity="center_vertical"
android:gravity="center"
android:text="@string/setting_decrement"
@@ -46,11 +46,11 @@
android:gravity="center"
android:singleLine="true"
android:textColor="@android:color/white"
- android:textSize="20dp" />
+ android:textSize="21dp" />
<Button android:id="@+id/increment"
android:layout_width="72dp"
- android:layout_height="wrap_content"
+ android:layout_height="match_parent"
android:layout_gravity="center_vertical"
android:gravity="center"
android:text="@string/setting_increment"
@@ -62,7 +62,8 @@
<!-- To have the same View(InLineSettingPicker) as the listview's components and also show the restore setting line, we have the relativelayout and control the visibilities of the restore and the setting_item component to achieve the goal. -->
<TextView android:id="@+id/restore"
android:gravity="center"
- android:textSize="22dp"
+ android:textSize="21dp"
+ android:textColor="@android:color/white"
style="@style/SettingRow">
</TextView>
</com.android.camera.ui.InLineSettingPicker>
diff --git a/res/layout/in_line_setting_picker.xml b/res/layout/in_line_setting_picker.xml
index fb29c81..239dd07 100644
--- a/res/layout/in_line_setting_picker.xml
+++ b/res/layout/in_line_setting_picker.xml
@@ -23,7 +23,7 @@
<LinearLayout android:id="@+id/setting_item"
android:orientation="horizontal"
style="@style/SettingRow"
- android:layout_height="32dp"
+ android:layout_height="42dp"
android:paddingRight="0dp">
<TextView android:id="@+id/title"
style="@style/SettingPickerText"
@@ -34,17 +34,17 @@
<Button android:id="@+id/decrement"
android:layout_width="36dp"
- android:layout_height="wrap_content"
+ android:layout_height="match_parent"
android:layout_gravity="center_vertical"
android:gravity="center"
android:text="@string/setting_decrement"
android:textColor="@drawable/btn_setting_picker"
- android:textSize="16dp"
+ android:textSize="20dp"
android:textStyle="bold"
android:background="@android:color/transparent" />
<TextView android:id="@+id/current_setting"
- android:layout_width="65dp"
+ android:layout_width="81dp"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:gravity="center"
@@ -54,12 +54,12 @@
<Button android:id="@+id/increment"
android:layout_width="36dp"
- android:layout_height="wrap_content"
+ android:layout_height="match_parent"
android:layout_gravity="center_vertical"
android:gravity="center"
android:text="@string/setting_increment"
android:textColor="@drawable/btn_setting_picker"
- android:textSize="16dp"
+ android:textSize="20dp"
android:textStyle="bold"
android:background="@android:color/transparent" />
</LinearLayout>
@@ -68,6 +68,7 @@
android:gravity="center"
android:textSize="16dp"
style="@style/SettingRow"
- android:layout_height="32dp">
+ android:textColor="@android:color/white"
+ android:layout_height="42dp">
</TextView>
</com.android.camera.ui.InLineSettingPicker>
diff --git a/res/layout/setting_item.xml b/res/layout/setting_item.xml
index d14c96e..43d8595 100644
--- a/res/layout/setting_item.xml
+++ b/res/layout/setting_item.xml
@@ -18,7 +18,7 @@
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
style="@style/SettingRow"
- android:layout_height="32dp">
+ android:layout_height="42dp">
<TextView android:id="@+id/text"
style="@style/SettingPickerText"