diff options
| author | Wei Huang <weih@google.com> | 2011-09-23 10:05:09 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-09-23 10:05:09 -0700 |
| commit | a3d4776e153be0b4ccdfdfb603da94b13b0d7443 (patch) | |
| tree | b34dace184a0bba24a5d3cb2c891781482937c8e /res/values | |
| parent | 97805866d29c7de439105ebdfbfe788a1735c878 (diff) | |
| parent | 1e99673af90451eaffeb100735f38e6ce0f18456 (diff) | |
| download | LegacyCamera-a3d4776e153be0b4ccdfdfb603da94b13b0d7443.zip LegacyCamera-a3d4776e153be0b4ccdfdfb603da94b13b0d7443.tar.gz LegacyCamera-a3d4776e153be0b4ccdfdfb603da94b13b0d7443.tar.bz2 | |
Merge "Add clear effects button, silly faces title, and background title." into ics-factoryrom
Diffstat (limited to 'res/values')
| -rw-r--r-- | res/values/dimens.xml | 5 | ||||
| -rw-r--r-- | res/values/strings.xml | 9 | ||||
| -rw-r--r-- | res/values/styles.xml | 21 |
3 files changed, 32 insertions, 3 deletions
diff --git a/res/values/dimens.xml b/res/values/dimens.xml index 74842b2..f34b2e5 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -45,4 +45,9 @@ <dimen name="setting_item_icon_width">28dp</dimen> <dimen name="effect_setting_item_icon_width">40dp</dimen> <dimen name="effect_setting_item_text_size">12dp</dimen> + <dimen name="effect_setting_type_text_size">18dp</dimen> + <dimen name="effect_setting_type_text_min_height">36dp</dimen> + <dimen name="effect_setting_clear_text_size">20dp</dimen> + <dimen name="effect_setting_clear_text_min_height">36dp</dimen> + <dimen name="effect_setting_type_text_left_padding">16dp</dimen> </resources> diff --git a/res/values/strings.xml b/res/values/strings.xml index 4db1938..396a645 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -317,4 +317,13 @@ <!-- Toast telling users tapping on the viewfinder will take a picture [CHAR LIMIT=65] --> <string name="video_snapshot_hint">Take a photo during video recording by tapping on the preview screen.</string> + + <!-- A button in effect setting popup to clear the effect. [CHAR LIMIT=26] --> + <string name="clear_effects">Clear effects</string> + + <!-- Title of category for silly face effects. [CHAR LIMIT=26] --> + <string name="effect_silly_faces">Silly faces</string> + + <!-- Title of category for background replacement effects. [CHAR LIMIT=26] --> + <string name="effect_background">Background</string> </resources> diff --git a/res/values/styles.xml b/res/values/styles.xml index 7a5db3f..8a01313 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -44,7 +44,7 @@ <item name="android:layout_centerHorizontal">true</item> <item name="android:clickable">true</item> <item name="android:focusable">true</item> - <item name="android:background">@drawable/bg_review_control</item> + <item name="android:background">@drawable/bg_pressed</item> </style> <style name="ReviewPlayIcon"> <item name="android:layout_height">wrap_content</item> @@ -85,8 +85,6 @@ <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"> @@ -187,6 +185,7 @@ <item name="android:numColumns">3</item> <item name="android:verticalSpacing">3dp</item> <item name="android:horizontalSpacing">3dp</item> + <item name="android:choiceMode">singleChoice</item> </style> <style name="EffectSettingItem"> <item name="android:orientation">vertical</item> @@ -207,4 +206,20 @@ <item name="android:layout_height">wrap_content</item> <item name="android:paddingTop">1dp</item> </style> + <style name="EffectSettingTypeTitle"> + <item name="android:textSize">@dimen/effect_setting_type_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_width">match_parent</item> + <item name="android:layout_height">wrap_content</item> + <item name="android:minHeight">@dimen/effect_setting_type_text_min_height</item> + <item name="android:paddingLeft">@dimen/effect_setting_type_text_left_padding</item> + </style> + <style name="EffectTitleSeparator"> + <item name="android:layout_width">match_parent</item> + <item name="android:layout_height">2dp</item> + <item name="android:paddingBottom">4dp</item> + <item name="android:background">@android:drawable/divider_horizontal_dark</item> + </style> </resources> |