From 5438ab0e17064e20870ac893a2dd2b9e1219eef1 Mon Sep 17 00:00:00 2001
From: Nick Pelly <npelly@google.com>
Date: Wed, 17 Aug 2011 22:23:12 -0700
Subject: 0-click UI update

o New start sound
o Vibrate only when
    - starting send
    - send success
    - receive success
o Play sound only when
    - starting send
    - send success
    - send failure (out of range before complete)
    - receive success
o Introduce HoldingItWrongUi with the new image
o P2pAnimationActivity -> SendUi, and a huge cleanup of it
    - no longer an activity. It took 350ms to inflate the views on
      first onCreate() as an activity, but we can cache this ahead
      of time as a window.
    - Use ObjectAnimator instead of ViewAnimator, much less code
o Use ACCELEROMETER instead of GRAVITY to get faster tilt detection.

TODO (in order of priority)
o LLCP has started crashing a lot again. About 1/10 times I come into
  P2P range the stack crashes now on my Nexus S TMO.
  At first I thought it was because I was doing animations during LLCP
  send, which might affect timing to pn544 due to CPU load. So I changed
  my first implementation (one animation) to split it into a pre-send
  and post-send, so we don't do any work during the actual send. Still
  seems to crash though. We really need to make it solid again.
o Change notification text and settings text+image as per Rachel's email
o Do some simple low-pass filter on ACCELEROMETER so we don't get caught
  out when the user shakes the phone
o Plumb through a starting receive callback, and play sound + vibrate
o Prevent touch during send animations. Not a big deal right now because
  we complete it so fast.
o Prevent notification shade from being pulled during HoldingItWrongUi
  and SendUi
o Prevent orientation change during SendUi

Change-Id: Ieec1efb741244c68270e34a712c15c58621b1446
---
 res/drawable-hdpi/howto_sharetap.png | Bin 0 -> 7792 bytes
 res/layout/holding_it_wrong.xml      |  32 ++++++++++++++++++++++++++++++++
 res/layout/screenshot.xml            |  20 --------------------
 res/raw/start.ogg                    | Bin 18515 -> 23068 bytes
 4 files changed, 32 insertions(+), 20 deletions(-)
 create mode 100644 res/drawable-hdpi/howto_sharetap.png
 create mode 100644 res/layout/holding_it_wrong.xml

(limited to 'res')

diff --git a/res/drawable-hdpi/howto_sharetap.png b/res/drawable-hdpi/howto_sharetap.png
new file mode 100644
index 0000000..b78329d
Binary files /dev/null and b/res/drawable-hdpi/howto_sharetap.png differ
diff --git a/res/layout/holding_it_wrong.xml b/res/layout/holding_it_wrong.xml
new file mode 100644
index 0000000..4cd86ad
--- /dev/null
+++ b/res/layout/holding_it_wrong.xml
@@ -0,0 +1,32 @@
+<?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.
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/padding"
+    android:orientation="vertical"
+    android:gravity="center"
+>
+
+    <ImageView android:id="@+id/image"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:paddingBottom="15px"
+        android:src="@drawable/howto_sharetap"
+        android:paddingTop="10px"
+    />
+
+</LinearLayout>
+
+
diff --git a/res/layout/screenshot.xml b/res/layout/screenshot.xml
index 9f27b7f..e29aff4 100644
--- a/res/layout/screenshot.xml
+++ b/res/layout/screenshot.xml
@@ -24,29 +24,9 @@
         android:adjustViewBounds="true"
         android:src="@drawable/p2p_bg"
     />
-    <RelativeLayout android:layout_width="match_parent"
-        android:layout_height="match_parent"
-    >
-	    <TextView android:id="@+id/calltoaction"
-		    android:layout_width="fill_parent"
-		    android:layout_height="wrap_content"
-		    android:text="@string/touch"
-		    android:textSize="35px"
-		    android:layout_alignParentTop="true"
-		    android:paddingTop="30dip"
-		    android:gravity="center"
-	    />
-    </RelativeLayout>
-
-    <ImageView android:id="@+id/clone"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:adjustViewBounds="true"
-    />
     <ImageView android:id="@+id/screenshot"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:adjustViewBounds="true"
     />
-
 </FrameLayout>
diff --git a/res/raw/start.ogg b/res/raw/start.ogg
index baa38ba..e08e155 100644
Binary files a/res/raw/start.ogg and b/res/raw/start.ogg differ
-- 
cgit v1.1