diff --git a/src/com/android/launcher3/folder/Folder.java b/src/com/android/launcher3/folder/Folder.java index 5defef3889..e68e3c9164 100644 --- a/src/com/android/launcher3/folder/Folder.java +++ b/src/com/android/launcher3/folder/Folder.java @@ -680,6 +680,7 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo closeOpenFolder(openFolder); mContent.bindItems(items); + mContent.setCanAnnouncePageDescriptionForFolder(true); centerAboutIcon(); mItemsInvalidated = true; updateTextViewFocus(); @@ -813,6 +814,7 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo @Override protected void handleClose(boolean animate) { mIsOpen = false; + mContent.setCanAnnouncePageDescriptionForFolder(false); if (!animate && mCurrentAnimator != null && mCurrentAnimator.isRunning()) { mCurrentAnimator.cancel(); diff --git a/src/com/android/launcher3/folder/FolderPagedView.java b/src/com/android/launcher3/folder/FolderPagedView.java index fe261945a0..8d751e652c 100644 --- a/src/com/android/launcher3/folder/FolderPagedView.java +++ b/src/com/android/launcher3/folder/FolderPagedView.java @@ -100,6 +100,8 @@ public class FolderPagedView extends PagedView implements Cli // animating or is open. private boolean mViewsBound = false; + private boolean mCanAnnouncePageDescription; + public FolderPagedView(Context context, AttributeSet attrs) { this( context, @@ -170,6 +172,19 @@ public class FolderPagedView extends PagedView implements Cli mViewsBound = true; } + void setCanAnnouncePageDescriptionForFolder(boolean canAnnounce) { + mCanAnnouncePageDescription = canAnnounce; + } + + private boolean canAnnouncePageDescriptionForFolder() { + return mCanAnnouncePageDescription; + } + + @Override + protected boolean canAnnouncePageDescription() { + return super.canAnnouncePageDescription() && canAnnouncePageDescriptionForFolder(); + } + /** * Removes all the icons from the folder */