diff options
| author | Chung-yih Wang <cywang@google.com> | 2011-10-07 03:10:38 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-10-07 03:10:38 -0700 |
| commit | e33371f49766f8bea258426b2a6023e86efb33a4 (patch) | |
| tree | 194303b74a21d9e45dff4f08574d3a1b16905682 | |
| parent | 3e5f954de2bcb7df695b069b18c8b6083accb19d (diff) | |
| parent | 131f4afb3726dd552e5172116ff1ce454ecaf460 (diff) | |
| download | LegacyCamera-e33371f49766f8bea258426b2a6023e86efb33a4.zip LegacyCamera-e33371f49766f8bea258426b2a6023e86efb33a4.tar.gz LegacyCamera-e33371f49766f8bea258426b2a6023e86efb33a4.tar.bz2 | |
Merge "Fix the margin and padding of the setting popup."
| -rw-r--r-- | res/layout/mode_picker.xml | 3 | ||||
| -rw-r--r-- | res/values-w1024dp/dimens.xml | 2 | ||||
| -rw-r--r-- | res/values-w1280dp/dimens.xml | 2 | ||||
| -rw-r--r-- | res/values/dimens.xml | 2 | ||||
| -rw-r--r-- | res/values/styles.xml | 6 |
5 files changed, 8 insertions, 7 deletions
diff --git a/res/layout/mode_picker.xml b/res/layout/mode_picker.xml index 59edb6f..5cbc882 100644 --- a/res/layout/mode_picker.xml +++ b/res/layout/mode_picker.xml @@ -76,17 +76,20 @@ android:layout_height="wrap_content" android:layout_marginBottom="10dp" android:scaleType="center" + android:background="@drawable/bg_pressed" android:src="@drawable/ic_switch_camera_holo_light" /> <com.android.camera.ui.RotateImageView android:id="@+id/mode_video" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="10dp" android:scaleType="center" + android:background="@drawable/bg_pressed" android:src="@drawable/ic_switch_video_holo_light" /> <com.android.camera.ui.RotateImageView android:id="@+id/mode_panorama" android:layout_width="match_parent" android:layout_height="wrap_content" android:scaleType="center" + android:background="@drawable/bg_pressed" android:src="@drawable/ic_switch_pan_holo_light" /> </LinearLayout> </RelativeLayout> diff --git a/res/values-w1024dp/dimens.xml b/res/values-w1024dp/dimens.xml index f35facc..3044e7d 100644 --- a/res/values-w1024dp/dimens.xml +++ b/res/values-w1024dp/dimens.xml @@ -40,7 +40,7 @@ <dimen name="setting_knob_width">50dp</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="setting_item_list_margin">24dp</dimen> <dimen name="indicator_bar_width">13dp</dimen> <dimen name="popup_title_text_size">22dp</dimen> <dimen name="popup_title_frame_min_height">60dp</dimen> diff --git a/res/values-w1280dp/dimens.xml b/res/values-w1280dp/dimens.xml index b08a935..eed865e 100644 --- a/res/values-w1280dp/dimens.xml +++ b/res/values-w1280dp/dimens.xml @@ -30,7 +30,7 @@ <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="setting_item_list_margin">24dp</dimen> <dimen name="popup_title_text_size">22dp</dimen> <dimen name="popup_title_frame_min_height">64dp</dimen> <dimen name="big_setting_popup_window_width">590dp</dimen> diff --git a/res/values/dimens.xml b/res/values/dimens.xml index 40e3d25..6b3b279 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -38,7 +38,7 @@ <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="setting_item_list_margin">14dp</dimen> <dimen name="indicator_bar_width">48dp</dimen> <dimen name="popup_title_text_size">22dp</dimen> <dimen name="popup_title_frame_min_height">60dp</dimen> diff --git a/res/values/styles.xml b/res/values/styles.xml index b20dbfc..9127479 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -94,8 +94,6 @@ </style> <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> @@ -124,8 +122,8 @@ <item name="android:orientation">horizontal</item> <item name="android:layout_width">match_parent</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:paddingLeft">@dimen/setting_item_list_margin</item> + <item name="android:paddingRight">@dimen/setting_item_list_margin</item> <item name="android:background">@drawable/setting_picker</item> </style> <style name="SettingKnob"> |