diff options
author | Chung-yih Wang <cywang@google.com> | 2011-08-26 23:23:53 +0800 |
---|---|---|
committer | Chung-yih Wang <cywang@google.com> | 2011-09-06 12:37:43 +0800 |
commit | a8b55a9628fa7c073d4f9c97c9a198275194f76a (patch) | |
tree | 0e8d8273b71a813833af74c7f4da9043a4839127 /res/values | |
parent | fc404e9a87e2f7e1fa9bc0ede998ed9cf75a047d (diff) | |
download | LegacyCamera-a8b55a9628fa7c073d4f9c97c9a198275194f76a.zip LegacyCamera-a8b55a9628fa7c073d4f9c97c9a198275194f76a.tar.gz LegacyCamera-a8b55a9628fa7c073d4f9c97c9a198275194f76a.tar.bz2 |
Refactor the overflow menu for new UI.
bug:5039364
+Use Switch widget for the 'Store location' preference.
Change-Id: I031cef58ab60d62d04431d7bfe742da672899deb
Diffstat (limited to 'res/values')
-rw-r--r-- | res/values/dimens.xml | 11 | ||||
-rw-r--r-- | res/values/styles.xml | 51 |
2 files changed, 55 insertions, 7 deletions
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> |