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 | |
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
-rw-r--r-- | res/drawable-hdpi/custom_content_page.png | bin | 1353 -> 0 bytes | |||
-rw-r--r-- | res/drawable-mdpi/custom_content_page.png | bin | 1227 -> 0 bytes | |||
-rw-r--r-- | res/drawable-xhdpi/custom_content_page.png | bin | 1297 -> 0 bytes | |||
-rw-r--r-- | res/layout/custom_content_page_indicator_marker.xml | 39 | ||||
-rw-r--r-- | src/com/android/launcher3/PagedView.java | 7 | ||||
-rw-r--r-- | src/com/android/launcher3/Workspace.java | 3 |
6 files changed, 5 insertions, 44 deletions
diff --git a/res/drawable-hdpi/custom_content_page.png b/res/drawable-hdpi/custom_content_page.png Binary files differdeleted file mode 100644 index 9eef50c92..000000000 --- a/res/drawable-hdpi/custom_content_page.png +++ /dev/null diff --git a/res/drawable-mdpi/custom_content_page.png b/res/drawable-mdpi/custom_content_page.png Binary files differdeleted file mode 100644 index cc4005ded..000000000 --- a/res/drawable-mdpi/custom_content_page.png +++ /dev/null diff --git a/res/drawable-xhdpi/custom_content_page.png b/res/drawable-xhdpi/custom_content_page.png Binary files differdeleted file mode 100644 index e1da91c61..000000000 --- a/res/drawable-xhdpi/custom_content_page.png +++ /dev/null diff --git a/res/layout/custom_content_page_indicator_marker.xml b/res/layout/custom_content_page_indicator_marker.xml deleted file mode 100644 index 8fe3f8fdf..000000000 --- a/res/layout/custom_content_page_indicator_marker.xml +++ /dev/null @@ -1,39 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2013 The Android Open Source Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> -<com.android.launcher3.PageIndicatorMarker - xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:launcher="http://schemas.android.com/apk/res-auto/com.android.launcher3" - android:layout_width="16dp" - android:layout_height="16dp" - android:layout_gravity="center_vertical"> - <ImageView - android:id="@+id/inactive" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:scaleType="centerInside" - android:src="@drawable/custom_content_page" - /> - <ImageView - android:id="@+id/active" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:scaleType="centerInside" - android:src="@drawable/custom_content_page" - android:alpha="0" - android:scaleX="0.5" - android:scaleY="0.5" - /> -</com.android.launcher3.PageIndicatorMarker> 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() { |