summaryrefslogtreecommitdiffstats
path: root/res/values
diff options
context:
space:
mode:
authorAngus Kong <shkong@google.com>2011-09-21 23:38:18 +0800
committerAngus Kong <shkong@google.com>2011-09-22 15:49:17 +0800
commite1971b620b91ca49cd77d9f4f64eac570344304d (patch)
tree4e45801c012edbb62780698e3a518b74f372a150 /res/values
parentc9b05bf45bdefe34c2d5591fef3224dd2049461c (diff)
downloadLegacyCamera-e1971b620b91ca49cd77d9f4f64eac570344304d.zip
LegacyCamera-e1971b620b91ca49cd77d9f4f64eac570344304d.tar.gz
LegacyCamera-e1971b620b91ca49cd77d9f4f64eac570344304d.tar.bz2
Change dialog style to fit ICS theme.
1. The height of title is adjusted. 2. The height of each row is adjusted. 3. The background is not transparent anymore. 4. Font size is adjusted. 5. Leave some space between the setting popup and the indicator bar. bug:5039235 Change-Id: I22d49ea04db15b3e2a095a5e360a76ab15e1a5fc
Diffstat (limited to 'res/values')
-rw-r--r--res/values/colors.xml2
-rw-r--r--res/values/dimens.xml11
-rw-r--r--res/values/styles.xml12
3 files changed, 18 insertions, 7 deletions
diff --git a/res/values/colors.xml b/res/values/colors.xml
index e5e08c2..517efa2 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -28,6 +28,8 @@
<color name="share_popup_background">#B0000000</color>
<color name="share_icon_background">#40000000</color>
<color name="indicator_background">#40000000</color>
+ <color name="popup_title_color">#ff33b5e5</color>
+ <color name="popup_background">#ff282828</color>
<color name="pano_custom_dialog_background">#FF666666</color>
<color name="pano_progress_empty">#FF2E2E2E</color>
<color name="pano_progress_done">#FF33525E</color>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index fe1f2d7..74842b2 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -31,15 +31,16 @@
<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_popup_right_margin">5dp</dimen>
+ <dimen name="setting_row_height">50dp</dimen>
+ <dimen name="setting_item_text_size">18sp</dimen>
+ <dimen name="setting_knob_width">20dp</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="popup_title_text_size">22dp</dimen>
+ <dimen name="popup_title_frame_min_height">60dp</dimen>
<dimen name="big_setting_popup_window_width">320dp</dimen>
<dimen name="setting_item_icon_width">28dp</dimen>
<dimen name="effect_setting_item_icon_width">40dp</dimen>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 91426c8..7a5db3f 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -69,6 +69,7 @@
<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:layout_marginRight">@dimen/setting_popup_right_margin</item>
<item name="android:visibility">gone</item>
</style>
<style name="PopupTitleText">
@@ -77,10 +78,17 @@
<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:textColor">@color/popup_title_color</item>
<item name="android:layout_marginLeft">10dp</item>
<item name="android:paddingLeft">16dp</item>
</style>
+ <style name="PopupTitleSeperator">
+ <item name="android:layout_width">match_parent</item>
+ <item name="android:layout_height">2dp</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:background">@color/popup_title_color</item>
+ </style>
<style name="SettingItemList">
<item name="android:orientation">vertical</item>
<item name="android:layout_marginLeft">@dimen/setting_item_list_margin</item>
@@ -96,7 +104,7 @@
<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_width">0dp</item>
<item name="android:layout_height">match_parent</item>
</style>
<style name="SettingItemText">