summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorWu-cheng Li <wuchengli@google.com>2011-09-14 16:52:53 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-09-14 16:52:53 -0700
commit48ccad73c132753904a08651ce04cdb27377ef28 (patch)
tree75d148e0f2ea316f4bded0c3c9d5d40a2a6549a6 /res
parentccc10bb25616e2b4619c15a0fe22eb8538174062 (diff)
parent977d06c6278cb7b131ed3c0960853d9168aacbdd (diff)
downloadLegacyCamera-48ccad73c132753904a08651ce04cdb27377ef28.zip
LegacyCamera-48ccad73c132753904a08651ce04cdb27377ef28.tar.gz
LegacyCamera-48ccad73c132753904a08651ce04cdb27377ef28.tar.bz2
Merge "Update share UI to match redlines."
Diffstat (limited to 'res')
-rw-r--r--res/anim/share_popup_enter.xml19
-rw-r--r--res/anim/share_popup_exit.xml19
-rw-r--r--res/drawable-hdpi/border_last_picture_normal.9.pngbin830 -> 0 bytes
-rwxr-xr-xres/drawable-mdpi/border_last_picture_normal.9.pngbin437 -> 0 bytes
-rw-r--r--res/drawable/border_last_picture.xml2
-rw-r--r--res/layout/pano_capture.xml2
-rw-r--r--res/values-w1024dp/dimens.xml4
-rw-r--r--res/values/dimens.xml2
-rw-r--r--res/values/styles.xml4
9 files changed, 47 insertions, 5 deletions
diff --git a/res/anim/share_popup_enter.xml b/res/anim/share_popup_enter.xml
new file mode 100644
index 0000000..3464716
--- /dev/null
+++ b/res/anim/share_popup_enter.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 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.
+-->
+
+<alpha xmlns:android="http://schemas.android.com/apk/res/android"
+ android:interpolator="@android:anim/decelerate_interpolator"
+ android:fromAlpha="0.0" android:toAlpha="1.0" android:duration="200"/>
diff --git a/res/anim/share_popup_exit.xml b/res/anim/share_popup_exit.xml
new file mode 100644
index 0000000..a345fa5
--- /dev/null
+++ b/res/anim/share_popup_exit.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 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.
+-->
+
+<alpha xmlns:android="http://schemas.android.com/apk/res/android"
+ android:interpolator="@android:anim/accelerate_interpolator"
+ android:fromAlpha="1.0" android:toAlpha="0.0" android:duration="200"/>
diff --git a/res/drawable-hdpi/border_last_picture_normal.9.png b/res/drawable-hdpi/border_last_picture_normal.9.png
deleted file mode 100644
index 64d17a0..0000000
--- a/res/drawable-hdpi/border_last_picture_normal.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/border_last_picture_normal.9.png b/res/drawable-mdpi/border_last_picture_normal.9.png
deleted file mode 100755
index 021286f..0000000
--- a/res/drawable-mdpi/border_last_picture_normal.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable/border_last_picture.xml b/res/drawable/border_last_picture.xml
index b44d4ee..0cc6f8a 100644
--- a/res/drawable/border_last_picture.xml
+++ b/res/drawable/border_last_picture.xml
@@ -16,6 +16,6 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true" android:drawable="@drawable/ic_highlight" />
- <item android:drawable="@drawable/border_last_picture_normal" />
+ <item android:drawable="@android:color/transparent" />
</selector>
diff --git a/res/layout/pano_capture.xml b/res/layout/pano_capture.xml
index 9450bf7..a91104a 100644
--- a/res/layout/pano_capture.xml
+++ b/res/layout/pano_capture.xml
@@ -20,7 +20,7 @@
android:layout_height="match_parent"
android:orientation="horizontal">
- <RelativeLayout
+ <RelativeLayout android:id="@+id/frame_layout"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1">
diff --git a/res/values-w1024dp/dimens.xml b/res/values-w1024dp/dimens.xml
index dbb4dbb..034b03a 100644
--- a/res/values-w1024dp/dimens.xml
+++ b/res/values-w1024dp/dimens.xml
@@ -24,8 +24,8 @@
<dimen name="camera_switcher_margin_right">16dp</dimen>
<dimen name="camera_switcher_margin_bottom">24dp</dimen>
<dimen name="share_icon_length">48dp</dimen>
- <dimen name="share_item_width">60dp</dimen>
- <dimen name="share_item_height">90dp</dimen>
+ <dimen name="share_item_width">70dp</dimen>
+ <dimen name="share_item_height">70dp</dimen>
<dimen name="pano_control_layout_min_width">260dp</dimen>
<dimen name="pano_control_start_button_size">180dp</dimen>
<dimen name="pano_mosaic_surface_height">480dp</dimen>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 5aed274..f0778dd 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -21,7 +21,7 @@
<dimen name="hint_y_offset">64dp</dimen>
<dimen name="share_icon_length">36dp</dimen>
<dimen name="share_item_width">54dp</dimen>
- <dimen name="share_item_height">60dp</dimen>
+ <dimen name="share_item_height">54dp</dimen>
<dimen name="pano_control_layout_min_width">76dp</dimen>
<dimen name="pano_control_start_button_size">70dp</dimen>
<dimen name="pano_mosaic_surface_height">240dp</dimen>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index bd46fc3..8076cc9 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -164,4 +164,8 @@
<item name="android:layout_alignParentTop">true</item>
<item name="android:layout_centerHorizontal">true</item>
</style>
+ <style name="AnimationPopup" parent="android:Animation">
+ <item name="android:windowEnterAnimation">@anim/share_popup_enter</item>
+ <item name="android:windowExitAnimation">@anim/share_popup_exit</item>
+ </style>
</resources>