diff options
| author | Tony Wickham <twickham@google.com> | 2016-05-18 02:09:02 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-05-18 02:09:02 +0000 |
| commit | ae007814289a465be3df1ddca276e30f73460a97 (patch) | |
| tree | b8ecc224e265d114f6c5007c2020783394566e61 /src/com/android/launcher3/folder | |
| parent | 63d1b330bfe7942c5a53d53010b6f5e6dea0945c (diff) | |
| parent | f549dab31d0fa3e4d0cf8d6025b20e49aafb2d59 (diff) | |
| download | android_packages_apps_Trebuchet-ae007814289a465be3df1ddca276e30f73460a97.tar.gz android_packages_apps_Trebuchet-ae007814289a465be3df1ddca276e30f73460a97.tar.bz2 android_packages_apps_Trebuchet-ae007814289a465be3df1ddca276e30f73460a97.zip | |
Merge "Add PageIndicator interface and custom PageIndicatorLine view." into ub-launcher3-calgary
Diffstat (limited to 'src/com/android/launcher3/folder')
| -rw-r--r-- | src/com/android/launcher3/folder/FolderPagedView.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/com/android/launcher3/folder/FolderPagedView.java b/src/com/android/launcher3/folder/FolderPagedView.java index 1af148584..e1a143165 100644 --- a/src/com/android/launcher3/folder/FolderPagedView.java +++ b/src/com/android/launcher3/folder/FolderPagedView.java @@ -39,8 +39,8 @@ import com.android.launcher3.ItemInfo; import com.android.launcher3.Launcher; import com.android.launcher3.LauncherAppState; import com.android.launcher3.LauncherModel; -import com.android.launcher3.PageIndicator; -import com.android.launcher3.PageIndicator.PageMarkerResources; +import com.android.launcher3.pageindicators.PageIndicatorDots; +import com.android.launcher3.pageindicators.PageIndicator.PageMarkerResources; import com.android.launcher3.PagedView; import com.android.launcher3.R; import com.android.launcher3.ShortcutAndWidgetContainer; @@ -103,7 +103,7 @@ public class FolderPagedView extends PagedView { private FocusIndicatorView mFocusIndicatorView; private PagedFolderKeyEventListener mKeyListener; - private PageIndicator mPageIndicator; + private PageIndicatorDots mPageIndicator; public FolderPagedView(Context context, AttributeSet attrs) { super(context, attrs); @@ -128,7 +128,7 @@ public class FolderPagedView extends PagedView { mFolder = folder; mFocusIndicatorView = (FocusIndicatorView) folder.findViewById(R.id.focus_indicator); mKeyListener = new PagedFolderKeyEventListener(folder); - mPageIndicator = (PageIndicator) folder.findViewById(R.id.folder_page_indicator); + mPageIndicator = (PageIndicatorDots) folder.findViewById(R.id.folder_page_indicator); } /** |