From 1fbc1c843170fe0c9326bb3ffd5bd9c5c599ca2e Mon Sep 17 00:00:00 2001
From: Romain Guy <romainguy@android.com>
Date: Mon, 9 Nov 2009 20:43:08 -0800
Subject: [PATCH] Add previews on long press on the indicators.

Change-Id: I6349d55345255caacc1381e83459544f8b8e085c
---
 res/anim/fade_in_fast.xml               |   2 +-
 res/anim/fade_out_fast.xml              |   2 +-
 res/drawable-hdpi/preview_popup.9.png   | Bin 0 -> 4047 bytes
 res/values/strings.xml                  |   2 +-
 res/values/styles.xml                   |   5 +
 src/com/android/launcher2/Launcher.java | 122 ++++++++++++++++++++++--
 6 files changed, 120 insertions(+), 13 deletions(-)
 create mode 100644 res/drawable-hdpi/preview_popup.9.png

diff --git a/res/anim/fade_in_fast.xml b/res/anim/fade_in_fast.xml
index 4fa9847aa8..5faef96ae2 100644
--- a/res/anim/fade_in_fast.xml
+++ b/res/anim/fade_in_fast.xml
@@ -20,4 +20,4 @@
     android:fromAlpha="0.0"
     android:toAlpha="1.0"
 
-    android:duration="@android:integer/config_mediumAnimTime" />
+    android:duration="@android:integer/config_shortAnimTime" />
diff --git a/res/anim/fade_out_fast.xml b/res/anim/fade_out_fast.xml
index a061a6ca9a..310e0078ea 100644
--- a/res/anim/fade_out_fast.xml
+++ b/res/anim/fade_out_fast.xml
@@ -20,4 +20,4 @@
     android:fromAlpha="1.0"
     android:toAlpha="0.0"
 
-    android:duration="@android:integer/config_mediumAnimTime" />
+    android:duration="@android:integer/config_shortAnimTime" />
diff --git a/res/drawable-hdpi/preview_popup.9.png b/res/drawable-hdpi/preview_popup.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..987f571fc1f17dc93aaef080e0a29fee4b400025
GIT binary patch
literal 4047
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
P#RRm}^kKECb`k#pb$yKT

literal 0
HcmV?d00001

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 3041ced3b6..c91e53384f 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -21,7 +21,7 @@
     <!-- General -->
     <skip />
     <!-- Application name -->
-    <string name="application_name">_Launcher2</string>
+    <string name="application_name">Launcher</string>
     <!-- Name for all applications running as this uid. -->
     <string name="uid_name">Android Core Apps</string>
     <!-- Default folder name -->
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 6c43c1ec88..125a1be156 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -22,6 +22,11 @@
         <item name="android:windowNoTitle">true</item>
     </style>
 
+    <style name="AnimationPreview">
+        <item name="android:windowEnterAnimation">@anim/fade_in_fast</item>
+        <item name="android:windowExitAnimation">@anim/fade_out_fast</item>
+    </style>
+    
     <style name="WorkspaceIcon">
         <item name="android:textSize">13dip</item>
         <item name="android:singleLine">true</item>
diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java
index 738793b6d8..e7a4a3c877 100644
--- a/src/com/android/launcher2/Launcher.java
+++ b/src/com/android/launcher2/Launcher.java
@@ -39,6 +39,7 @@ import android.content.res.Configuration;
 import android.content.res.Resources;
 import android.database.ContentObserver;
 import android.graphics.Bitmap;
+import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.os.Handler;
@@ -60,12 +61,14 @@ import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.MotionEvent;
 import android.view.View.OnLongClickListener;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.EditText;
 import android.widget.TextView;
 import android.widget.Toast;
 import android.widget.ImageView;
+import android.widget.PopupWindow;
 import android.appwidget.AppWidgetManager;
 import android.appwidget.AppWidgetProviderInfo;
 
@@ -80,7 +83,7 @@ import java.io.DataInputStream;
  * Default launcher application.
  */
 public final class Launcher extends Activity
-        implements View.OnClickListener, OnLongClickListener, LauncherModel.Callbacks {
+        implements View.OnClickListener, OnLongClickListener, LauncherModel.Callbacks, View.OnTouchListener, View.OnKeyListener {
     static final String LOG_TAG = "Launcher";
     static final String TAG = LOG_TAG;
     static final boolean LOGD = false;
@@ -193,6 +196,8 @@ public final class Launcher extends Activity
     private static HashMap<Long, FolderInfo> mFolders = new HashMap<Long, FolderInfo>();
 
     public static long lastStartTime;
+    private ImageView mPreviousView;
+    private ImageView mNextView;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -436,6 +441,8 @@ public final class Launcher extends Activity
             mExitingBecauseOfLaunch = false;
             closeAllApps(false);
         }
+        dismissPreview(mPreviousView);
+        dismissPreview(mNextView);
     }
 
     @Override
@@ -550,11 +557,21 @@ public final class Launcher extends Activity
         mHandleView = (HandleView) findViewById(R.id.all_apps_button);
         mHandleView.setLauncher(this);
         mHandleView.setOnClickListener(this);
