diff options
| author | Wu-cheng Li <wuchengli@google.com> | 2011-09-22 16:47:22 +0800 |
|---|---|---|
| committer | Wu-cheng Li <wuchengli@google.com> | 2011-09-23 20:41:30 +0800 |
| commit | 1e99673af90451eaffeb100735f38e6ce0f18456 (patch) | |
| tree | cd63dd416c69eceaedd7451ee8fd375ebf80ce09 /res/layout | |
| parent | 022d6d7e809fcd47ebc751deaea84e2d3639069a (diff) | |
| download | LegacyCamera-1e99673af90451eaffeb100735f38e6ce0f18456.zip LegacyCamera-1e99673af90451eaffeb100735f38e6ce0f18456.tar.gz LegacyCamera-1e99673af90451eaffeb100735f38e6ce0f18456.tar.bz2 | |
Add clear effects button, silly faces title, and background title.
bug:5226051
Change-Id: I61609e31fb8f18041f6885cb923507aeecfd9c9f
Diffstat (limited to 'res/layout')
| -rw-r--r-- | res/layout/effect_setting_popup.xml | 40 |
1 files changed, 32 insertions, 8 deletions
diff --git a/res/layout/effect_setting_popup.xml b/res/layout/effect_setting_popup.xml index ad22d9f..5fa4ad2 100644 --- a/res/layout/effect_setting_popup.xml +++ b/res/layout/effect_setting_popup.xml @@ -13,7 +13,7 @@ See the License for the specific language governing permissions and limitations under the License. --> -<com.android.camera.ui.BasicSettingPopup xmlns:android="http://schemas.android.com/apk/res/android" +<com.android.camera.ui.EffectSettingPopup xmlns:android="http://schemas.android.com/apk/res/android" style="@style/SettingPopupWindow"> <LinearLayout android:orientation="vertical" @@ -30,12 +30,36 @@ </FrameLayout> <View style="@style/PopupTitleSeperator" /> - - <FrameLayout android:layout_width="match_parent" + <ScrollView + android:layout_width="match_parent" android:layout_height="wrap_content"> - <GridView android:id="@+id/settingList" - style="@style/EffectSettingGrid" - android:choiceMode="singleChoice" /> - </FrameLayout> + <LinearLayout + android:orientation="vertical" + android:layout_width="match_parent" + android:layout_height="wrap_content"> + <TextView android:id="@+id/clear_effects" + android:text="@string/clear_effects" + style="@style/EffectSettingTypeTitle" + 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:text="@string/effect_silly_faces" + style="@style/EffectSettingTypeTitle"/> + <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"/> + <com.android.camera.ui.ExpandedGridView android:id="@+id/effect_background" + android:visibility="gone" + style="@style/EffectSettingGrid"/> + </LinearLayout> + </ScrollView> </LinearLayout> -</com.android.camera.ui.BasicSettingPopup> +</com.android.camera.ui.EffectSettingPopup> |