summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher3/Workspace.java
diff options
context:
space:
mode:
authorWinson Chung <winsonc@google.com>2013-07-31 17:30:54 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-07-31 17:30:55 +0000
commitdf11a77f291b1fd6d1f9358c0a42d0621737d15a (patch)
tree62e4b908f0b54321cfc42554bf11368921144067 /src/com/android/launcher3/Workspace.java
parentce9249e4d31dab2a2436e5bcb4488ed7497d481c (diff)
parent82dfe585143b8cc8b082e4ba42c58a66187994dd (diff)
downloadandroid_packages_apps_Trebuchet-df11a77f291b1fd6d1f9358c0a42d0621737d15a.tar.gz
android_packages_apps_Trebuchet-df11a77f291b1fd6d1f9358c0a42d0621737d15a.tar.bz2
android_packages_apps_Trebuchet-df11a77f291b1fd6d1f9358c0a42d0621737d15a.zip
Merge "Adding support for custom page indicator markers." into jb-ub-gel-agar
Diffstat (limited to 'src/com/android/launcher3/Workspace.java')
-rw-r--r--src/com/android/launcher3/Workspace.java8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index b14ceb248..e590779df 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -4025,6 +4025,14 @@ public class Workspace extends SmoothPagedView
}
@Override
+ protected int getPageIndicatorMarker(int pageIndex) {
+ if (getScreenIdForPageIndex(pageIndex) == CUSTOM_CONTENT_SCREEN_ID) {
+ return R.layout.now_page_indicator_marker;
+ }
+ return super.getPageIndicatorMarker(pageIndex);
+ }
+
+ @Override
public void syncPages() {
}