Addressing comments for change c4842c1

Change-Id: I4e9cf37aba287f079be18e5c2c25216e6fdd1396

Author: sganov

policy/src/com/android/internal/policy/impl/keyguard/KeyguardWidgetPager.java

@@ -137,18 +137,17 @@ public void onPageSwitch(View newPage, int newPageIndex) {
                 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 void addWidget(View widget, int pageIndex) {
                 content.getContentDescription());
             frame.setContentDescription(contentDescription);
         }
-        frame.setLongClickable(true);
     }
 
     /**

policy/src/com/android/internal/policy/impl/keyguard/PagedView.java

@@ -1743,8 +1743,10 @@ protected void snapToPage(int whichPage, int delta, int duration) {
     }
     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();
         }