Merge pull request #164 from benetech/FBR-387--fix-auto-play-when-pau…

…sed- FBR 387 fix auto play when paused
benetech · Nov 12, 2015 · a3d5ab7 · a3d5ab7
2 parents 5d21c2a + 9d1e0c2
commit a3d5ab7
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 6 deletions.
diff --git a/FBReader/src/main/java/org/accessibility/SimpleGestureFilter.java b/FBReader/src/main/java/org/accessibility/SimpleGestureFilter.java
@@ -159,7 +159,7 @@ public boolean onSingleTapConfirmed(MotionEvent arg0) {
     }
 
 
-    public static interface SimpleGestureListener {
+    public interface SimpleGestureListener {
         void onSwipe(int direction);
 
         void onDoubleTap();

diff --git a/...r/src/main/java/org/geometerplus/android/fbreader/benetech/FBReaderWithNavigationBar.java b/...r/src/main/java/org/geometerplus/android/fbreader/benetech/FBReaderWithNavigationBar.java
@@ -578,16 +578,20 @@ private void enablePauseButton() {
     private void changePlayPauseButtonState(final boolean isPlayButton) {
         runOnUiThread(new Runnable() {
             public void run() {
-                if (accessibilityManager.isEnabled())
-                    return;
-
                 ImageButton playButton = (ImageButton) findViewById(R.id.navigation_bar_play);
-                final int resourceIdForButton = getPlayButtonImageResource(isPlayButton);
-                playButton.setImageResource(resourceIdForButton);
+                playButton.setImageResource(getPlayButtonImageResource(isPlayButton));
+                playButton.setContentDescription(getString(getPlayButtonContentDescription(isPlayButton)));
             }
         });
     }
 
+    private int getPlayButtonContentDescription(boolean isPlayButton) {
+        if (isPlayButton)
+            return R.string.content_description_play;
+
+        return R.string.content_description_pause;
+    }
+
     private int getPlayButtonImageResource(boolean isPlayButton) {
         if (isPlayButton)
             return R.drawable.ic_play_arrow_white_24dp;

diff --git a/FBReader/src/main/res/values/strings.xml b/FBReader/src/main/res/values/strings.xml
@@ -164,4 +164,7 @@
     <string name="tab_label_page">Page</string>
     <string name="tab_label_bookmark">Bookmark</string>
 
+    <string name="content_description_play">play</string>
+    <string name="content_description_pause">pause</string>
+
 </resources>