Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Addressing comments for change c4842c1193

Browse Source 
Change-Id: I4e9cf37aba287f079be18e5c2c25216e6fdd1396
This commit is contained in:
Svetoslav Ganov
2012-10-31 19:46:24 -07:00
parent 11952e73af
commit 45942ca052
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
policy/src/com/android/internal/policy/impl/keyguard/KeyguardWidgetPager.java
View File

@@ -137,18 +137,17 @@ public class KeyguardWidgetPager extends PagedView implements PagedView.PageSwit
newWidgetPage.onActive(true);
newWidgetPage.requestAccessibilityFocus();
}
if (mParent != null && AccessibilityManager.getInstance(mContext).isEnabled()) {
AccessibilityEvent event = AccessibilityEvent.obtain(
AccessibilityEvent.TYPE_VIEW_SCROLLED);
onInitializeAccessibilityEvent(event);
onPopulateAccessibilityEvent(event);
mParent.requestSendAccessibilityEvent(this, event);
}
}
if (mViewStateManager != null) {
mViewStateManager.onPageSwitch(newPage, newPageIndex);
}
if (mParent != null && AccessibilityManager.getInstance(mContext).isEnabled()) {
AccessibilityEvent event = AccessibilityEvent.obtain(
AccessibilityEvent.TYPE_VIEW_SCROLLED);
onInitializeAccessibilityEvent(event);
onPopulateAccessibilityEvent(event);
mParent.requestSendAccessibilityEvent(this, event);
}
}
@Override
@@ -267,7 +266,6 @@ public class KeyguardWidgetPager extends PagedView implements PagedView.PageSwit
content.getContentDescription());
frame.setContentDescription(contentDescription);
}
frame.setLongClickable(true);
}
/**

4
policy/src/com/android/internal/policy/impl/keyguard/PagedView.java
View File

@@ -1743,8 +1743,10 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc
}
protected void snapToPage(int whichPage, int delta, int duration, boolean immediate) {
mNextPage = whichPage;
View focusedChild = getFocusedChild();
if (focusedChild != null && focusedChild == getPageAt(mCurrentPage)) {
if (focusedChild != null && whichPage != mCurrentPage &&
focusedChild == getPageAt(mCurrentPage)) {
focusedChild.clearFocus();
}