drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* 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
parent 04f5c8cb95 5c58a916f6
commit 3ef8f64d3f
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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