Merge tag 'android-6.0.1_r3' into 601r3
Android 6.0.1 release 3
* tag 'android-6.0.1_r3':
Talkback shoudn't announce Photo details twice.
Change-Id: Ie9c30dc007c3f6c32f344c7b1fb3afba9227b82a
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.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 @@
// text.
private long mEnterFullScreenDelayTime;
+ private boolean isTitleAnnounced;
+
public PhotoViewController(ActivityInterface activity) {
mActivity = activity;
@@ -749,10 +751,11 @@
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;
}
}