From 9d31e9fa3dedf7c51b407c1c5fafe5294fc3c01b Mon Sep 17 00:00:00 2001 From: Romain Guy Date: Wed, 11 Nov 2009 18:54:28 -0800 Subject: [PATCH] Shows all screens in the previews. Change-Id: Ib8b19492ccb07a135ba95ab75ae03f034275c572 --- .../{preview_popup.9.png => preview_bg.9.png} | Bin 4108 -> 4304 bytes res/drawable-hdpi/preview_bg_focus.9.png | Bin 0 -> 4515 bytes res/drawable-hdpi/preview_bg_press.9.png | Bin 0 -> 4509 bytes res/drawable/preview_background.xml | 22 +++++ src/com/android/launcher2/Launcher.java | 84 ++++++++++-------- 5 files changed, 67 insertions(+), 39 deletions(-) rename res/drawable-hdpi/{preview_popup.9.png => preview_bg.9.png} (62%) create mode 100644 res/drawable-hdpi/preview_bg_focus.9.png create mode 100644 res/drawable-hdpi/preview_bg_press.9.png create mode 100644 res/drawable/preview_background.xml diff --git a/res/drawable-hdpi/preview_popup.9.png b/res/drawable-hdpi/preview_bg.9.png similarity index 62% rename from res/drawable-hdpi/preview_popup.9.png rename to res/drawable-hdpi/preview_bg.9.png index c2dd07cf608bb9c19628e64aa37e7c70c656fb4c..5647144af89b2907652c4fbb63bcac01d292c004 100644 GIT binary patch delta 1607 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 P00000NkvXXu0mjf2(YXm diff --git a/res/drawable-hdpi/preview_bg_focus.9.png b/res/drawable-hdpi/preview_bg_focus.9.png new file mode 100644 index 0000000000000000000000000000000000000000..31200fdcd55419fd10b56b38404e62e57cc08dbf GIT binary patch literal 4515 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 BiJkxe literal 0 HcmV?d00001 diff --git a/res/drawable-hdpi/preview_bg_press.9.png b/res/drawable-hdpi/preview_bg_press.9.png new file mode 100644 index 0000000000000000000000000000000000000000..9cb12669ea385920e9a84e3d803dc255f2fb444f GIT binary patch literal 4509 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 vL8s!r6S2==`x}p88D>|%Ol + + + + + + + + diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java index 2242e6f25b..4ce73f6848 100644 --- a/src/com/android/launcher2/Launcher.java +++ b/src/com/android/launcher2/Launcher.java @@ -885,8 +885,6 @@ public final class Launcher extends Activity super.onSaveInstanceState(outState); } - final boolean isConfigurationChange = getChangingConfigurations() != 0; - // TODO should not do this if the drawer is currently closing. if (isAllAppsVisible()) { outState.putBoolean(RUNTIME_STATE_ALL_APPS_FOLDER, true); @@ -1511,23 +1509,26 @@ public final class Launcher extends Activity } @SuppressWarnings({"unchecked"}) - private void dismissPreview(View v) { - PopupWindow window = (PopupWindow) v.getTag(); + private void dismissPreview(final View v) { + final PopupWindow window = (PopupWindow) v.getTag(); if (window != null) { - window.setOnDismissListener(null); + window.setOnDismissListener(new PopupWindow.OnDismissListener() { + public void onDismiss() { + ViewGroup group = (ViewGroup) v.getTag(R.id.workspace); + int count = group.getChildCount(); + for (int i = 0; i < count; i++) { + ((ImageView) group.getChildAt(i)).setImageDrawable(null); + } + + ArrayList bitmaps = (ArrayList) v.getTag(R.id.icon); + for (Bitmap bitmap : bitmaps) bitmap.recycle(); + + v.setTag(R.id.workspace, null); + v.setTag(R.id.icon, null); + window.setOnDismissListener(null); + } + }); window.dismiss(); - - ViewGroup group = (ViewGroup) v.getTag(R.id.workspace); - int count = group.getChildCount(); - for (int i = 0; i < count; i++) { - ((ImageView) group.getChildAt(i)).setImageDrawable(null); - } - - ArrayList bitmaps = (ArrayList) v.getTag(R.id.icon); - for (Bitmap bitmap : bitmaps) bitmap.recycle(); - - v.setTag(R.id.workspace, null); - v.setTag(R.id.icon, null); } v.setTag(null); } @@ -1536,36 +1537,26 @@ public final class Launcher extends Activity int current = mWorkspace.getCurrentScreen(); if (current <= 0) return; - showPreviews(anchor, 0, current); + showPreviews(anchor, 0, mWorkspace.getChildCount()); } private void showNextPreview(View anchor) { int current = mWorkspace.getCurrentScreen(); if (current >= mWorkspace.getChildCount() - 1) return; - showPreviews(anchor, current + 1, mWorkspace.getChildCount()); - } - - @Override - public void onWindowFocusChanged(boolean hasFocus) { - super.onWindowFocusChanged(hasFocus); - - if (!hasFocus) { - dismissPreview(mPreviousView); - dismissPreview(mNextView); - } + showPreviews(anchor, 0, mWorkspace.getChildCount()); } private void showPreviews(final View anchor, int start, int end) { - Drawable d = getResources().getDrawable(R.drawable.preview_popup); + Resources resources = getResources(); Workspace workspace = mWorkspace; CellLayout cell = ((CellLayout) workspace.getChildAt(start)); - - float max = workspace.getChildCount() - 1; + + float max = workspace.getChildCount(); Rect r = new Rect(); - d.getPadding(r); + resources.getDrawable(R.drawable.preview_background).getPadding(r); int extraW = (int) ((r.left + r.right) * max); int extraH = r.top + r.bottom; @@ -1603,14 +1594,18 @@ public final class Launcher extends Activity c.translate(-cell.getLeftPadding(), -cell.getTopPadding()); cell.dispatchDraw(c); - image.setBackgroundDrawable(d); + image.setBackgroundDrawable(resources.getDrawable(R.drawable.preview_background)); image.setImageBitmap(bitmap); image.setTag(i); image.setOnClickListener(handler); - bitmaps.add(bitmap); + image.setOnFocusChangeListener(handler); + image.setFocusable(true); + if (i == mWorkspace.getCurrentScreen()) image.requestFocus(); preview.addView(image, - ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT); + LinearLayout.LayoutParams.WRAP_CONTENT, LinearLayout.LayoutParams.WRAP_CONTENT); + + bitmaps.add(bitmap); } PopupWindow p = new PopupWindow(this); @@ -1619,8 +1614,9 @@ public final class Launcher extends Activity p.setHeight((int) (sHeight + extraH)); p.setAnimationStyle(R.style.AnimationPreview); p.setOutsideTouchable(true); + p.setFocusable(true); p.setBackgroundDrawable(new ColorDrawable(0)); - p.showAsDropDown(anchor, 0, 0); + p.showAsDropDown(anchor, 0, 0); p.setOnDismissListener(new PopupWindow.OnDismissListener() { public void onDismiss() { @@ -1633,7 +1629,7 @@ public final class Launcher extends Activity anchor.setTag(R.id.icon, bitmaps); } - class PreviewTouchHandler implements View.OnClickListener { + class PreviewTouchHandler implements View.OnClickListener, Runnable, View.OnFocusChangeListener { private final View mAnchor; public PreviewTouchHandler(View anchor) { @@ -1642,7 +1638,17 @@ public final class Launcher extends Activity public void onClick(View v) { mWorkspace.snapToScreen((Integer) v.getTag()); - dismissPreview(mAnchor); + v.post(this); + } + + public void run() { + dismissPreview(mAnchor); + } + + public void onFocusChange(View v, boolean hasFocus) { + if (hasFocus) { + mWorkspace.snapToScreen((Integer) v.getTag()); + } } }