-        
-        Drawable previous = ((ImageView) dragLayer.findViewById(R.id.previous_screen)).getDrawable();
-        Drawable next = ((ImageView) dragLayer.findViewById(R.id.next_screen)).getDrawable();
+
+        mPreviousView = (ImageView) dragLayer.findViewById(R.id.previous_screen);
+        mNextView = (ImageView) dragLayer.findViewById(R.id.next_screen);
+
+        Drawable previous = mPreviousView.getDrawable();
+        Drawable next = mNextView.getDrawable();
         mWorkspace.setIndicators(previous, next);
 
+        mPreviousView.setOnLongClickListener(this);
+        mPreviousView.setOnTouchListener(this);
+        mPreviousView.setOnKeyListener(this);
+        mNextView.setOnLongClickListener(this);
+        mNextView.setOnTouchListener(this);
+        mNextView.setOnKeyListener(this);
+
         workspace.setOnLongClickListener(this);
         workspace.setDragController(dragController);
         workspace.setLauncher(this);
@@ -921,6 +938,9 @@ public final class Launcher extends Activity
         AppInfoCache.unbindDrawables();
 
         getContentResolver().unregisterContentObserver(mWidgetObserver);
+        
+        dismissPreview(mPreviousView);
+        dismissPreview(mNextView);        
     }
 
     @Override
@@ -1450,6 +1470,15 @@ public final class Launcher extends Activity
     }
 
     public boolean onLongClick(View v) {
+        switch (v.getId()) {
+            case R.id.previous_screen:
+                showPreviousPreview(v);
+                return true;
+            case R.id.next_screen:
+                showNextPreview(v);
+                return true;
+        }
+
         if (isWorkspaceLocked()) {
             return false;
         }
@@ -1482,6 +1511,85 @@ public final class Launcher extends Activity
         return true;
     }
 
+    public boolean onKey(View v, int keyCode, KeyEvent event) {
+        if (event.getAction() == KeyEvent.ACTION_UP) {
+            dismissPreview(v);
+        }
+        return false;
+    }
+
+    public boolean onTouch(View v, MotionEvent event) {
+        if (event.getAction() == MotionEvent.ACTION_UP) {
+            dismissPreview(v);
+        }
+        return false;
+    }
+
+    private void dismissPreview(View v) {
+        PopupWindow window = (PopupWindow) v.getTag();
+        if (window != null) {
+            window.dismiss();
+            ((ImageView) v.getTag(R.id.workspace)).setImageBitmap(null);
+            ((Bitmap) v.getTag(R.id.icon)).recycle();
+
+            v.setTag(R.id.workspace, null);
+            v.setTag(R.id.icon, null);
+        }
+        v.setTag(null);
+    }
+
+    private void showPreviousPreview(View anchor) {
+        int current = mWorkspace.getCurrentScreen();
+        if (current <= 0) return;
+
+        View previous = mWorkspace.getChildAt(current - 1);
+        showPreview(anchor, previous);
+    }
+
+    private void showNextPreview(View anchor) {
+        int current = mWorkspace.getCurrentScreen();
+        if (current >= mWorkspace.getChildCount() - 1) return;
+
+        View next = mWorkspace.getChildAt(current + 1);
+        showPreview(anchor, next);
+    }
+
+    private void showPreview(View anchor, View source) {
+        boolean cacheEnabled = source.isDrawingCacheEnabled();
+        source.setDrawingCacheEnabled(true);
+        source.buildDrawingCache();
+
+        Bitmap cache = source.getDrawingCache();
+        if (cache == null) return;
+
+        Bitmap bitmap = Bitmap.createScaledBitmap(cache,
+                (int) (cache.getWidth() / 2.5f), (int) (cache.getHeight() / 2.5f), true);
+
+        ImageView preview = new ImageView(this);
+        preview.setImageBitmap(bitmap);
+        Drawable d = getResources().getDrawable(R.drawable.preview_popup);
+        preview.setBackgroundDrawable(d);
+
+        Rect r = new Rect();
+        d.getPadding(r);
+        int extraW = r.left + r.right;
+        int extraH = r.top + r.bottom;
+
+        PopupWindow p = new PopupWindow(preview, bitmap.getWidth() + extraW,
+                bitmap.getHeight() + extraH);
+        p.setWindowLayoutMode(ViewGroup.LayoutParams.WRAP_CONTENT,
+                ViewGroup.LayoutParams.WRAP_CONTENT);
+        p.setAnimationStyle(R.style.AnimationPreview);
+        p.showAsDropDown(anchor, 0, 0);
+
+        source.destroyDrawingCache();
+        if (!cacheEnabled) source.setDrawingCacheEnabled(cacheEnabled);
+
+        anchor.setTag(p);
+        anchor.setTag(R.id.workspace, preview);
+        anchor.setTag(R.id.icon, bitmap);        
+    }
+
     View getDrawerHandle() {
         return mHandleView;
     }
@@ -1490,12 +1598,6 @@ public final class Launcher extends Activity
         return mWorkspace;
     }
 
-    /* TODO
-    GridView getApplicationsGrid() {
-        return mAllAppsGrid;
-    }
-    */
-
     @Override
     protected Dialog onCreateDialog(int id) {
         switch (id) {