Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f3e03e23 authored by Svetoslav Ganov's avatar Svetoslav Ganov Committed by Android Git Automerger
Browse files

am dc564945: am 7ccb2806: am 5fff5f01: Merge "Make partially visible widget...

am dc564945: am 7ccb2806: am 5fff5f01: Merge "Make partially visible widget pages not important for accessibility." into jb-mr1-dev

* commit 'dc564945':
  Make partially visible widget pages not important for accessibility.
parents 37794c20 dc564945
Loading
Loading
Loading
Loading
+24 −0
Original line number Diff line number Diff line
@@ -183,6 +183,22 @@ public class KeyguardWidgetPager extends PagedView implements PagedView.PageSwit
        }
    }

    private void updateWidgetFramesImportantForAccessibility() {
        final int pageCount = getPageCount();
        for (int i = 0; i < pageCount; i++) {
            KeyguardWidgetFrame frame = getWidgetPageAt(i);
            updateWidgetFrameImportantForAccessibility(frame);
        }
    }

    private void updateWidgetFrameImportantForAccessibility(KeyguardWidgetFrame frame) {
        if (frame.getContentAlpha() <= 0) {
            frame.setImportantForAccessibility(View.IMPORTANT_FOR_ACCESSIBILITY_NO);
        } else {
            frame.setImportantForAccessibility(View.IMPORTANT_FOR_ACCESSIBILITY_YES);
        }
    }

    private void userActivity() {
        if (mCallbacks != null) {
            mCallbacks.onUserActivityTimeoutChanged();
@@ -308,6 +324,7 @@ public class KeyguardWidgetPager extends PagedView implements PagedView.PageSwit
                content.getContentDescription());
            frame.setContentDescription(contentDescription);
        }
        updateWidgetFrameImportantForAccessibility(frame);
    }

    /**
@@ -544,6 +561,12 @@ public class KeyguardWidgetPager extends PagedView implements PagedView.PageSwit
        }
    }

    @Override
    void setCurrentPage(int currentPage) {
        super.setCurrentPage(currentPage);
        updateWidgetFramesImportantForAccessibility();
    }

    @Override
    public void onAttachedToWindow() {
        super.onAttachedToWindow();
@@ -650,6 +673,7 @@ public class KeyguardWidgetPager extends PagedView implements PagedView.PageSwit
                if (!show) {
                    disablePageLayers();
                }
                updateWidgetFramesImportantForAccessibility();
            }
        });
        mChildrenOutlineFadeAnimation.start();