PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge change I478730f3 into eclair

Browse Source 
* changes:
  fix 2261526 - Trackball doesn't work in 3D all-apps if you opened it using trackball
This commit is contained in:
Android (Google) Code Review
2009-11-17 08:30:02 -08:00
parent 71a3228be6 478730f3c1
commit b40d29cb41
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/launcher2/AllAppsView.java
+8 -7
View File
@@ -326,7 +326,7 @@ public class AllAppsView extends RSSurfaceView
} }
} }
if (mArrowNavigation && iconCount > 0) { if (iconCount > 0) {
mArrowNavigation = true; mArrowNavigation = true;
int currentSelection = mRollo.mState.selectedIconIndex; int currentSelection = mRollo.mState.selectedIconIndex;
@@ -367,6 +367,8 @@ public class AllAppsView extends RSSurfaceView
} else if (currentTopRow > 0) { } else if (currentTopRow > 0) {
newSelection = currentSelection - Defines.COLUMNS_PER_PAGE; newSelection = currentSelection - Defines.COLUMNS_PER_PAGE;
mRollo.moveTo(newSelection / Defines.COLUMNS_PER_PAGE); mRollo.moveTo(newSelection / Defines.COLUMNS_PER_PAGE);
} else {
newSelection = Defines.COLUMNS_PER_PAGE * (Defines.ROWS_PER_PAGE-1);
} }
} }
handled = true; handled = true;
@@ -379,7 +381,11 @@ public class AllAppsView extends RSSurfaceView
if (mLastSelection != SELECTION_HOME) { if (mLastSelection != SELECTION_HOME) {
if (currentRow < rowCount-1) { if (currentRow < rowCount-1) {
mRollo.setHomeSelected(SELECTED_NONE); mRollo.setHomeSelected(SELECTED_NONE);
newSelection = currentSelection + Defines.COLUMNS_PER_PAGE; if (currentSelection < 0) {
newSelection = 0;
} else {
newSelection = currentSelection + Defines.COLUMNS_PER_PAGE;
}
if (newSelection >= iconCount) { if (newSelection >= iconCount) {
// Go from D to G in this arrangement: // Go from D to G in this arrangement:
// A B C D // A B C D
@@ -606,7 +612,6 @@ public class AllAppsView extends RSSurfaceView
break; break;
} }
if (text != null) { if (text != null) {
Log.d(TAG, "dispatchPopulateAccessibilityEvent setting text=" + text);
event.setEnabled(true); event.setEnabled(true);
event.getText().add(text); event.getText().add(text);
//event.setContentDescription(text); //event.setContentDescription(text);
@@ -642,8 +647,6 @@ public class AllAppsView extends RSSurfaceView
} }
public boolean isVisible() { public boolean isVisible() {
Log.d(TAG, "isVisible mZoomDirty=" + mZoomDirty
+ " mMessageProc=" + (mMessageProc == null ? "null" : mZoom));
return mZoom > 0.001f; return mZoom > 0.001f;
} }
@@ -1342,7 +1345,6 @@ public class AllAppsView extends RSSurfaceView
if (prev != index) { if (prev != index) {
if (info.title != null && info.title.length() > 0) { if (info.title != null && info.title.length() > 0) {
Log.d(TAG, "sendAccessibilityEvent SELECTION_ICONS " + info.title);
//setContentDescription(info.title); //setContentDescription(info.title);
sendAccessibilityEvent(AccessibilityEvent.TYPE_VIEW_SELECTED); sendAccessibilityEvent(AccessibilityEvent.TYPE_VIEW_SELECTED);
} }
@@ -1367,7 +1369,6 @@ public class AllAppsView extends RSSurfaceView
mLastSelection = SELECTION_HOME; mLastSelection = SELECTION_HOME;
mState.homeButtonId = mHomeButtonFocused.getID(); mState.homeButtonId = mHomeButtonFocused.getID();
if (prev != SELECTION_HOME) { if (prev != SELECTION_HOME) {
Log.d(TAG, "sendAccessibilityEvent SELECTION_HOME");
sendAccessibilityEvent(AccessibilityEvent.TYPE_VIEW_SELECTED); sendAccessibilityEvent(AccessibilityEvent.TYPE_VIEW_SELECTED);
} }
break; break;