diff options
author | John Hoford <hoford@google.com> | 2013-03-11 11:10:22 -0700 |
---|---|---|
committer | John Hoford <hoford@google.com> | 2013-03-11 14:22:57 -0700 |
commit | 7c1bb24f0b7d240acee416dcb222b61830382dc8 (patch) | |
tree | f1ac7ebf3703c19d13acae8851fb6ae62a441629 /res | |
parent | 8124706f162f15238e92ca72e7fcf18c12d32eda (diff) | |
download | android_packages_apps_Snap-7c1bb24f0b7d240acee416dcb222b61830382dc8.tar.gz android_packages_apps_Snap-7c1bb24f0b7d240acee416dcb222b61830382dc8.tar.bz2 android_packages_apps_Snap-7c1bb24f0b7d240acee416dcb222b61830382dc8.zip |
refactoring to make Editor classes do more
Change-Id: Id0885929cf3a9410bd0e5d3bf96eb99e8c7e1cf9
Diffstat (limited to 'res')
-rw-r--r-- | res/drawable/filtershow_vertical_line.xml | 22 | ||||
-rw-r--r-- | res/layout-land/filtershow_activity.xml | 88 | ||||
-rw-r--r-- | res/layout/filtershow_activity.xml | 126 | ||||
-rw-r--r-- | res/layout/filtershow_default_editor.xml | 16 | ||||
-rw-r--r-- | res/layout/filtershow_tiny_planet_editor.xml | 16 | ||||
-rw-r--r-- | res/layout/filtershow_vignette_editor.xml | 16 | ||||
-rw-r--r-- | res/layout/filtershow_zoom_editor.xml | 16 | ||||
-rw-r--r-- | res/values/filtershow_color.xml | 2 |
8 files changed, 190 insertions, 112 deletions
diff --git a/res/drawable/filtershow_vertical_line.xml b/res/drawable/filtershow_vertical_line.xml new file mode 100644 index 000000000..611c7e03f --- /dev/null +++ b/res/drawable/filtershow_vertical_line.xml @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2012 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<shape xmlns:android="http://schemas.android.com/apk/res/android" + android:shape="rectangle" > + <size android:width="1dp" android:height="20dp"/> + <corners android:radius="0dp" /> + <solid android:color="@color/toolbar_separation_line"/> +</shape>
\ No newline at end of file diff --git a/res/layout-land/filtershow_activity.xml b/res/layout-land/filtershow_activity.xml index 957a36592..066dffad9 100644 --- a/res/layout-land/filtershow_activity.xml +++ b/res/layout-land/filtershow_activity.xml @@ -98,7 +98,6 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_gravity="center" - android:background="@color/background_main_toolbar" custom:max_width="600dip" android:orientation="vertical"> @@ -111,33 +110,94 @@ android:id="@+id/filterButtonsList" android:layout_width="fill_parent" android:layout_height="@dimen/thumbnail_size" - android:background="@color/background_main_toolbar" android:orientation="horizontal" android:visibility="gone" > - <FrameLayout - android:layout_width="fill_parent" - android:layout_height="fill_parent" > + <LinearLayout + android:id="@+id/top" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_weight="0" + android:orientation="vertical" + android:visibility="visible" > <LinearLayout - android:id="@+id/panelAccessoryViewList" + android:id="@+id/controlArea" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_weight="1" + android:orientation="horizontal" + android:background="@android:color/transparent" + android:visibility="visible" > + + <SeekBar + android:id="@+id/primarySeekBar" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:background="@android:color/transparent" + android:layout_weight="1" /> + </LinearLayout> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_weight="1" + android:background="@color/filtershow_background" + android:orientation="horizontal" + android:visibility="visible" > + + <ImageButton + android:id="@+id/cancelFilter" android:layout_width="wrap_content" + android:layout_height="94dip" + android:layout_gravity="left" + android:layout_weight=".1" + android:background="@android:color/transparent" + android:gravity="center" + android:src="@drawable/ic_menu_cancel_holo_light" + android:textSize="18dip" /> + + <ImageView + android:layout_width="2dp" android:layout_height="fill_parent" + android:src="@drawable/filtershow_vertical_line" /> + + <LinearLayout + android:id="@+id/panelAccessoryViewList" + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:layout_weight="1" android:orientation="horizontal" - android:visibility="visible" /> + android:visibility="visible" > + + <Button + android:id="@+id/applyEffect" + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:layout_gravity="center" + android:background="@android:color/transparent" + android:gravity="center" + android:text="@string/apply_effect" + android:textSize="18dip" /> + </LinearLayout> + + <ImageView + android:layout_width="2dp" + android:layout_height="fill_parent" + android:src="@drawable/filtershow_vertical_line" /> - <Button - android:id="@+id/applyEffect" + <ImageButton + android:id="@+id/applyFilter" android:layout_width="wrap_content" android:layout_height="94dip" - android:layout_gravity="center" - android:layout_weight="1" + android:layout_gravity="right" + android:layout_weight=".1" android:background="@android:color/transparent" android:gravity="center" - android:text="@string/apply_effect" + android:src="@drawable/ic_menu_done_holo_light" android:textSize="18dip" /> - </FrameLayout> - + </LinearLayout> + </LinearLayout> </LinearLayout> <HorizontalScrollView diff --git a/res/layout/filtershow_activity.xml b/res/layout/filtershow_activity.xml index c723aaba5..2833e0b90 100644 --- a/res/layout/filtershow_activity.xml +++ b/res/layout/filtershow_activity.xml @@ -74,47 +74,105 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_gravity="center" - android:background="@color/background_main_toolbar" custom:max_width="600dip" android:orientation="vertical"> - <FrameLayout - android:id="@+id/secondRowPanel" - android:layout_width="fill_parent" - android:layout_height="wrap_content" > - - <LinearLayout - android:id="@+id/filterButtonsList" - android:layout_width="fill_parent" - android:layout_height="@dimen/thumbnail_size" - android:background="@color/background_main_toolbar" - android:orientation="horizontal" - android:visibility="gone" > - - <FrameLayout + <FrameLayout + android:id="@+id/secondRowPanel" android:layout_width="fill_parent" - android:layout_height="fill_parent" > + android:layout_height="wrap_content" > <LinearLayout - android:id="@+id/panelAccessoryViewList" - android:layout_width="wrap_content" - android:layout_height="fill_parent" + android:id="@+id/filterButtonsList" + android:layout_width="fill_parent" + android:layout_height="@dimen/thumbnail_size" android:orientation="horizontal" - android:visibility="visible" /> - - <Button - android:id="@+id/applyEffect" - android:layout_width="wrap_content" - android:layout_height="94dip" - android:layout_gravity="center" - android:layout_weight="1" - android:background="@android:color/transparent" - android:gravity="center" - android:text="@string/apply_effect" - android:textSize="18dip" /> - </FrameLayout> - - </LinearLayout> + android:visibility="gone" > + + <LinearLayout + android:id="@+id/top" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_weight="0" + android:orientation="vertical" + android:visibility="visible" > + + <LinearLayout + android:id="@+id/controlArea" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_weight="1" + android:orientation="horizontal" + android:visibility="visible" > + + <SeekBar + android:id="@+id/primarySeekBar" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_weight="1" /> + </LinearLayout> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_weight="1" + android:background="@color/filtershow_background" + android:orientation="horizontal" + android:visibility="visible" > + + <ImageButton + android:id="@+id/cancelFilter" + android:layout_width="wrap_content" + android:layout_height="94dip" + android:layout_gravity="left" + android:layout_weight=".1" + android:background="@android:color/transparent" + android:gravity="center" + android:src="@drawable/ic_menu_cancel_holo_light" + android:textSize="18dip" /> + + <ImageView + android:layout_width="2dp" + android:layout_height="fill_parent" + android:src="@drawable/filtershow_vertical_line" /> + + <LinearLayout + android:id="@+id/panelAccessoryViewList" + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:layout_weight="1" + android:orientation="horizontal" + android:visibility="visible" > + + <Button + android:id="@+id/applyEffect" + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:layout_gravity="center" + android:background="@android:color/transparent" + android:gravity="center" + android:text="@string/apply_effect" + android:textSize="18dip" /> + </LinearLayout> + + <ImageView + android:layout_width="2dp" + android:layout_height="fill_parent" + android:src="@drawable/filtershow_vertical_line" /> + + <ImageButton + android:id="@+id/applyFilter" + android:layout_width="wrap_content" + android:layout_height="94dip" + android:layout_gravity="right" + android:layout_weight=".1" + android:background="@android:color/transparent" + android:gravity="center" + android:src="@drawable/ic_menu_done_holo_light" + android:textSize="18dip" /> + </LinearLayout> + </LinearLayout> + </LinearLayout> <HorizontalScrollView android:id="@+id/fxList" diff --git a/res/layout/filtershow_default_editor.xml b/res/layout/filtershow_default_editor.xml index 9f25529e1..b261ea35f 100644 --- a/res/layout/filtershow_default_editor.xml +++ b/res/layout/filtershow_default_editor.xml @@ -27,20 +27,4 @@ android:layout_width="match_parent" android:layout_height="wrap_content" /> - <com.android.gallery3d.filtershow.CenteredLinearLayout - xmlns:custom="http://schemas.android.com/apk/res/com.android.gallery3d" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_gravity="center_horizontal|bottom" - android:background="@android:color/transparent" - custom:max_width="600dip" - android:orientation="vertical"> - - <SeekBar - android:id="@+id/filterSeekBar" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_gravity="bottom" - android:padding="16dip"/> - </com.android.gallery3d.filtershow.CenteredLinearLayout> </FrameLayout>
\ No newline at end of file diff --git a/res/layout/filtershow_tiny_planet_editor.xml b/res/layout/filtershow_tiny_planet_editor.xml index a99e406a9..61e0cf565 100644 --- a/res/layout/filtershow_tiny_planet_editor.xml +++ b/res/layout/filtershow_tiny_planet_editor.xml @@ -27,20 +27,4 @@ android:layout_width="match_parent" android:layout_height="wrap_content" /> - <com.android.gallery3d.filtershow.CenteredLinearLayout - xmlns:custom="http://schemas.android.com/apk/res/com.android.gallery3d" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_gravity="center_horizontal|bottom" - android:background="@android:color/transparent" - custom:max_width="600dip" - android:orientation="vertical"> - - <SeekBar - android:id="@+id/filterSeekBar" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_gravity="bottom" - android:padding="16dip"/> - </com.android.gallery3d.filtershow.CenteredLinearLayout> </FrameLayout>
\ No newline at end of file diff --git a/res/layout/filtershow_vignette_editor.xml b/res/layout/filtershow_vignette_editor.xml index 6e5755928..72a615fb4 100644 --- a/res/layout/filtershow_vignette_editor.xml +++ b/res/layout/filtershow_vignette_editor.xml @@ -27,20 +27,4 @@ android:layout_width="match_parent" android:layout_height="wrap_content" /> - <com.android.gallery3d.filtershow.CenteredLinearLayout - xmlns:custom="http://schemas.android.com/apk/res/com.android.gallery3d" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_gravity="center_horizontal|bottom" - android:background="@android:color/transparent" - custom:max_width="600dip" - android:orientation="vertical"> - - <SeekBar - android:id="@+id/filterSeekBar" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_gravity="bottom" - android:padding="16dip"/> - </com.android.gallery3d.filtershow.CenteredLinearLayout> </FrameLayout>
\ No newline at end of file diff --git a/res/layout/filtershow_zoom_editor.xml b/res/layout/filtershow_zoom_editor.xml index 3ef6f6bf7..9813a283d 100644 --- a/res/layout/filtershow_zoom_editor.xml +++ b/res/layout/filtershow_zoom_editor.xml @@ -27,20 +27,4 @@ android:layout_width="match_parent" android:layout_height="wrap_content" /> - <com.android.gallery3d.filtershow.CenteredLinearLayout - xmlns:custom="http://schemas.android.com/apk/res/com.android.gallery3d" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_gravity="center_horizontal|bottom" - android:background="@android:color/transparent" - custom:max_width="600dip" - android:orientation="vertical"> - - <SeekBar - android:id="@+id/filterSeekBar" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_gravity="bottom" - android:padding="16dip"/> - </com.android.gallery3d.filtershow.CenteredLinearLayout> </FrameLayout> diff --git a/res/values/filtershow_color.xml b/res/values/filtershow_color.xml index 175d3d3e0..70191fdc3 100644 --- a/res/values/filtershow_color.xml +++ b/res/values/filtershow_color.xml @@ -26,5 +26,7 @@ <color name="toolbar_separation_line">#333333</color> <color name="slider_dot_color">#6464FF</color> <color name="slider_line_color">#33B5E5</color> + <color name="filtershow_background">#333333</color> + <color name="filtershow_graphic">#717171</color> </resources>
\ No newline at end of file |