New trash icon.
This commit is contained in:
Binary file not shown.
|
After Width: | Height: | Size: 2.0 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 2.0 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 1.6 KiB |
@@ -19,6 +19,6 @@
|
||||
-->
|
||||
|
||||
<transition xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item android:drawable="@drawable/delete_handle_normal" />
|
||||
<item android:drawable="@drawable/delete_handle" />
|
||||
<item android:drawable="@drawable/trashcan" />
|
||||
<item android:drawable="@drawable/trashcan_hover" />
|
||||
</transition>
|
||||
|
||||
@@ -63,13 +63,12 @@
|
||||
|
||||
<com.android.launcher2.DeleteZone
|
||||
android:id="@+id/delete_zone"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="49dip"
|
||||
android:layout_gravity="bottom|center_horizontal"
|
||||
|
||||
android:scaleType="center"
|
||||
android:src="@drawable/ic_delete"
|
||||
android:background="@drawable/delete_zone_selector"
|
||||
android:src="@drawable/delete_zone_selector"
|
||||
|
||||
android:visibility="invisible"
|
||||
|
||||
|
||||
@@ -74,7 +74,7 @@ public class DeleteZone extends ImageView implements DropTarget, DragController.
|
||||
@Override
|
||||
protected void onFinishInflate() {
|
||||
super.onFinishInflate();
|
||||
mTransition = (TransitionDrawable) getBackground();
|
||||
mTransition = (TransitionDrawable) getDrawable();
|
||||
}
|
||||
|
||||
public boolean acceptDrop(DragSource source, int x, int y, int xOffset, int yOffset,
|
||||
|
||||
@@ -1433,6 +1433,7 @@ public final class Launcher extends Activity
|
||||
}
|
||||
|
||||
if (mWorkspace.allowLongPress()) {
|
||||
Log.d(TAG, "there");
|
||||
mSwipeController.cancelSwipe();
|
||||
if (cellInfo.cell == null) {
|
||||
if (cellInfo.valid) {
|
||||
|
||||
@@ -95,7 +95,7 @@ public class Workspace extends ViewGroup implements DropTarget, DragSource, Drag
|
||||
private int[] mTempCell = new int[2];
|
||||
private int[] mTempEstimate = new int[2];
|
||||
|
||||
private boolean mAllowLongPress;
|
||||
private boolean mAllowLongPress = true;
|
||||
|
||||
private int mTouchSlop;
|
||||
private int mMaximumVelocity;
|
||||
|
||||
Reference in New Issue
Block a user