merge in jb-mr1-release history after reset to jb-mr1-dev
diff --git a/src/com/android/contacts/list/ContactTileAdapter.java b/src/com/android/contacts/list/ContactTileAdapter.java
index 75e3149..0a13e0b 100644
--- a/src/com/android/contacts/list/ContactTileAdapter.java
+++ b/src/com/android/contacts/list/ContactTileAdapter.java
@@ -515,6 +515,9 @@
super(context);
mItemViewType = itemViewType;
mLayoutResId = getLayoutResourceId(mItemViewType);
+
+ // Remove row (but not children) from accessibility node tree.
+ setImportantForAccessibility(View.IMPORTANT_FOR_ACCESSIBILITY_NO);
}
/**
@@ -654,14 +657,6 @@
}
setMeasuredDimension(width, imageSize + getChildAt(0).getPaddingBottom());
}
-
- @Override
- public void sendAccessibilityEvent(int eventType) {
- // This method is called when the child tile is INVISIBLE (meaning "empty"), and the
- // Accessibility Manager needs to find alternative content description to speak.
- // Here, we ignore the default behavior, since we don't want to let the manager speak
- // a contact name for the tile next to the INVISIBLE tile.
- }
}
/**
