diff options
| author | Sunny Goyal <sunnygoyal@google.com> | 2014-08-28 16:19:39 -0700 |
|---|---|---|
| committer | Sunny Goyal <sunnygoyal@google.com> | 2014-08-28 16:21:22 -0700 |
| commit | 4cbf046bf9fd1b4a40563a960a758e0a02b90538 (patch) | |
| tree | 4a7410b637e96febe98626077e0d0a9db9b9cdf5 /src/com/android/launcher3 | |
| parent | d750f8b3f78b2038b61974140ac340314ae52619 (diff) | |
| download | android_packages_apps_Trebuchet-4cbf046bf9fd1b4a40563a960a758e0a02b90538.tar.gz android_packages_apps_Trebuchet-4cbf046bf9fd1b4a40563a960a758e0a02b90538.tar.bz2 android_packages_apps_Trebuchet-4cbf046bf9fd1b4a40563a960a758e0a02b90538.zip | |
Updating content of page description frequently.
> Removing unused search icon page indicator
issue: 17256565
Change-Id: I95158cf68f98b2af847cefb4d126468b908301e2
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 9d9730617..f19cad5d2 100644 --- a/src/com/android/launcher3/Workspace.java +++ b/src/com/android/launcher3/Workspace.java @@ -1274,9 +1274,6 @@ public class Workspace extends SmoothPagedView mLauncher.updateVoiceButtonProxyVisible(false); } } - if (getPageIndicator() != null) { - getPageIndicator().setContentDescription(getPageIndicatorDescription()); - } } protected CustomContentCallbacks getCustomContentCallbacks() { |