summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorCheng-Ru Lin <owenlin@google.com>2009-09-30 15:35:43 +0800
committerCheng-Ru Lin <owenlin@google.com>2009-10-01 05:33:30 +0800
commitabdd8a1c1f4bd5f471b62f2927399dc23a9bd33c (patch)
tree531a446217fd14a72768e7e65206637ca39a4253 /res
parentc90610f56293c93f4a7c7a67d8bbf0edb96bc57d (diff)
downloadLegacyCamera-abdd8a1c1f4bd5f471b62f2927399dc23a9bd33c.zip
LegacyCamera-abdd8a1c1f4bd5f471b62f2927399dc23a9bd33c.tar.gz
LegacyCamera-abdd8a1c1f4bd5f471b62f2927399dc23a9bd33c.tar.bz2
Another candidate for on screen settings UI (opaque).
Make the background opaque and use slide from the whole screen (not just inside the view finder). Change-Id: I12b8485399553e2622c9917833dc9aca9d8ee59c
Diffstat (limited to 'res')
-rw-r--r--res/anim/on_screen_menu_appear.xml20
-rw-r--r--res/anim/on_screen_menu_disappear.xml20
-rw-r--r--res/layout/on_screen_menu.xml2
-rw-r--r--res/values/styles.xml4
4 files changed, 45 insertions, 1 deletions
diff --git a/res/anim/on_screen_menu_appear.xml b/res/anim/on_screen_menu_appear.xml
new file mode 100644
index 0000000..c870521
--- /dev/null
+++ b/res/anim/on_screen_menu_appear.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2009 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.
+-->
+
+<translate xmlns:android="http://schemas.android.com/apk/res/android"
+ android:fromXDelta="-100%"
+ android:toXDelta="0"
+ android:duration="500" />
diff --git a/res/anim/on_screen_menu_disappear.xml b/res/anim/on_screen_menu_disappear.xml
new file mode 100644
index 0000000..f71c3da
--- /dev/null
+++ b/res/anim/on_screen_menu_disappear.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2009 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.
+-->
+
+<translate xmlns:android="http://schemas.android.com/apk/res/android"
+ android:fromXDelta="0"
+ android:toXDelta="-100%"
+ android:duration="500" />
diff --git a/res/layout/on_screen_menu.xml b/res/layout/on_screen_menu.xml
index 496dfb8..0aa4d48 100644
--- a/res/layout/on_screen_menu.xml
+++ b/res/layout/on_screen_menu.xml
@@ -16,7 +16,7 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/main_panel"
- android:background="#88333333"
+ android:background="@drawable/camera_background"
android:layout_width="fill_parent"
android:layout_height="wrap_content">
<FrameLayout android:layout_width="fill_parent"
diff --git a/res/values/styles.xml b/res/values/styles.xml
index c6de7f7..ae5d16a 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -82,4 +82,8 @@
parent="@android:style/Theme.Black.NoTitleBar.Fullscreen">
<item name="android:windowAnimationStyle">@style/NoEnterExitAnimation</item>
</style>
+ <style name="Animation_OnScreenMenu">
+ <item name="android:windowEnterAnimation">@anim/on_screen_menu_appear</item>
+ <item name="android:windowExitAnimation">@anim/on_screen_menu_disappear</item>
+ </style>
</resources>