summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
Diffstat (limited to 'res')
-rw-r--r--res/layout-w1024dp/basic_setting_popup.xml53
-rw-r--r--res/layout-w1024dp/in_line_setting_picker.xml69
-rw-r--r--res/layout-w1024dp/other_setting_popup.xml56
-rw-r--r--res/layout-w1024dp/setting_item.xml31
-rw-r--r--res/layout/basic_setting_popup.xml25
-rw-r--r--res/layout/in_line_setting_knob.xml34
-rw-r--r--res/layout/in_line_setting_picker.xml74
-rw-r--r--res/layout/in_line_setting_restore.xml23
-rw-r--r--res/layout/in_line_setting_switch.xml32
-rw-r--r--res/layout/other_setting_popup.xml20
-rw-r--r--res/layout/setting_item.xml13
-rw-r--r--res/values-w1024dp/dimens.xml10
-rw-r--r--res/values-w1024dp/styles.xml7
-rw-r--r--res/values-w1280dp/dimens.xml10
-rw-r--r--res/values/dimens.xml11
-rw-r--r--res/values/styles.xml51
16 files changed, 186 insertions, 333 deletions
diff --git a/res/layout-w1024dp/basic_setting_popup.xml b/res/layout-w1024dp/basic_setting_popup.xml
deleted file mode 100644
index 8eb64e3..0000000
--- a/res/layout-w1024dp/basic_setting_popup.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-**
-** Copyright 2010, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-** http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<com.android.camera.ui.BasicSettingPopup xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_alignParentRight="true"
- android:layout_centerVertical="true"
- android:visibility="gone">
-
- <LinearLayout android:orientation="vertical"
- android:layout_width="410dp"
- android:layout_height="wrap_content">
-
- <FrameLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:background="@drawable/dialog_top_holo_dark"
- android:minHeight="48dp">
- <TextView android:id="@+id/title"
- style="@style/SettingTitleText" />
- </FrameLayout>
- <FrameLayout android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:background="@drawable/dialog_bottom_holo_dark">
- <ListView android:id="@+id/settingList"
- android:orientation="vertical"
- android:layout_marginLeft="16dp"
- android:layout_marginRight="16dp"
- android:paddingBottom="3dp"
- android:layout_gravity="center"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:choiceMode="singleChoice" />
- </FrameLayout>
- </LinearLayout>
-</com.android.camera.ui.BasicSettingPopup>
diff --git a/res/layout-w1024dp/in_line_setting_picker.xml b/res/layout-w1024dp/in_line_setting_picker.xml
deleted file mode 100644
index 72432a0..0000000
--- a/res/layout-w1024dp/in_line_setting_picker.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-**
-** Copyright 2010, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-** http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<com.android.camera.ui.InLineSettingPicker xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content">
- <LinearLayout android:id="@+id/setting_item"
- android:orientation="horizontal"
- style="@style/SettingRow">
- <TextView android:id="@+id/title"
- style="@style/SettingPickerText"
- android:layout_width="220dp"
- android:layout_height="match_parent" />
-
- <Button android:id="@+id/decrement"
- android:layout_width="72dp"
- 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="20dp"
- android:textStyle="bold"
- android:background="@android:color/transparent" />
-
- <TextView android:id="@+id/current_setting"
- android:layout_width="130dp"
- android:layout_height="wrap_content"
- android:layout_gravity="center_vertical"
- android:gravity="center"
- android:singleLine="true"
- android:textColor="@android:color/white"
- android:textSize="21dp" />
-
- <Button android:id="@+id/increment"
- android:layout_width="72dp"
- 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="20dp"
- android:textStyle="bold"
- android:background="@android:color/transparent" />
- </LinearLayout>
- <!-- 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="21dp"
- android:textColor="@android:color/white"
- style="@style/SettingRow">
- </TextView>
-</com.android.camera.ui.InLineSettingPicker>
diff --git a/res/layout-w1024dp/other_setting_popup.xml b/res/layout-w1024dp/other_setting_popup.xml
deleted file mode 100644
index 4db8689..0000000
--- a/res/layout-w1024dp/other_setting_popup.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-**
-** Copyright 2010, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-** http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<com.android.camera.ui.OtherSettingsPopup xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:camera="http://schemas.android.com/apk/res/com.android.camera"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_alignParentRight="true"
- android:layout_centerVertical="true"
- android:visibility="gone">
-
- <LinearLayout android:orientation="vertical"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content">
-
- <FrameLayout
- android:layout_width="590dp"
- android:layout_height="wrap_content"
- android:background="@drawable/dialog_top_holo_dark"
- android:minHeight="48dp">
- <TextView android:id="@+id/title"
- android:text="@string/pref_camera_settings_category"
- style="@style/SettingTitleText" />
- </FrameLayout>
-
- <FrameLayout
- android:layout_width="590dp"
- android:layout_height="wrap_content"
- android:background="@drawable/dialog_bottom_holo_dark">
- <ListView android:id="@+id/settingList"
- android:orientation="vertical"
- android:layout_marginLeft="16dp"
- android:layout_marginRight="16dp"
- android:paddingBottom="3dp"
- android:layout_gravity="center"
- android:layout_width="match_parent"
- android:layout_height="wrap_content" />
- </FrameLayout>
- </LinearLayout>
-</com.android.camera.ui.OtherSettingsPopup>
diff --git a/res/layout-w1024dp/setting_item.xml b/res/layout-w1024dp/setting_item.xml
deleted file mode 100644
index 43e6271..0000000
--- a/res/layout-w1024dp/setting_item.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-**
-** Copyright 2010, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-** http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- style="@style/SettingRow">
-
- <TextView android:id="@+id/text"
- style="@style/SettingPickerText"
- android:layout_width="267dp"
- android:layout_height="match_parent"/>
- <ImageView android:id="@+id/image"
- android:layout_width="35dp"
- android:layout_height="35dp"
- android:scaleType="fitCenter"
- android:adjustViewBounds="true" />
-</LinearLayout>
diff --git a/res/layout/basic_setting_popup.xml b/res/layout/basic_setting_popup.xml
index 9f579de..c51ff31 100644
--- a/res/layout/basic_setting_popup.xml
+++ b/res/layout/basic_setting_popup.xml
@@ -17,37 +17,26 @@
*/
-->
<com.android.camera.ui.BasicSettingPopup xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:camera="http://schemas.android.com/apk/res/com.android.camera"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_centerVertical="true"
- android:layout_toLeftOf="@+id/indicator_control"
- android:visibility="gone">
+ style="@style/SettingPopupWindow">
<LinearLayout android:orientation="vertical"
android:layout_height="wrap_content"
- android:layout_width="240dp">
+ android:layout_width="@dimen/setting_popup_window_width">
<FrameLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:background="@drawable/dialog_top_holo_dark">
+ android:background="@drawable/dialog_top_holo_dark"
+ android:minHeight="@dimen/popup_title_frame_min_height">
<TextView android:id="@+id/title"
- style="@style/SettingTitleText"
- android:textSize="18dp"
- android:layout_height="32dp" />
+ style="@style/PopupTitleText" />
</FrameLayout>
+
<FrameLayout android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/dialog_bottom_holo_dark">
<ListView android:id="@+id/settingList"
- android:orientation="vertical"
- android:layout_marginLeft="6dp"
- android:layout_marginRight="6dp"
- android:paddingBottom="3dp"
- android:layout_gravity="center"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
+ style="@style/SettingItemList"
android:choiceMode="singleChoice" />
</FrameLayout>
</LinearLayout>
diff --git a/res/layout/in_line_setting_knob.xml b/res/layout/in_line_setting_knob.xml
new file mode 100644
index 0000000..b3bfc48
--- /dev/null
+++ b/res/layout/in_line_setting_knob.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<com.android.camera.ui.InLineSettingKnob xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/setting_item"
+ style="@style/SettingRow">
+ <TextView android:id="@+id/title"
+ style="@style/SettingItemTitle" />
+
+ <Button android:id="@+id/decrement"
+ style="@style/SettingKnob"
+ android:text="@string/setting_decrement" />
+
+ <TextView android:id="@+id/current_setting"
+ style="@style/SettingItemText" />
+
+ <Button android:id="@+id/increment"
+ style="@style/SettingKnob"
+ android:text="@string/setting_increment" />
+</com.android.camera.ui.InLineSettingKnob>
+
diff --git a/res/layout/in_line_setting_picker.xml b/res/layout/in_line_setting_picker.xml
deleted file mode 100644
index 239dd07..0000000
--- a/res/layout/in_line_setting_picker.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-**
-** Copyright 2011, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-** http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<com.android.camera.ui.InLineSettingPicker xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content">
- <LinearLayout android:id="@+id/setting_item"
- android:orientation="horizontal"
- style="@style/SettingRow"
- android:layout_height="42dp"
- android:paddingRight="0dp">
- <TextView android:id="@+id/title"
- style="@style/SettingPickerText"
- android:textSize="16dp"
- android:layout_weight="1"
- android:layout_width="match_parent"
- android:layout_height="match_parent" />
-
- <Button android:id="@+id/decrement"
- android:layout_width="36dp"
- 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="20dp"
- android:textStyle="bold"
- android:background="@android:color/transparent" />
-
- <TextView android:id="@+id/current_setting"
- android:layout_width="81dp"
- android:layout_height="wrap_content"
- android:layout_gravity="center_vertical"
- android:gravity="center"
- android:singleLine="true"
- android:textColor="@android:color/white"
- android:textSize="16dp" />
-
- <Button android:id="@+id/increment"
- android:layout_width="36dp"
- 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="20dp"
- android:textStyle="bold"
- android:background="@android:color/transparent" />
- </LinearLayout>
- <!-- 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="16dp"
- style="@style/SettingRow"
- android:textColor="@android:color/white"
- android:layout_height="42dp">
- </TextView>
-</com.android.camera.ui.InLineSettingPicker>
diff --git a/res/layout/in_line_setting_restore.xml b/res/layout/in_line_setting_restore.xml
new file mode 100644
index 0000000..37ebb15
--- /dev/null
+++ b/res/layout/in_line_setting_restore.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<com.android.camera.ui.InLineSettingRestore xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/setting_item"
+ style="@style/SettingRow">
+ <TextView android:id="@+id/title"
+ style="@style/SettingItemText"
+ android:layout_width="match_parent" />
+</com.android.camera.ui.InLineSettingRestore>
diff --git a/res/layout/in_line_setting_switch.xml b/res/layout/in_line_setting_switch.xml
new file mode 100644
index 0000000..c884ece
--- /dev/null
+++ b/res/layout/in_line_setting_switch.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<com.android.camera.ui.InLineSettingSwitch xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/setting_item"
+ style="@style/SettingRow">
+ <TextView android:id="@+id/title"
+ style="@style/SettingItemTitle" />
+
+ <!-- The Switch widget always aligns to the right, so we have to wrap it in a frame layout. -->
+ <FrameLayout android:layout_weight="1"
+ android:layout_width="fill_parent"
+ android:layout_height="match_parent">
+ <Switch android:id="@+id/setting_switch"
+ android:layout_gravity="center"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent" />
+ </FrameLayout>
+</com.android.camera.ui.InLineSettingSwitch>
diff --git a/res/layout/other_setting_popup.xml b/res/layout/other_setting_popup.xml
index 263c938..730e00a 100644
--- a/res/layout/other_setting_popup.xml
+++ b/res/layout/other_setting_popup.xml
@@ -19,14 +19,10 @@
<com.android.camera.ui.OtherSettingsPopup xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:camera="http://schemas.android.com/apk/res/com.android.camera"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_centerVertical="true"
- android:layout_toLeftOf="@+id/indicator_control"
- android:visibility="gone">
+ style="@style/SettingPopupWindow">
<LinearLayout android:orientation="vertical"
- android:layout_width="320dp"
+ android:layout_width="@dimen/other_setting_popup_window_width"
android:layout_height="wrap_content">
<FrameLayout
@@ -35,9 +31,7 @@
android:background="@drawable/dialog_top_holo_dark">
<TextView android:id="@+id/title"
android:text="@string/pref_camera_settings_category"
- style="@style/SettingTitleText"
- android:textSize="18dp"
- android:layout_height="32dp"/>
+ style="@style/PopupTitleText" />
</FrameLayout>
<FrameLayout
@@ -45,13 +39,7 @@
android:layout_height="wrap_content"
android:background="@drawable/dialog_bottom_holo_dark">
<ListView android:id="@+id/settingList"
- android:orientation="vertical"
- android:layout_marginLeft="6dp"
- android:layout_marginRight="6dp"
- android:paddingBottom="3dp"
- android:layout_gravity="center"
- android:layout_width="match_parent"
- android:layout_height="wrap_content" />
+ style="@style/SettingItemList" />
</FrameLayout>
</LinearLayout>
</com.android.camera.ui.OtherSettingsPopup>
diff --git a/res/layout/setting_item.xml b/res/layout/setting_item.xml
index 43d8595..5bcf3f7 100644
--- a/res/layout/setting_item.xml
+++ b/res/layout/setting_item.xml
@@ -17,18 +17,13 @@
*/
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- style="@style/SettingRow"
- android:layout_height="42dp">
+ style="@style/SettingRow">
<TextView android:id="@+id/text"
- style="@style/SettingPickerText"
- android:textSize="18dp"
- android:layout_width="150dp"
- android:paddingRight="10dp"
- android:layout_height="match_parent"/>
+ style="@style/SettingItemTitle" />
<ImageView android:id="@+id/image"
- android:layout_width="20dp"
- android:layout_height="20dp"
+ android:layout_width="@dimen/setting_item_icon_width"
+ android:layout_height="@dimen/setting_item_icon_width"
android:scaleType="fitCenter"
android:adjustViewBounds="true" />
</LinearLayout>
diff --git a/res/values-w1024dp/dimens.xml b/res/values-w1024dp/dimens.xml
index 96344bc..9eaed76 100644
--- a/res/values-w1024dp/dimens.xml
+++ b/res/values-w1024dp/dimens.xml
@@ -38,4 +38,14 @@
<dimen name="pano_capture_too_fast_text_height">160dp</dimen>
<dimen name="pano_indication_width">300dp</dimen>
<dimen name="pano_indication_height">150dp</dimen>
+ <dimen name="setting_row_height">48dp</dimen>
+ <dimen name="setting_item_text_size">21dp</dimen>
+ <dimen name="setting_knob_width">72dp</dimen>
+ <dimen name="setting_item_text_width">130dp</dimen>
+ <dimen name="setting_popup_window_width">410dp</dimen>
+ <dimen name="setting_item_list_margin">16dp</dimen>
+ <dimen name="popup_title_text_size">22dp</dimen>
+ <dimen name="popup_title_frame_min_height">48dp</dimen>
+ <dimen name="other_setting_popup_window_width">590dp</dimen>
+ <dimen name="setting_item_icon_width">35dp</dimen>
</resources>
diff --git a/res/values-w1024dp/styles.xml b/res/values-w1024dp/styles.xml
index 57188f2..00016b5 100644
--- a/res/values-w1024dp/styles.xml
+++ b/res/values-w1024dp/styles.xml
@@ -38,4 +38,11 @@
<item name="android:layout_marginTop">8dp</item>
<item name="android:layout_marginRight">28dp</item>
</style>
+ <style name="SettingPopupWindow">
+ <item name="android:layout_width">wrap_content</item>
+ <item name="android:layout_height">wrap_content</item>
+ <item name="android:layout_centerVertical">true</item>
+ <item name="android:layout_alignParentRight">true</item>
+ <item name="android:visibility">gone</item>
+ </style>
</resources>
diff --git a/res/values-w1280dp/dimens.xml b/res/values-w1280dp/dimens.xml
index e5b8894..a707720 100644
--- a/res/values-w1280dp/dimens.xml
+++ b/res/values-w1280dp/dimens.xml
@@ -25,4 +25,14 @@
<dimen name="mode_switcher_inner_padding">15dp</dimen>
<dimen name="camera_switcher_margin_right">30dp</dimen>
<dimen name="camera_switcher_margin_bottom">56dp</dimen>
+ <dimen name="setting_row_height">48dp</dimen>
+ <dimen name="setting_item_text_size">21dp</dimen>
+ <dimen name="setting_knob_width">72dp</dimen>
+ <dimen name="setting_item_text_width">130dp</dimen>
+ <dimen name="setting_popup_window_width">410dp</dimen>
+ <dimen name="setting_item_list_margin">16dp</dimen>
+ <dimen name="popup_title_text_size">22dp</dimen>
+ <dimen name="popup_title_frame_min_height">48dp</dimen>
+ <dimen name="other_setting_popup_window_width">590dp</dimen>
+ <dimen name="setting_item_icon_width">35dp</dimen>
</resources>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index cda755f..2504eb4 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -34,4 +34,15 @@
<dimen name="pano_capture_too_fast_text_height">70dp</dimen>
<dimen name="pano_indication_width">150dp</dimen>
<dimen name="pano_indication_height">75dp</dimen>
+ <dimen name="setting_row_height">42dp</dimen>
+ <dimen name="setting_item_text_size">16dp</dimen>
+ <dimen name="setting_knob_width">36dp</dimen>
+ <dimen name="setting_knob_text_size">20dp</dimen>
+ <dimen name="setting_item_text_width">81dp</dimen>
+ <dimen name="setting_popup_window_width">240dp</dimen>
+ <dimen name="setting_item_list_margin">6dp</dimen>
+ <dimen name="popup_title_text_size">18dp</dimen>
+ <dimen name="popup_title_frame_min_height">32dp</dimen>
+ <dimen name="other_setting_popup_window_width">320dp</dimen>
+ <dimen name="setting_item_icon_width">20dp</dimen>
</resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 5fe9581..4c97422 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -62,32 +62,69 @@
<item name="android:textSize">16dp</item>
<item name="android:textStyle">bold</item>
</style>
- <style name="SettingTitleText">
- <item name="android:textSize">22dp</item>
- <item name="android:layout_gravity">left</item>
+ <style name="SettingPopupWindow">
+ <item name="android:layout_width">wrap_content</item>
+ <item name="android:layout_height">wrap_content</item>
+ <item name="android:layout_centerVertical">true</item>
+ <item name="android:layout_toLeftOf">@+id/indicator_control</item>
+ <item name="android:visibility">gone</item>
+ </style>
+ <style name="PopupTitleText">
+ <item name="android:textSize">@dimen/popup_title_text_size</item>
+ <item name="android:layout_gravity">left|center_vertical</item>
<item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:singleLine">true</item>
<item name="android:textColor">@android:color/white</item>
- <item name="android:layout_centerVertical">true</item>
<item name="android:layout_marginLeft">10dp</item>
<item name="android:paddingLeft">16dp</item>
</style>
- <style name="SettingPickerText">
- <item name="android:textSize">21dp</item>
+ <style name="SettingItemList">
+ <item name="android:orientation">vertical</item>
+ <item name="android:layout_marginLeft">@dimen/setting_item_list_margin</item>
+ <item name="android:layout_marginRight">@dimen/setting_item_list_margin</item>
+ <item name="android:paddingBottom">3dp</item>
+ <item name="android:layout_gravity">center</item>
+ <item name="android:layout_width">match_parent</item>
+ <item name="android:layout_height">wrap_content</item>
+ </style>
+ <style name="SettingItemTitle">
+ <item name="android:textSize">@dimen/setting_item_text_size</item>
<item name="android:gravity">left|center_vertical</item>
<item name="android:textColor">@android:color/white</item>
<item name="android:singleLine">true</item>
+ <item name="android:layout_weight">1</item>
+ <item name="android:layout_width">fill_parent</item>
+ <item name="android:layout_height">match_parent</item>
+ </style>
+ <style name="SettingItemText">
+ <item name="android:layout_width">@dimen/setting_item_text_width</item>
+ <item name="android:layout_height">wrap_content</item>
+ <item name="android:layout_gravity">center_vertical</item>
+ <item name="android:gravity">center</item>
+ <item name="android:singleLine">true</item>
+ <item name="android:textColor">@android:color/white</item>
+ <item name="android:textSize">@dimen/setting_item_text_size</item>
</style>
<style name="SettingRow">
<item name="android:gravity">center_vertical</item>
<item name="android:orientation">horizontal</item>
<item name="android:layout_width">match_parent</item>
- <item name="android:layout_height">48dp</item>
+ <item name="android:layout_height">@dimen/setting_row_height</item>
<item name="android:paddingLeft">8dp</item>
<item name="android:paddingRight">8dp</item>
<item name="android:background">@drawable/setting_picker</item>
</style>
+ <style name="SettingKnob">
+ <item name="android:layout_width">@dimen/setting_knob_width</item>
+ <item name="android:layout_height">match_parent</item>
+ <item name="android:layout_gravity">center_vertical</item>
+ <item name="android:gravity">center</item>
+ <item name="android:textColor">@drawable/btn_setting_picker</item>
+ <item name="android:textSize">@dimen/setting_knob_text_size</item>
+ <item name="android:textStyle">bold</item>
+ <item name="android:background">@android:color/transparent</item>
+ </style>
<style name="OnScreenIndicator">
<item name="android:layout_height">28dp</item>
<item name="android:layout_width">wrap_content</item>
generated by cgit v1.1 at 2024-12-25 07:16:16 +0000