am 5c58a916: Merge "Fix missing clock in keyguard" into jb-mr2-dev

* commit '5c58a916f6b10652af02aa357ceb70ba2cd18363':
  Fix missing clock in keyguard
This commit is contained in:
Jim Miller
2013-04-10 17:22:20 -07:00
committed by Android Git Automerger
2 changed files with 10 additions and 3 deletions

View File

@ -594,13 +594,12 @@ public class KeyguardWidgetPager extends PagedView implements PagedView.PageSwit
animateOutlinesAndSidePages(false); animateOutlinesAndSidePages(false);
} }
public void showInitialPageHints() { void updateChildrenContentAlpha(float sidePageAlpha) {
mShowingInitialHints = true;
int count = getChildCount(); int count = getChildCount();
for (int i = 0; i < count; i++) { for (int i = 0; i < count; i++) {
KeyguardWidgetFrame child = getWidgetPageAt(i); KeyguardWidgetFrame child = getWidgetPageAt(i);
if (i != mCurrentPage) { if (i != mCurrentPage) {
child.setBackgroundAlpha(KeyguardWidgetFrame.OUTLINE_ALPHA_MULTIPLIER); child.setBackgroundAlpha(sidePageAlpha);
child.setContentAlpha(0f); child.setContentAlpha(0f);
} else { } else {
child.setBackgroundAlpha(0f); child.setBackgroundAlpha(0f);
@ -609,9 +608,15 @@ public class KeyguardWidgetPager extends PagedView implements PagedView.PageSwit
} }
} }
public void showInitialPageHints() {
mShowingInitialHints = true;
updateChildrenContentAlpha(KeyguardWidgetFrame.OUTLINE_ALPHA_MULTIPLIER);
}
@Override @Override
void setCurrentPage(int currentPage) { void setCurrentPage(int currentPage) {
super.setCurrentPage(currentPage); super.setCurrentPage(currentPage);
updateChildrenContentAlpha(0.0f);
updateWidgetFramesImportantForAccessibility(); updateWidgetFramesImportantForAccessibility();
} }

View File

@ -756,6 +756,8 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc
@Override @Override
public void onChildViewRemoved(View parent, View child) { public void onChildViewRemoved(View parent, View child) {
mForceScreenScrolled = true; mForceScreenScrolled = true;
invalidate();
invalidateCachedOffsets();
} }
protected void invalidateCachedOffsets() { protected void invalidateCachedOffsets() {