Fix drawing order bug
Bug: 5031335
Gallery could return an invalid index leading to a NPE
The override for getDrawingOrder appears unnecessary for
how we are using gallery, so removing it entirely
Change-Id: I931cc2db6e601a00941c23585b57664607f4e519
diff --git a/src/com/android/browser/view/Gallery.java b/src/com/android/browser/view/Gallery.java
index aa6ed65..0c73537 100644
--- a/src/com/android/browser/view/Gallery.java
+++ b/src/com/android/browser/view/Gallery.java
@@ -1196,24 +1196,6 @@
}
@Override
- protected int getChildDrawingOrder(int childCount, int i) {
- int selectedIndex = mSelectedPosition - mFirstPosition;
- // Just to be safe
- if (selectedIndex < 0)
- return i;
- if (i == childCount - 1) {
- // Draw the selected child last
- return selectedIndex;
- } else if (i >= selectedIndex) {
- // Move the children to the right of the selected child earlier one
- return i + 1;
- } else {
- // Keep the children to the left of the selected child the same
- return i;
- }
- }
-
- @Override
protected void onFocusChanged(boolean gainFocus, int direction,
Rect previouslyFocusedRect) {
super.onFocusChanged(gainFocus, direction, previouslyFocusedRect);