Addressing comments for change c4842c11932ea4f60fe7ae09b0a59660207e1587 (45942ca0) · Commits · e / os / android_frameworks_base

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

+7 −9

Original line number	Diff line number	Diff line
		@@ -137,11 +137,6 @@ public class KeyguardWidgetPager extends PagedView implements PagedView.PageSwit
		newWidgetPage.onActive(true);
		newWidgetPage.requestAccessibilityFocus();
		}
		}
		if (mViewStateManager != null) {
		mViewStateManager.onPageSwitch(newPage, newPageIndex);
		}

		if (mParent != null && AccessibilityManager.getInstance(mContext).isEnabled()) {
		AccessibilityEvent event = AccessibilityEvent.obtain(
		AccessibilityEvent.TYPE_VIEW_SCROLLED);
		@@ -150,6 +145,10 @@ public class KeyguardWidgetPager extends PagedView implements PagedView.PageSwit
		mParent.requestSendAccessibilityEvent(this, event);
		}
		}
		if (mViewStateManager != null) {
		mViewStateManager.onPageSwitch(newPage, newPageIndex);
		}
		}

		@Override
		public void sendAccessibilityEvent(int eventType) {
		@@ -267,7 +266,6 @@ public class KeyguardWidgetPager extends PagedView implements PagedView.PageSwit
		content.getContentDescription());
		frame.setContentDescription(contentDescription);
		}
		frame.setLongClickable(true);
		}

		/**

+3 −1

Original line number	Diff line number	Diff line
		@@ -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();
		}