Remove STOPSHIPs and a bit of debug logging
Bug: 3396875 Change-Id: I3e874e28c3412aadd9851000a83d69fc8c06aeb9
This commit is contained in:
parent
b672234a0d
commit
c540b57263
|
@ -82,6 +82,8 @@
|
||||||
<uses-permission
|
<uses-permission
|
||||||
android:name="com.android.email.permission.ACCESS_PROVIDER"/>
|
android:name="com.android.email.permission.ACCESS_PROVIDER"/>
|
||||||
|
|
||||||
|
<!-- Note: Actually, android:hardwareAccelerated could be "true", but in order to switch it
|
||||||
|
on/off in the debug screen, we have to set it "false" here and enable it at runtime. -->
|
||||||
<application
|
<application
|
||||||
android:icon="@mipmap/icon"
|
android:icon="@mipmap/icon"
|
||||||
android:label="@string/app_name"
|
android:label="@string/app_name"
|
||||||
|
@ -89,7 +91,6 @@
|
||||||
android:theme="@android:style/Theme.Holo.Light"
|
android:theme="@android:style/Theme.Holo.Light"
|
||||||
android:hardwareAccelerated="false"
|
android:hardwareAccelerated="false"
|
||||||
>
|
>
|
||||||
<!-- STOPSHIP android:hardwareAccelerated should be "true" -->
|
|
||||||
<activity
|
<activity
|
||||||
android:name=".activity.Welcome"
|
android:name=".activity.Welcome"
|
||||||
>
|
>
|
||||||
|
|
|
@ -47,7 +47,6 @@
|
||||||
<color name="combined_view_account_color_9">#ff9d50a4</color>
|
<color name="combined_view_account_color_9">#ff9d50a4</color>
|
||||||
|
|
||||||
<!-- Drop target colors -->
|
<!-- Drop target colors -->
|
||||||
<!-- STOPSHIP Replace with final colors -->
|
|
||||||
<color name="mailbox_drop_unavailable_fg_color">#ff999999</color>
|
<color name="mailbox_drop_unavailable_fg_color">#ff999999</color>
|
||||||
<color name="mailbox_drop_available_bg_color">#00ffffff</color>
|
<color name="mailbox_drop_available_bg_color">#00ffffff</color>
|
||||||
<color name="mailbox_drop_destructive_bg_color">#fff10000</color>
|
<color name="mailbox_drop_destructive_bg_color">#fff10000</color>
|
||||||
|
|
|
@ -467,7 +467,7 @@ public class MailboxListFragment extends ListFragment implements OnItemClickList
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* STOPSHIP: Very preliminary scrolling code
|
* Called while dragging; highlight possible drop targets, and autoscroll the list.
|
||||||
*/
|
*/
|
||||||
private void onDragLocation(DragEvent event) {
|
private void onDragLocation(DragEvent event) {
|
||||||
// The drag is somewhere in the ListView
|
// The drag is somewhere in the ListView
|
||||||
|
@ -505,13 +505,19 @@ public class MailboxListFragment extends ListFragment implements OnItemClickList
|
||||||
onDragExited();
|
onDragExited();
|
||||||
return;
|
return;
|
||||||
} else if (newTarget.mMailboxType == Mailbox.TYPE_TRASH) {
|
} else if (newTarget.mMailboxType == Mailbox.TYPE_TRASH) {
|
||||||
Log.d("onDragLocation", "=== Mailbox " + newTarget.mMailboxId + " TRASH");
|
if (DEBUG_DRAG_DROP) {
|
||||||
|
Log.d("onDragLocation", "=== Mailbox " + newTarget.mMailboxId + " TRASH");
|
||||||
|
}
|
||||||
newTarget.setBackgroundColor(sDropTrashColor);
|
newTarget.setBackgroundColor(sDropTrashColor);
|
||||||
} else if (newTarget.isDropTarget(mDragItemMailboxId)) {
|
} else if (newTarget.isDropTarget(mDragItemMailboxId)) {
|
||||||
Log.d("onDragLocation", "=== Mailbox " + newTarget.mMailboxId + " TARGET");
|
if (DEBUG_DRAG_DROP) {
|
||||||
|
Log.d("onDragLocation", "=== Mailbox " + newTarget.mMailboxId + " TARGET");
|
||||||
|
}
|
||||||
newTarget.setBackgroundDrawable(sDropActiveDrawable);
|
newTarget.setBackgroundDrawable(sDropActiveDrawable);
|
||||||
} else {
|
} else {
|
||||||
Log.d("onDragLocation", "=== Mailbox " + newTarget.mMailboxId + " (CALL)");
|
if (DEBUG_DRAG_DROP) {
|
||||||
|
Log.d("onDragLocation", "=== Mailbox " + newTarget.mMailboxId + " (CALL)");
|
||||||
|
}
|
||||||
targetAdapterPosition = NO_DROP_TARGET;
|
targetAdapterPosition = NO_DROP_TARGET;
|
||||||
newTarget.setDropTargetBackground(true, mDragItemMailboxId);
|
newTarget.setDropTargetBackground(true, mDragItemMailboxId);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue