diff options
| -rw-r--r-- | policy/src/com/android/internal/policy/impl/keyguard/KeyguardWidgetPager.java | 16 | ||||
| -rw-r--r-- | policy/src/com/android/internal/policy/impl/keyguard/PagedView.java | 4 |
2 files changed, 10 insertions, 10 deletions
diff --git a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardWidgetPager.java b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardWidgetPager.java index f3d9a0a66615..b0235732fb04 100644 --- a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardWidgetPager.java +++ b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardWidgetPager.java @@ -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); } /** diff --git a/policy/src/com/android/internal/policy/impl/keyguard/PagedView.java b/policy/src/com/android/internal/policy/impl/keyguard/PagedView.java index a6ae84daafef..6eeada54d665 100644 --- a/policy/src/com/android/internal/policy/impl/keyguard/PagedView.java +++ b/policy/src/com/android/internal/policy/impl/keyguard/PagedView.java @@ -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(); } |