diff options
58 files changed, 52 insertions, 39 deletions
diff --git a/res/drawable-hdpi/app_market_generic.png b/res/drawable-hdpi/app_market_generic.png Binary files differdeleted file mode 100644 index 117453c..0000000 --- a/res/drawable-hdpi/app_market_generic.png +++ /dev/null diff --git a/res/drawable-hdpi/default_widget_preview_holo.9.png b/res/drawable-hdpi/default_widget_preview_holo.9.png Binary files differnew file mode 100644 index 0000000..ecf5deb --- /dev/null +++ b/res/drawable-hdpi/default_widget_preview_holo.9.png diff --git a/res/drawable-hdpi/gardening_crosshairs.png b/res/drawable-hdpi/gardening_crosshairs.png Binary files differindex 409bb5d..5f83592 100644 --- a/res/drawable-hdpi/gardening_crosshairs.png +++ b/res/drawable-hdpi/gardening_crosshairs.png diff --git a/res/drawable-hdpi/homescreen_blue_normal_holo.9.png b/res/drawable-hdpi/homescreen_blue_normal_holo.9.png Binary files differnew file mode 100644 index 0000000..ece2afd --- /dev/null +++ b/res/drawable-hdpi/homescreen_blue_normal_holo.9.png diff --git a/res/drawable-hdpi/homescreen_blue_strong_holo.9.png b/res/drawable-hdpi/homescreen_blue_strong_holo.9.png Binary files differnew file mode 100644 index 0000000..3407107 --- /dev/null +++ b/res/drawable-hdpi/homescreen_blue_strong_holo.9.png diff --git a/res/drawable-hdpi/homescreen_green_normal_holo.9.png b/res/drawable-hdpi/homescreen_green_normal_holo.9.png Binary files differnew file mode 100644 index 0000000..7332c3b --- /dev/null +++ b/res/drawable-hdpi/homescreen_green_normal_holo.9.png diff --git a/res/drawable-hdpi/homescreen_green_strong_holo.9.png b/res/drawable-hdpi/homescreen_green_strong_holo.9.png Binary files differnew file mode 100644 index 0000000..190c6cc --- /dev/null +++ b/res/drawable-hdpi/homescreen_green_strong_holo.9.png diff --git a/res/drawable-hdpi/homescreen_large_blue.9.png b/res/drawable-hdpi/homescreen_large_blue.9.png Binary files differdeleted file mode 100644 index 416514d..0000000 --- a/res/drawable-hdpi/homescreen_large_blue.9.png +++ /dev/null diff --git a/res/drawable-hdpi/homescreen_large_blue_strong.9.png b/res/drawable-hdpi/homescreen_large_blue_strong.9.png Binary files differdeleted file mode 100644 index d7e32e7..0000000 --- a/res/drawable-hdpi/homescreen_large_blue_strong.9.png +++ /dev/null diff --git a/res/drawable-hdpi/homescreen_large_green.9.png b/res/drawable-hdpi/homescreen_large_green.9.png Binary files differdeleted file mode 100644 index 60042c2..0000000 --- a/res/drawable-hdpi/homescreen_large_green.9.png +++ /dev/null diff --git a/res/drawable-hdpi/homescreen_large_green_strong.9.png b/res/drawable-hdpi/homescreen_large_green_strong.9.png Binary files differdeleted file mode 100644 index c40b98e..0000000 --- a/res/drawable-hdpi/homescreen_large_green_strong.9.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_home_delete_holo_dark.png b/res/drawable-hdpi/ic_home_delete_holo_dark.png Binary files differdeleted file mode 100644 index 9d64278..0000000 --- a/res/drawable-hdpi/ic_home_delete_holo_dark.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_home_delete_hover_holo_dark.png b/res/drawable-hdpi/ic_home_delete_hover_holo_dark.png Binary files differdeleted file mode 100644 index 60d5b15..0000000 --- a/res/drawable-hdpi/ic_home_delete_hover_holo_dark.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_home_info_holo_dark.png b/res/drawable-hdpi/ic_home_info_holo_dark.png Binary files differdeleted file mode 100644 index 02df4e1..0000000 --- a/res/drawable-hdpi/ic_home_info_holo_dark.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_launcher_info_active_holo.png b/res/drawable-hdpi/ic_launcher_info_active_holo.png Binary files differnew file mode 100644 index 0000000..83ca112 --- /dev/null +++ b/res/drawable-hdpi/ic_launcher_info_active_holo.png diff --git a/res/drawable-hdpi/ic_launcher_info_normal_holo.png b/res/drawable-hdpi/ic_launcher_info_normal_holo.png Binary files differnew file mode 100644 index 0000000..25fb1ac --- /dev/null +++ b/res/drawable-hdpi/ic_launcher_info_normal_holo.png diff --git a/res/drawable-hdpi/ic_launcher_market_holo.png b/res/drawable-hdpi/ic_launcher_market_holo.png Binary files differnew file mode 100644 index 0000000..dc78251 --- /dev/null +++ b/res/drawable-hdpi/ic_launcher_market_holo.png diff --git a/res/drawable-hdpi/ic_launcher_trashcan_active_holo.png b/res/drawable-hdpi/ic_launcher_trashcan_active_holo.png Binary files differnew file mode 100644 index 0000000..51f0298 --- /dev/null +++ b/res/drawable-hdpi/ic_launcher_trashcan_active_holo.png diff --git a/res/drawable-hdpi/ic_launcher_trashcan_normal_holo.png b/res/drawable-hdpi/ic_launcher_trashcan_normal_holo.png Binary files differnew file mode 100644 index 0000000..27a4b5e --- /dev/null +++ b/res/drawable-hdpi/ic_launcher_trashcan_normal_holo.png diff --git a/res/drawable-hdpi/page_hover_left.9.png b/res/drawable-hdpi/page_hover_left.9.png Binary files differdeleted file mode 100644 index 1bf1565..0000000 --- a/res/drawable-hdpi/page_hover_left.9.png +++ /dev/null diff --git a/res/drawable-hdpi/page_hover_left_holo.9.png b/res/drawable-hdpi/page_hover_left_holo.9.png Binary files differnew file mode 100644 index 0000000..0f405a5 --- /dev/null +++ b/res/drawable-hdpi/page_hover_left_holo.9.png diff --git a/res/drawable-hdpi/page_hover_right.9.png b/res/drawable-hdpi/page_hover_right.9.png Binary files differdeleted file mode 100644 index 7995f69..0000000 --- a/res/drawable-hdpi/page_hover_right.9.png +++ /dev/null diff --git a/res/drawable-hdpi/page_hover_right_holo.9.png b/res/drawable-hdpi/page_hover_right_holo.9.png Binary files differnew file mode 100644 index 0000000..b7b4c56 --- /dev/null +++ b/res/drawable-hdpi/page_hover_right_holo.9.png diff --git a/res/drawable-mdpi/app_market_generic.png b/res/drawable-mdpi/app_market_generic.png Binary files differdeleted file mode 100644 index 6eb5497..0000000 --- a/res/drawable-mdpi/app_market_generic.png +++ /dev/null diff --git a/res/drawable-mdpi/default_widget_preview.9.png b/res/drawable-mdpi/default_widget_preview.9.png Binary files differdeleted file mode 100644 index ed9c6ee..0000000 --- a/res/drawable-mdpi/default_widget_preview.9.png +++ /dev/null diff --git a/res/drawable-mdpi/default_widget_preview_holo.9.png b/res/drawable-mdpi/default_widget_preview_holo.9.png Binary files differnew file mode 100644 index 0000000..d8e1196 --- /dev/null +++ b/res/drawable-mdpi/default_widget_preview_holo.9.png diff --git a/res/drawable-mdpi/gardening_crosshairs.png b/res/drawable-mdpi/gardening_crosshairs.png Binary files differindex 338c832..2845fe4 100644 --- a/res/drawable-mdpi/gardening_crosshairs.png +++ b/res/drawable-mdpi/gardening_crosshairs.png diff --git a/res/drawable-mdpi/homescreen_blue_normal_holo.9.png b/res/drawable-mdpi/homescreen_blue_normal_holo.9.png Binary files differnew file mode 100644 index 0000000..fef82bb --- /dev/null +++ b/res/drawable-mdpi/homescreen_blue_normal_holo.9.png diff --git a/res/drawable-mdpi/homescreen_blue_strong_holo.9.png b/res/drawable-mdpi/homescreen_blue_strong_holo.9.png Binary files differnew file mode 100644 index 0000000..fdd9dbb --- /dev/null +++ b/res/drawable-mdpi/homescreen_blue_strong_holo.9.png diff --git a/res/drawable-mdpi/homescreen_green_normal_holo.9.png b/res/drawable-mdpi/homescreen_green_normal_holo.9.png Binary files differnew file mode 100644 index 0000000..dad34d8 --- /dev/null +++ b/res/drawable-mdpi/homescreen_green_normal_holo.9.png diff --git a/res/drawable-mdpi/homescreen_green_strong_holo.9.png b/res/drawable-mdpi/homescreen_green_strong_holo.9.png Binary files differnew file mode 100644 index 0000000..901bf4c --- /dev/null +++ b/res/drawable-mdpi/homescreen_green_strong_holo.9.png diff --git a/res/drawable-mdpi/homescreen_large_blue.9.png b/res/drawable-mdpi/homescreen_large_blue.9.png Binary files differdeleted file mode 100644 index 5e7e61f..0000000 --- a/res/drawable-mdpi/homescreen_large_blue.9.png +++ /dev/null diff --git a/res/drawable-mdpi/homescreen_large_green.9.png b/res/drawable-mdpi/homescreen_large_green.9.png Binary files differdeleted file mode 100644 index 2f83bac..0000000 --- a/res/drawable-mdpi/homescreen_large_green.9.png +++ /dev/null diff --git a/res/drawable-mdpi/homescreen_large_green_strong.9.png b/res/drawable-mdpi/homescreen_large_green_strong.9.png Binary files differdeleted file mode 100644 index 1e14502..0000000 --- a/res/drawable-mdpi/homescreen_large_green_strong.9.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_home_delete_holo_dark.png b/res/drawable-mdpi/ic_home_delete_holo_dark.png Binary files differdeleted file mode 100644 index 647fd80..0000000 --- a/res/drawable-mdpi/ic_home_delete_holo_dark.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_home_delete_hover_holo_dark.png b/res/drawable-mdpi/ic_home_delete_hover_holo_dark.png Binary files differdeleted file mode 100644 index 06b62e2..0000000 --- a/res/drawable-mdpi/ic_home_delete_hover_holo_dark.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_home_info_holo_dark.png b/res/drawable-mdpi/ic_home_info_holo_dark.png Binary files differdeleted file mode 100644 index c34f443..0000000 --- a/res/drawable-mdpi/ic_home_info_holo_dark.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_launcher_info_active_holo.png b/res/drawable-mdpi/ic_launcher_info_active_holo.png Binary files differnew file mode 100644 index 0000000..d05de74 --- /dev/null +++ b/res/drawable-mdpi/ic_launcher_info_active_holo.png diff --git a/res/drawable-mdpi/ic_launcher_info_normal_holo.png b/res/drawable-mdpi/ic_launcher_info_normal_holo.png Binary files differnew file mode 100644 index 0000000..6a07cc9 --- /dev/null +++ b/res/drawable-mdpi/ic_launcher_info_normal_holo.png diff --git a/res/drawable-mdpi/ic_launcher_market_holo.png b/res/drawable-mdpi/ic_launcher_market_holo.png Binary files differnew file mode 100644 index 0000000..cacb374 --- /dev/null +++ b/res/drawable-mdpi/ic_launcher_market_holo.png diff --git a/res/drawable-mdpi/ic_launcher_trashcan_active_holo.png b/res/drawable-mdpi/ic_launcher_trashcan_active_holo.png Binary files differnew file mode 100644 index 0000000..244fe27 --- /dev/null +++ b/res/drawable-mdpi/ic_launcher_trashcan_active_holo.png diff --git a/res/drawable-mdpi/ic_launcher_trashcan_normal_holo.png b/res/drawable-mdpi/ic_launcher_trashcan_normal_holo.png Binary files differnew file mode 100644 index 0000000..bd5db08 --- /dev/null +++ b/res/drawable-mdpi/ic_launcher_trashcan_normal_holo.png diff --git a/res/drawable-mdpi/page_hover_left.9.png b/res/drawable-mdpi/page_hover_left.9.png Binary files differdeleted file mode 100644 index 5d5e0c8..0000000 --- a/res/drawable-mdpi/page_hover_left.9.png +++ /dev/null diff --git a/res/drawable-mdpi/page_hover_left_holo.9.png b/res/drawable-mdpi/page_hover_left_holo.9.png Binary files differnew file mode 100644 index 0000000..b9368fb --- /dev/null +++ b/res/drawable-mdpi/page_hover_left_holo.9.png diff --git a/res/drawable-mdpi/page_hover_right.9.png b/res/drawable-mdpi/page_hover_right.9.png Binary files differdeleted file mode 100644 index 1545bfe..0000000 --- a/res/drawable-mdpi/page_hover_right.9.png +++ /dev/null diff --git a/res/drawable-mdpi/page_hover_right_holo.9.png b/res/drawable-mdpi/page_hover_right_holo.9.png Binary files differnew file mode 100644 index 0000000..53ba807 --- /dev/null +++ b/res/drawable-mdpi/page_hover_right_holo.9.png diff --git a/res/drawable/delete_zone_selector.xml b/res/drawable/delete_target_selector.xml index e2b37f4..229942e 100644 --- a/res/drawable/delete_zone_selector.xml +++ b/res/drawable/delete_target_selector.xml @@ -19,6 +19,6 @@ --> <transition xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:drawable="@drawable/ic_home_delete_holo_dark" /> - <item android:drawable="@drawable/ic_home_delete_hover_holo_dark" /> + <item android:drawable="@drawable/ic_launcher_trashcan_normal_holo" /> + <item android:drawable="@drawable/ic_launcher_trashcan_active_holo" /> </transition> diff --git a/res/drawable/info_target_selector.xml b/res/drawable/info_target_selector.xml new file mode 100644 index 0000000..f3a7016 --- /dev/null +++ b/res/drawable/info_target_selector.xml @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** +** Copyright 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. +*/ +--> + +<transition xmlns:android="http://schemas.android.com/apk/res/android"> + <item android:drawable="@drawable/ic_launcher_info_normal_holo" /> + <item android:drawable="@drawable/ic_launcher_info_active_holo" /> +</transition> diff --git a/res/layout-large/button_bar.xml b/res/layout-large/button_bar.xml index a060761..8d7f5df 100644 --- a/res/layout-large/button_bar.xml +++ b/res/layout-large/button_bar.xml @@ -136,7 +136,7 @@ android:id="@+id/delete_zone" android:text="@string/delete_zone_label_workspace" android:drawablePadding="@dimen/delete_zone_drawable_padding" - android:drawableLeft="@drawable/delete_zone_selector" + android:drawableLeft="@drawable/delete_target_selector" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignRight="@+id/configure_button" diff --git a/res/layout-large/qsb_bar.xml b/res/layout-large/qsb_bar.xml index 421ace2..b600eda 100644 --- a/res/layout-large/qsb_bar.xml +++ b/res/layout-large/qsb_bar.xml @@ -113,7 +113,7 @@ style="@style/DropTargetButton" android:id="@+id/delete_target_text" android:text="@string/delete_zone_label_workspace" - android:drawableLeft="@drawable/delete_zone_selector" /> + android:drawableLeft="@drawable/delete_target_selector" /> </com.android.launcher2.DeleteDropTarget> <com.android.launcher2.InfoDropTarget @@ -125,7 +125,7 @@ style="@style/DropTargetButton" android:id="@+id/info_target_text" android:text="@string/info_target_label" - android:drawableLeft="@drawable/ic_home_info_holo_dark" /> + android:drawableLeft="@drawable/info_target_selector" /> </com.android.launcher2.InfoDropTarget> </LinearLayout> </com.android.launcher2.SearchDropTargetBar> diff --git a/res/layout/qsb_bar.xml b/res/layout/qsb_bar.xml index cb97b01..21043b4 100644 --- a/res/layout/qsb_bar.xml +++ b/res/layout/qsb_bar.xml @@ -74,7 +74,7 @@ style="@style/DropTargetButton" android:id="@+id/delete_target_text" android:text="@string/delete_zone_label_workspace" - android:drawableLeft="@drawable/delete_zone_selector" /> + android:drawableLeft="@drawable/delete_target_selector" /> </com.android.launcher2.DeleteDropTarget> <com.android.launcher2.InfoDropTarget @@ -86,7 +86,7 @@ style="@style/DropTargetButton" android:id="@+id/info_target_text" android:text="@string/info_target_label" - android:drawableLeft="@drawable/ic_home_info_holo_dark" /> + android:drawableLeft="@drawable/info_target_selector" /> </com.android.launcher2.InfoDropTarget> </LinearLayout> </com.android.launcher2.SearchDropTargetBar> diff --git a/res/values/colors.xml b/res/values/colors.xml index fd7b21c..ae73b04 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -20,8 +20,8 @@ <resources> <!-- The color tints to apply to the text and drag view when hovering over the delete target or the info target --> - <color name="delete_target_hover_tint">#D4FF3600</color> - <color name="info_target_hover_tint">#D40078FF</color> + <color name="delete_target_hover_tint">#DAFF0000</color> + <color name="info_target_hover_tint">#DA0099CC</color> <color name="window_background">#FF191919</color> <color name="grid_dark_background">#EB191919</color> diff --git a/src/com/android/launcher2/AppsCustomizePagedView.java b/src/com/android/launcher2/AppsCustomizePagedView.java index 35ca3e9..2a4af44 100644 --- a/src/com/android/launcher2/AppsCustomizePagedView.java +++ b/src/com/android/launcher2/AppsCustomizePagedView.java @@ -204,7 +204,7 @@ public class AppsCustomizePagedView extends PagedViewWithDraggableItems implemen // Save the default widget preview background Resources resources = context.getResources(); - mDefaultWidgetBackground = resources.getDrawable(R.drawable.default_widget_preview); + mDefaultWidgetBackground = resources.getDrawable(R.drawable.default_widget_preview_holo); mAppIconSize = getResources().getDimensionPixelSize(R.dimen.app_icon_size); TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.PagedView, 0, 0); diff --git a/src/com/android/launcher2/CellLayout.java b/src/com/android/launcher2/CellLayout.java index 99d62ae..a9cdb87 100644 --- a/src/com/android/launcher2/CellLayout.java +++ b/src/com/android/launcher2/CellLayout.java @@ -163,9 +163,9 @@ public class CellLayout extends ViewGroup { final Resources res = getResources(); - mNormalBackground = res.getDrawable(R.drawable.homescreen_large_blue); - mActiveBackground = res.getDrawable(R.drawable.homescreen_large_green); - mActiveGlowBackground = res.getDrawable(R.drawable.homescreen_large_green_strong); + mNormalBackground = res.getDrawable(R.drawable.homescreen_blue_normal_holo); + mActiveBackground = res.getDrawable(R.drawable.homescreen_green_normal_holo); + mActiveGlowBackground = res.getDrawable(R.drawable.homescreen_green_strong_holo); mNormalBackgroundMini = res.getDrawable(R.drawable.homescreen_small_blue); mNormalGlowBackgroundMini = res.getDrawable(R.drawable.homescreen_small_blue_strong); diff --git a/src/com/android/launcher2/DeleteDropTarget.java b/src/com/android/launcher2/DeleteDropTarget.java index a30c03e..6e01bc0 100644 --- a/src/com/android/launcher2/DeleteDropTarget.java +++ b/src/com/android/launcher2/DeleteDropTarget.java @@ -16,16 +16,14 @@ package com.android.launcher2; -import android.animation.ObjectAnimator; import android.content.Context; import android.content.res.Configuration; import android.content.res.Resources; -import android.graphics.Color; import android.graphics.PorterDuff; import android.graphics.PorterDuffColorFilter; +import android.graphics.drawable.TransitionDrawable; import android.util.AttributeSet; import android.view.View; -import android.view.ViewGroup; import android.widget.TextView; import com.android.launcher.R; @@ -33,6 +31,7 @@ import com.android.launcher.R; public class DeleteDropTarget extends ButtonDropTarget { private TextView mText; + private TransitionDrawable mDrawable; private int mHoverColor = 0xFFFF0000; public DeleteDropTarget(Context context, AttributeSet attrs) { @@ -55,8 +54,8 @@ public class DeleteDropTarget extends ButtonDropTarget { mHoverColor = r.getColor(R.color.delete_target_hover_tint); mHoverPaint.setColorFilter(new PorterDuffColorFilter( mHoverColor, PorterDuff.Mode.SRC_ATOP)); - setBackgroundColor(mHoverColor); - getBackground().setAlpha(0); + mDrawable = (TransitionDrawable) mText.getCompoundDrawables()[0]; + mDrawable.setCrossFadeEnabled(true); // Remove the text in the Phone UI in landscape int orientation = getResources().getConfiguration().orientation; @@ -127,18 +126,13 @@ public class DeleteDropTarget extends ButtonDropTarget { public void onDragEnter(DragObject d) { super.onDragEnter(d); - ObjectAnimator anim = ObjectAnimator.ofInt(getBackground(), "alpha", - Color.alpha(mHoverColor)); - anim.setDuration(mTransitionDuration); - anim.start(); + mDrawable.startTransition(mTransitionDuration); } public void onDragExit(DragObject d) { super.onDragExit(d); - ObjectAnimator anim = ObjectAnimator.ofInt(getBackground(), "alpha", 0); - anim.setDuration(mTransitionDuration); - anim.start(); + mDrawable.resetTransition(); } public void onDrop(DragObject d) { diff --git a/src/com/android/launcher2/InfoDropTarget.java b/src/com/android/launcher2/InfoDropTarget.java index 76a6bf9..c7812e3 100644 --- a/src/com/android/launcher2/InfoDropTarget.java +++ b/src/com/android/launcher2/InfoDropTarget.java @@ -16,14 +16,13 @@ package com.android.launcher2; -import android.animation.ObjectAnimator; import android.content.ComponentName; import android.content.Context; import android.content.res.Configuration; import android.content.res.Resources; -import android.graphics.Color; import android.graphics.PorterDuff; import android.graphics.PorterDuffColorFilter; +import android.graphics.drawable.TransitionDrawable; import android.util.AttributeSet; import android.view.View; import android.widget.TextView; @@ -33,6 +32,7 @@ import com.android.launcher.R; public class InfoDropTarget extends ButtonDropTarget { private TextView mText; + private TransitionDrawable mDrawable; private int mHoverColor = 0xFF0000FF; public InfoDropTarget(Context context, AttributeSet attrs) { @@ -54,8 +54,8 @@ public class InfoDropTarget extends ButtonDropTarget { mHoverColor = r.getColor(R.color.info_target_hover_tint); mHoverPaint.setColorFilter(new PorterDuffColorFilter( mHoverColor, PorterDuff.Mode.SRC_ATOP)); - setBackgroundColor(mHoverColor); - getBackground().setAlpha(0); + mDrawable = (TransitionDrawable) mText.getCompoundDrawables()[0]; + mDrawable.setCrossFadeEnabled(true); // Remove the text in the Phone UI in landscape int orientation = getResources().getConfiguration().orientation; @@ -109,17 +109,12 @@ public class InfoDropTarget extends ButtonDropTarget { public void onDragEnter(DragObject d) { super.onDragEnter(d); - ObjectAnimator anim = ObjectAnimator.ofInt(getBackground(), "alpha", - Color.alpha(mHoverColor)); - anim.setDuration(mTransitionDuration); - anim.start(); + mDrawable.startTransition(mTransitionDuration); } public void onDragExit(DragObject d) { super.onDragExit(d); - ObjectAnimator anim = ObjectAnimator.ofInt(getBackground(), "alpha", 0); - anim.setDuration(mTransitionDuration); - anim.start(); + mDrawable.resetTransition(); } } diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java index 0fb24f6..0a57185 100644 --- a/src/com/android/launcher2/Launcher.java +++ b/src/com/android/launcher2/Launcher.java @@ -2809,7 +2809,7 @@ public final class Launcher extends Activity if (activityName != null) { mAppMarketIntent = intent; sAppMarketIcon = updateTextButtonWithIconFromExternalActivity( - R.id.market_button, activityName, R.drawable.app_market_generic); + R.id.market_button, activityName, R.drawable.ic_launcher_market_holo); marketButton.setVisibility(View.VISIBLE); // Remove the shop icon text in the Phone UI diff --git a/src/com/android/launcher2/Workspace.java b/src/com/android/launcher2/Workspace.java index 2b799ee..e1e26a1 100644 --- a/src/com/android/launcher2/Workspace.java +++ b/src/com/android/launcher2/Workspace.java @@ -1240,11 +1240,11 @@ public class Workspace extends SmoothPagedView final CellLayout rightPage = (CellLayout) getChildAt(mCurrentPage + 1); if (leftPage != null && leftPage.getIsDragOverlapping()) { - final Drawable d = getResources().getDrawable(R.drawable.page_hover_left); + final Drawable d = getResources().getDrawable(R.drawable.page_hover_left_holo); d.setBounds(mScrollX, padding, mScrollX + d.getIntrinsicWidth(), height - padding); d.draw(canvas); } else if (rightPage != null && rightPage.getIsDragOverlapping()) { - final Drawable d = getResources().getDrawable(R.drawable.page_hover_right); + final Drawable d = getResources().getDrawable(R.drawable.page_hover_right_holo); d.setBounds(mScrollX + width - d.getIntrinsicWidth(), padding, mScrollX + width, height - padding); d.draw(canvas); } |
