diff options
| author | Sunny Goyal <sunnygoyal@google.com> | 2014-09-04 15:19:36 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-09-04 15:19:36 +0000 |
| commit | 66205ce9ceb46a821c9a2d93745226d67f1b119a (patch) | |
| tree | 7f37f06cfdb036f9f4c243b63d8d32f630f9a171 /src/com/android/launcher3 | |
| parent | a3b8866c5e341e1c140ae0740bd7fcfea5b67f81 (diff) | |
| parent | 4cbf046bf9fd1b4a40563a960a758e0a02b90538 (diff) | |
| download | android_packages_apps_Trebuchet-66205ce9ceb46a821c9a2d93745226d67f1b119a.tar.gz android_packages_apps_Trebuchet-66205ce9ceb46a821c9a2d93745226d67f1b119a.tar.bz2 android_packages_apps_Trebuchet-66205ce9ceb46a821c9a2d93745226d67f1b119a.zip | |
Merge "Updating content of page description frequently." into ub-now-porkchop
Diffstat (limited to 'src/com/android/launcher3')
| -rw-r--r-- | src/com/android/launcher3/PagedView.java | 7 | ||||
| -rw-r--r-- | src/com/android/launcher3/Workspace.java | 3 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/com/android/launcher3/PagedView.java b/src/com/android/launcher3/PagedView.java index 0434faff5..48fc0c98f 100644 --- a/src/com/android/launcher3/PagedView.java +++ b/src/com/android/launcher3/PagedView.java @@ -594,8 +594,11 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc private void updatePageIndicator() { // Update the page indicator (when we aren't reordering) - if (mPageIndicator != null && !isReordering(false)) { - mPageIndicator.setActiveMarker(getNextPage()); + if (mPageIndicator != null) { + mPageIndicator.setContentDescription(getPageIndicatorDescription()); + if (!isReordering(false)) { + mPageIndicator.setActiveMarker(getNextPage()); + } } } protected void pageBeginMoving() { diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java index 732b9ba4a..2e966de0b 100644 --- a/src/com/android/launcher3/Workspace.java +++ b/src/com/android/launcher3/Workspace.java @@ -1266,9 +1266,6 @@ public class Workspace extends SmoothPagedView mLauncher.updateVoiceButtonProxyVisible(false); } } - if (getPageIndicator() != null) { - getPageIndicator().setContentDescription(getPageIndicatorDescription()); - } } protected CustomContentCallbacks getCustomContentCallbacks() { |