summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorRuben Brunk <rubenbrunk@google.com>2013-04-09 22:59:08 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-04-09 22:59:08 +0000
commit72eb8276bc1bea0deb63146ada1f6801eb8e410c (patch)
treec540a32b908eb9ee40ae6d169afb0518a7e7d80c /res
parent23ac64db523ea75c0ad7b55af2b59ec97dda79ef (diff)
parent4176a268e7a06e98fc41d12d5e806cd7af1f3132 (diff)
downloadandroid_packages_apps_Snap-72eb8276bc1bea0deb63146ada1f6801eb8e410c.tar.gz
android_packages_apps_Snap-72eb8276bc1bea0deb63146ada1f6801eb8e410c.tar.bz2
android_packages_apps_Snap-72eb8276bc1bea0deb63146ada1f6801eb8e410c.zip
Merge "Moving crop to a separate activity. Refactoring." into gb-ub-photos-bryce
Diffstat (limited to 'res')
-rw-r--r--res/layout/crop_activity.xml55
1 files changed, 55 insertions, 0 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>