diff options
| author | Wei Huang <weih@google.com> | 2011-11-07 13:40:50 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-11-07 13:40:50 -0800 |
| commit | 08ce47f0a87dac202bfe3b97a12d1d059a3c88f6 (patch) | |
| tree | aae66bcb4992b1ef9714c5b081a7e4334d4f4ff0 /res/layout | |
| parent | da1090097765f736474458981034f823de8c4f7f (diff) | |
| parent | a2c8d40185095a1905f0063ebeb51ff62c0a0ab1 (diff) | |
| download | LegacyCamera-08ce47f0a87dac202bfe3b97a12d1d059a3c88f6.zip LegacyCamera-08ce47f0a87dac202bfe3b97a12d1d059a3c88f6.tar.gz LegacyCamera-08ce47f0a87dac202bfe3b97a12d1d059a3c88f6.tar.bz2 | |
Merge "Change effect settings popup styles." into ics-mr1
Diffstat (limited to 'res/layout')
| -rw-r--r-- | res/layout/effect_setting_popup.xml | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/res/layout/effect_setting_popup.xml b/res/layout/effect_setting_popup.xml index 3ef7baf..18c8166 100644 --- a/res/layout/effect_setting_popup.xml +++ b/res/layout/effect_setting_popup.xml @@ -43,20 +43,28 @@ android:textSize="@dimen/effect_setting_clear_text_size" android:minHeight="@dimen/effect_setting_clear_text_min_height" android:background="@drawable/bg_pressed"/> - <View style="@style/EffectTitleSeparator"/> + <TextView android:id="@+id/effect_silly_faces_title" android:text="@string/effect_silly_faces" android:visibility="gone" style="@style/EffectSettingTypeTitle"/> + <View android:id="@+id/effect_silly_faces_title_separator" + android:visibility="gone" + style="@style/EffectTypeSeparator"/> <com.android.camera.ui.ExpandedGridView android:id="@+id/effect_silly_faces" style="@style/EffectSettingGrid"/> + <View android:id="@+id/effect_background_separator" android:visibility="gone" style="@style/EffectTitleSeparator"/> + <TextView android:id="@+id/effect_background_title" android:text="@string/effect_background" android:visibility="gone" style="@style/EffectSettingTypeTitle"/> + <View android:id="@+id/effect_background_title_separator" + android:visibility="gone" + style="@style/EffectTypeSeparator"/> <com.android.camera.ui.ExpandedGridView android:id="@+id/effect_background" android:visibility="gone" style="@style/EffectSettingGrid"/> |