From 99633da90012dc732cbc12a96b33e17abcecb464 Mon Sep 17 00:00:00 2001 From: Michael Jurka Date: Wed, 27 Jul 2011 22:40:17 -0700 Subject: Fix bug where Launcher would appear all black Bug # 5033201 Change-Id: If88406fe1ad1d56469765d1783aeb6d73f28b192 --- src/com/android/launcher2/Launcher.java | 37 -------------------------------- src/com/android/launcher2/Workspace.java | 21 +++++++----------- 2 files changed, 8 insertions(+), 50 deletions(-) (limited to 'src/com/android') diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java index 0f302a012..1cf558bc5 100644 --- a/src/com/android/launcher2/Launcher.java +++ b/src/com/android/launcher2/Launcher.java @@ -212,12 +212,6 @@ public final class Launcher extends Activity private static HashMap sFolders = new HashMap(); - // Hotseats (quick-launch icons next to AllApps) - private String[] mHotseatConfig = null; - private Intent[] mHotseats = null; - private Drawable[] mHotseatIcons = null; - private CharSequence[] mHotseatLabels = null; - private Intent mAppMarketIntent = null; // Related to the auto-advancing of widgets @@ -436,16 +430,6 @@ public final class Launcher extends Activity } } - // Note: This doesn't do all the client-id magic that BrowserProvider does - // in Browser. (http://b/2425179) - private Uri getDefaultBrowserUri() { - String url = getString(R.string.default_browser_url); - if (url.indexOf("{CID}") != -1) { - url = url.replace("{CID}", "android-google"); - } - return Uri.parse(url); - } - /** * Returns whether we should delay spring loaded mode -- for shortcuts and widgets that have * a configuration step, this allows the proper animations to run after other transitions. @@ -1922,27 +1906,6 @@ public final class Launcher extends Activity showDialog(DIALOG_CREATE_SHORTCUT); } - private void pickShortcut() { - // Insert extra item to handle picking application - Bundle bundle = new Bundle(); - - ArrayList shortcutNames = new ArrayList(); - shortcutNames.add(getString(R.string.group_applications)); - bundle.putStringArrayList(Intent.EXTRA_SHORTCUT_NAME, shortcutNames); - - ArrayList shortcutIcons = new ArrayList(); - shortcutIcons.add(ShortcutIconResource.fromContext(Launcher.this, - R.drawable.ic_launcher_application)); - bundle.putParcelableArrayList(Intent.EXTRA_SHORTCUT_ICON_RESOURCE, shortcutIcons); - - Intent pickIntent = new Intent(Intent.ACTION_PICK_ACTIVITY); - pickIntent.putExtra(Intent.EXTRA_INTENT, new Intent(Intent.ACTION_CREATE_SHORTCUT)); - pickIntent.putExtra(Intent.EXTRA_TITLE, getText(R.string.title_select_shortcut)); - pickIntent.putExtras(bundle); - - startActivityForResult(pickIntent, REQUEST_PICK_SHORTCUT); - } - private class RenameFolder { private EditText mInput; diff --git a/src/com/android/launcher2/Workspace.java b/src/com/android/launcher2/Workspace.java index 23b8c2d99..e03f3294b 100644 --- a/src/com/android/launcher2/Workspace.java +++ b/src/com/android/launcher2/Workspace.java @@ -140,7 +140,6 @@ public class Workspace extends SmoothPagedView private int[] mTempEstimate = new int[2]; private float[] mDragViewVisualCenter = new float[2]; private float[] mTempDragCoordinates = new float[2]; - private float[] mTempTouchCoordinates = new float[2]; private float[] mTempCellLayoutCenterCoordinates = new float[2]; private float[] mTempDragBottomRightCoordinates = new float[2]; private Matrix mTempInverseMatrix = new Matrix(); @@ -1288,12 +1287,6 @@ public class Workspace extends SmoothPagedView } } - private boolean childLayersEnabled() { - boolean isSmallOrSpringloaded = - isSmall() || mIsSwitchingState || mState == State.SPRING_LOADED; - return isSmallOrSpringloaded || isPageMoving() || mIsDragOccuring; - } - private void updateChildrenLayersEnabled() { boolean small = isSmall() || mIsSwitchingState || mState == State.SPRING_LOADED; @@ -1711,6 +1704,14 @@ public class Workspace extends SmoothPagedView } void unshrink(boolean animated, boolean springLoaded) { + if (mFirstLayout) { + // (mFirstLayout == "first layout has not happened yet") + // cancel any pending shrinks that were set earlier + mSwitchStateAfterFirstLayout = false; + mStateAfterFirstLayout = State.NORMAL; + return; + } + if (isSmall()) { float finalScaleFactor = 1.0f; float finalBackgroundAlpha = 0.0f; @@ -2056,7 +2057,6 @@ public class Workspace extends SmoothPagedView final Bitmap b = createDragBitmap(child, new Canvas(), bitmapPadding); final int bmpWidth = b.getWidth(); - final int bmpHeight = b.getHeight(); mLauncher.getDragLayer().getLocationInDragLayer(child, mTempXY); final int dragLayerX = (int) mTempXY[0] + (child.getWidth() - bmpWidth) / 2; @@ -2776,8 +2776,6 @@ public class Workspace extends SmoothPagedView // Identify whether we have dragged over a side page if (isSmall()) { - int left = d.x - d.xOffset; - int top = d.y - d.yOffset; layout = findMatchingPageForDragOver(d.dragView, mDragViewVisualCenter[0], mDragViewVisualCenter[1], true); if (layout != mDragTargetLayout) { @@ -3107,7 +3105,6 @@ public class Workspace extends SmoothPagedView } public void resetTransitionTransform(CellLayout layout) { if (isSwitchingState()) { - int index = indexOfChild(layout); mCurrentScaleX = layout.getScaleX(); mCurrentScaleY = layout.getScaleY(); mCurrentTranslationX = layout.getTranslationX(); @@ -3338,7 +3335,6 @@ public class Workspace extends SmoothPagedView int count = layout.getChildCount(); for (int i = 0; i < count; i++) { View child = layout.getChildAt(i); - CellLayout.LayoutParams lp = (CellLayout.LayoutParams) child.getLayoutParams(); if (child instanceof Folder) { Folder f = (Folder) child; if (f.getInfo() == tag && f.getInfo().opened) { @@ -3378,7 +3374,6 @@ public class Workspace extends SmoothPagedView } void removeItems(final ArrayList apps) { - final int screenCount = getChildCount(); final AppWidgetManager widgets = AppWidgetManager.getInstance(getContext()); final HashSet packageNames = new HashSet(); -- cgit v1.2.3