diff options
Diffstat (limited to 'res')
-rw-r--r-- | res/layout/crop_activity.xml | 55 | ||||
-rw-r--r-- | res/layout/filtershow_editor_panel.xml | 3 |
2 files changed, 57 insertions, 1 deletions
diff --git a/res/layout/crop_activity.xml b/res/layout/crop_activity.xml new file mode 100644 index 000000000..3f8a4a556 --- /dev/null +++ b/res/layout/crop_activity.xml @@ -0,0 +1,55 @@ +<?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. +--> + +<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:id="@+id/mainView" + android:background="@drawable/filtershow_tiled_background"> + + <LinearLayout + android:id="@+id/mainPanel" + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:layout_weight="1" + android:orientation="vertical" > + + <FrameLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_weight="1" > + + <com.android.gallery3d.filtershow.crop.CropView + android:id="@+id/cropView" + android:layout_width="match_parent" + android:layout_height="wrap_content" /> + + <ProgressBar + android:id="@+id/loading" + style="@android:style/Widget.Holo.ProgressBar.Large" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center" + android:indeterminate="true" + android:indeterminateOnly="true" + android:background="@color/background_screen" /> + + </FrameLayout> + + </LinearLayout> + +</FrameLayout> diff --git a/res/layout/filtershow_editor_panel.xml b/res/layout/filtershow_editor_panel.xml index e4bcfc805..6822d987b 100644 --- a/res/layout/filtershow_editor_panel.xml +++ b/res/layout/filtershow_editor_panel.xml @@ -76,7 +76,7 @@ android:orientation="horizontal" android:visibility="visible" > - <Button + <com.android.gallery3d.filtershow.editors.SwapButton android:id="@+id/applyEffect" android:layout_width="fill_parent" android:layout_height="fill_parent" @@ -86,6 +86,7 @@ android:text="@string/apply_effect" android:textSize="18dip" android:drawableRight="@drawable/filtershow_menu_marker"/> + </LinearLayout> <ImageView |