diff --git a/res/drawable-hdpi/focused_application_background.9.png b/res/drawable-hdpi/focused_application_background.9.png index 01c83c37f5..7bf37efed5 100644 Binary files a/res/drawable-hdpi/focused_application_background.9.png and b/res/drawable-hdpi/focused_application_background.9.png differ diff --git a/res/drawable-hdpi/pressed_application_background.9.png b/res/drawable-hdpi/pressed_application_background.9.png index c7d0bd4006..291af02269 100644 Binary files a/res/drawable-hdpi/pressed_application_background.9.png and b/res/drawable-hdpi/pressed_application_background.9.png differ diff --git a/res/drawable-mdpi/focused_application_background.9.png b/res/drawable-mdpi/focused_application_background.9.png index 341a80b47c..17ee6ea1b1 100644 Binary files a/res/drawable-mdpi/focused_application_background.9.png and b/res/drawable-mdpi/focused_application_background.9.png differ diff --git a/res/drawable-mdpi/pressed_application_background.9.png b/res/drawable-mdpi/pressed_application_background.9.png index 4b00eec8c5..b09f595b78 100644 Binary files a/res/drawable-mdpi/pressed_application_background.9.png and b/res/drawable-mdpi/pressed_application_background.9.png differ diff --git a/res/drawable-xlarge-hdpi/all_apps_button_normal.9.png b/res/drawable-xlarge-hdpi/all_apps_button_normal.9.png deleted file mode 100644 index 8aea26e5f4..0000000000 Binary files a/res/drawable-xlarge-hdpi/all_apps_button_normal.9.png and /dev/null differ diff --git a/res/drawable-xlarge-hdpi/all_apps_button_pressed.9.png b/res/drawable-xlarge-hdpi/all_apps_button_pressed.9.png deleted file mode 100644 index 587f1f1aa8..0000000000 Binary files a/res/drawable-xlarge-hdpi/all_apps_button_pressed.9.png and /dev/null differ diff --git a/res/drawable-xlarge-hdpi/configure_button_normal.png b/res/drawable-xlarge-hdpi/configure_button_normal.png deleted file mode 100644 index 48ae0b2978..0000000000 Binary files a/res/drawable-xlarge-hdpi/configure_button_normal.png and /dev/null differ diff --git a/res/drawable-xlarge-hdpi/configure_button_pressed.png b/res/drawable-xlarge-hdpi/configure_button_pressed.png deleted file mode 100644 index 54dea70fd0..0000000000 Binary files a/res/drawable-xlarge-hdpi/configure_button_pressed.png and /dev/null differ diff --git a/res/drawable-xlarge-hdpi/info_button.png b/res/drawable-xlarge-hdpi/info_button.png deleted file mode 100644 index e9ed1b12f2..0000000000 Binary files a/res/drawable-xlarge-hdpi/info_button.png and /dev/null differ diff --git a/res/drawable-xlarge-mdpi/all_apps_button_normal.9.png b/res/drawable-xlarge-mdpi/all_apps_button_normal.9.png deleted file mode 100644 index a423145846..0000000000 Binary files a/res/drawable-xlarge-mdpi/all_apps_button_normal.9.png and /dev/null differ diff --git a/res/drawable-xlarge-mdpi/all_apps_button_pressed.9.png b/res/drawable-xlarge-mdpi/all_apps_button_pressed.9.png deleted file mode 100644 index 5dbe77c770..0000000000 Binary files a/res/drawable-xlarge-mdpi/all_apps_button_pressed.9.png and /dev/null differ diff --git a/res/drawable-xlarge-mdpi/configure_button_normal.png b/res/drawable-xlarge-mdpi/configure_button_normal.png deleted file mode 100644 index 9b37efff72..0000000000 Binary files a/res/drawable-xlarge-mdpi/configure_button_normal.png and /dev/null differ diff --git a/res/drawable-xlarge-mdpi/configure_button_pressed.png b/res/drawable-xlarge-mdpi/configure_button_pressed.png deleted file mode 100644 index 5f38db6007..0000000000 Binary files a/res/drawable-xlarge-mdpi/configure_button_pressed.png and /dev/null differ diff --git a/res/drawable-xlarge-mdpi/ic_home_add_holo_dark.png b/res/drawable-xlarge-mdpi/ic_home_add_holo_dark.png new file mode 100644 index 0000000000..d3ab3ad1a5 Binary files /dev/null and b/res/drawable-xlarge-mdpi/ic_home_add_holo_dark.png differ diff --git a/res/drawable-xlarge-mdpi/info_button.png b/res/drawable-xlarge-mdpi/info_button.png deleted file mode 100644 index 253cdf74b6..0000000000 Binary files a/res/drawable-xlarge-mdpi/info_button.png and /dev/null differ diff --git a/res/drawable-xlarge/all_apps_button.xml b/res/drawable-xlarge/all_apps_button.xml deleted file mode 100644 index 46bc63203e..0000000000 --- a/res/drawable-xlarge/all_apps_button.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - diff --git a/res/drawable-xlarge/configure_button.xml b/res/drawable-xlarge/configure_button.xml deleted file mode 100644 index ac87290341..0000000000 --- a/res/drawable-xlarge/configure_button.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - diff --git a/res/drawable-xlarge/delete_zone_selector.xml b/res/drawable-xlarge/delete_zone_selector.xml new file mode 100644 index 0000000000..e2b37f4dcc --- /dev/null +++ b/res/drawable-xlarge/delete_zone_selector.xml @@ -0,0 +1,24 @@ + + + + + + + diff --git a/res/layout-xlarge-land/all_apps_tabbed.xml b/res/layout-xlarge-land/all_apps_tabbed.xml index bb30c11a04..e1a37ff144 100644 --- a/res/layout-xlarge-land/all_apps_tabbed.xml +++ b/res/layout-xlarge-land/all_apps_tabbed.xml @@ -39,7 +39,7 @@ android:layout_centerVertical="true"> + - + + - - - 90dip 180dip - 10dip - - 20dip + 8dip + + 48dip + 8dip + 16dip 50dip diff --git a/src/com/android/launcher2/ApplicationInfoDropTarget.java b/src/com/android/launcher2/ApplicationInfoDropTarget.java index fdcbbd4782..2ee3501954 100644 --- a/src/com/android/launcher2/ApplicationInfoDropTarget.java +++ b/src/com/android/launcher2/ApplicationInfoDropTarget.java @@ -16,16 +16,18 @@ package com.android.launcher2; +import com.android.launcher.R; + import android.animation.Animator; -import android.animation.Animator.AnimatorListener; +import android.animation.AnimatorSet; import android.animation.ObjectAnimator; +import android.animation.Animator.AnimatorListener; import android.content.ComponentName; import android.content.Context; import android.graphics.PorterDuff; import android.graphics.PorterDuffColorFilter; import android.util.AttributeSet; - -import com.android.launcher.R; +import android.view.View; /** * Implements a DropTarget which allows applications to be dropped on it, @@ -35,8 +37,9 @@ public class ApplicationInfoDropTarget extends IconDropTarget { private static final int sFadeInAnimationDuration = 200; private static final int sFadeOutAnimationDuration = 100; - private ObjectAnimator mFadeAnimator; + private AnimatorSet mFadeAnimator; private ObjectAnimator mHandleFadeAnimator; + private boolean mHandleWasVisibleOnDragStart; public ApplicationInfoDropTarget(Context context, AttributeSet attrs) { this(context, attrs, 0); @@ -87,13 +90,25 @@ public class ApplicationInfoDropTarget extends IconDropTarget { if (mActive) { // Fade in this icon if (mFadeAnimator != null) mFadeAnimator.cancel(); - mFadeAnimator = ObjectAnimator.ofFloat(this, "alpha", 0.0f, 1.0f); - mFadeAnimator.setDuration(sFadeInAnimationDuration); + mFadeAnimator = new AnimatorSet(); + Animator infoButtonAnimator = ObjectAnimator.ofFloat(this, "alpha", 0.0f, 1.0f); + infoButtonAnimator.setDuration(sFadeInAnimationDuration); + + if (mHandle == mLauncher.findViewById(R.id.configure_button)) { + final View divider = mLauncher.findViewById(R.id.divider_during_drag); + divider.setVisibility(VISIBLE); + Animator dividerAnimator = ObjectAnimator.ofFloat(divider, "alpha", 1.0f); + dividerAnimator.setDuration(sFadeInAnimationDuration); + mFadeAnimator.play(infoButtonAnimator).with(dividerAnimator); + } else { + mFadeAnimator.play(infoButtonAnimator); + } mFadeAnimator.start(); setVisibility(VISIBLE); // Fade out the handle if (mHandle != null) { + mHandleWasVisibleOnDragStart = mHandle.getVisibility() == VISIBLE; if (mHandleFadeAnimator != null) mHandleFadeAnimator.cancel(); mHandleFadeAnimator = ObjectAnimator.ofFloat(mHandle, "alpha", 0.0f); mHandleFadeAnimator.setDuration(sFadeOutAnimationDuration); @@ -123,8 +138,12 @@ public class ApplicationInfoDropTarget extends IconDropTarget { // Fade out this icon if (mFadeAnimator != null) mFadeAnimator.cancel(); - mFadeAnimator = ObjectAnimator.ofFloat(this, "alpha", 0.0f); - mFadeAnimator.setDuration(sFadeOutAnimationDuration); + mFadeAnimator = new AnimatorSet(); + Animator infoButtonAnimator = ObjectAnimator.ofFloat(this, "alpha", 0.0f); + infoButtonAnimator.setDuration(sFadeOutAnimationDuration); + final View divider = mLauncher.findViewById(R.id.divider_during_drag); + divider.setVisibility(VISIBLE); + Animator dividerAnimator = ObjectAnimator.ofFloat(divider, "alpha", 0.0f); mFadeAnimator.addListener(new AnimatorListener() { public void onAnimationStart(Animator animation) {} public void onAnimationRepeat(Animator animation) {} @@ -136,13 +155,15 @@ public class ApplicationInfoDropTarget extends IconDropTarget { } private void onEndOrCancel() { setVisibility(GONE); + divider.setVisibility(GONE); mFadeAnimator = null; } }); + mFadeAnimator.play(infoButtonAnimator).with(dividerAnimator); mFadeAnimator.start(); // Fade in the handle - if (mHandle != null) { + if (mHandle != null && mHandleWasVisibleOnDragStart) { if (mHandleFadeAnimator != null) mHandleFadeAnimator.cancel(); mHandleFadeAnimator = ObjectAnimator.ofFloat(mHandle, "alpha", 1.0f); mHandleFadeAnimator.setDuration(sFadeInAnimationDuration); diff --git a/src/com/android/launcher2/CustomizePagedView.java b/src/com/android/launcher2/CustomizePagedView.java index cfc15d1cf8..5672921723 100644 --- a/src/com/android/launcher2/CustomizePagedView.java +++ b/src/com/android/launcher2/CustomizePagedView.java @@ -599,8 +599,6 @@ public class CustomizePagedView extends PagedViewWithDraggableItems * in the customize drawer. */ private Drawable parseWallpaperPreviewXml(ComponentName component, ResolveInfo ri) { - Drawable d = null; - ActivityInfo activityInfo = ri.activityInfo; XmlResourceParser parser = null; try { diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java index 130cb7653a..bf72add66d 100644 --- a/src/com/android/launcher2/Launcher.java +++ b/src/com/android/launcher2/Launcher.java @@ -2572,23 +2572,27 @@ public final class Launcher extends Activity private void hideAndShowToolbarButtons(State newState, AnimatorSet showSeq, AnimatorSet hideSeq) { final View searchButton = findViewById(R.id.search_button_cluster); final View allAppsButton = findViewById(R.id.all_apps_button); + final View divider = findViewById(R.id.divider); final View configureButton = findViewById(R.id.configure_button); switch (newState) { case WORKSPACE: hideOrShowToolbarButton(true, searchButton, showSeq); hideOrShowToolbarButton(true, allAppsButton, showSeq); + hideOrShowToolbarButton(true, divider, showSeq); hideOrShowToolbarButton(true, configureButton, showSeq); mDeleteZone.setHandle(allAppsButton); break; case ALL_APPS: hideOrShowToolbarButton(false, configureButton, hideSeq); hideOrShowToolbarButton(false, searchButton, hideSeq); + hideOrShowToolbarButton(false, divider, hideSeq); hideOrShowToolbarButton(false, allAppsButton, hideSeq); break; case CUSTOMIZE: hideOrShowToolbarButton(false, allAppsButton, hideSeq); hideOrShowToolbarButton(false, searchButton, hideSeq); + hideOrShowToolbarButton(false, divider, hideSeq); hideOrShowToolbarButton(false, configureButton, hideSeq); mDeleteZone.setHandle(allAppsButton); break;