am 51f79a16: am c48ddc27: Talkback shoudn\'t announce Photo details twice. am: e3bc739bfaandroid-6.0.1_r9android-6.0.1_r81android-6.0.1_r80android-6.0.1_r8android-6.0.1_r79android-6.0.1_r78android-6.0.1_r77android-6.0.1_r74android-6.0.1_r73android-6.0.1_r72android-6.0.1_r70android-6.0.1_r7android-6.0.1_r69android-6.0.1_r66android-6.0.1_r65android-6.0.1_r61android-6.0.1_r60android-6.0.1_r59android-6.0.1_r58android-6.0.1_r57android-6.0.1_r56android-6.0.1_r52android-6.0.1_r51android-6.0.1_r50android-6.0.1_r49android-6.0.1_r48android-6.0.1_r47android-6.0.1_r46android-6.0.1_r43android-6.0.1_r42android-6.0.1_r41android-6.0.1_r40android-6.0.1_r30android-6.0.1_r3android-6.0.1_r28android-6.0.1_r27android-6.0.1_r26android-6.0.1_r20android-6.0.1_r17android-6.0.1_r13android-6.0.1_r12android-6.0.1_r11android-6.0.1_r10android-6.0.1_r1android-6.0.0_r41marshmallow-mr3-releasemarshmallow-mr2-releasemarshmallow-mr1-releasemarshmallow-mr1-dev

* commit '51f79a166340ceb9f6f1084fe1b90d591e19ec5e':
  Talkback shoudn't announce Photo details twice.

1 files changed, 5 insertions, 2 deletions

diff --git a/src/com/android/ex/photo/PhotoViewController.java b/src/com/android/ex/photo/PhotoViewController.java
index 9da1759..adca9ed 100644
--- a/src/com/android/ex/photo/PhotoViewController.java
+++ b/src/com/android/ex/photo/PhotoViewController.java
@@ -24,8 +24,8 @@ import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewPropertyAnimator;
-import android.view.WindowManager;
 import android.view.ViewTreeObserver.OnGlobalLayoutListener;
+import android.view.WindowManager;
 import android.view.accessibility.AccessibilityManager;
 import android.view.animation.AlphaAnimation;
 import android.view.animation.Animation;
@@ -197,6 +197,8 @@ public class PhotoViewController implements
     // text.
     private long mEnterFullScreenDelayTime;
 
+    private boolean isTitleAnnounced;
+
     public PhotoViewController(ActivityInterface activity) {
         mActivity = activity;
 
@@ -749,10 +751,11 @@ public class PhotoViewController implements
         int uriIndex = cursor.getColumnIndex(PhotoContract.PhotoViewColumns.URI);
         mCurrentPhotoUri = cursor.getString(uriIndex);
         updateActionBar();
-        if (mAccessibilityManager.isEnabled()) {
+        if (mAccessibilityManager.isEnabled() && isTitleAnnounced == false) {
             String announcement = getPhotoAccessibilityAnnouncement(position);
             if (announcement != null) {
                 Util.announceForAccessibility(mRootView, mAccessibilityManager, announcement);
+                isTitleAnnounced = true;
             }
         }