summaryrefslogtreecommitdiffstats
path: root/src/com
diff options
context:
space:
mode:
authorAnjali Koppal <akoppal@google.com>2014-02-28 22:32:05 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-02-28 22:32:06 +0000
commitfeec09d731782ca2e8b0fe9d59192fbc43f56e6c (patch)
tree68e072b742650b02ac5115e0c2758c5817d13afe /src/com
parentddace3187d9792590d8b64de198f088541ab68f7 (diff)
parentf5d29130b9f4c501502272d6a97e4c7fb20d95f4 (diff)
downloadandroid_packages_apps_Trebuchet-feec09d731782ca2e8b0fe9d59192fbc43f56e6c.tar.gz
android_packages_apps_Trebuchet-feec09d731782ca2e8b0fe9d59192fbc43f56e6c.tar.bz2
android_packages_apps_Trebuchet-feec09d731782ca2e8b0fe9d59192fbc43f56e6c.zip
Merge "Make launcher implement PageSwitchListener." into ub-now-mister-ugly
Diffstat (limited to 'src/com')
-rw-r--r--src/com/android/launcher3/Launcher.java8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index c59a300f9..7ffb72823 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -96,6 +96,7 @@ import android.widget.TextView;
import android.widget.Toast;
import com.android.launcher3.DropTarget.DragObject;
+import com.android.launcher3.PagedView.PageSwitchListener;
import java.io.DataInputStream;
import java.io.DataOutputStream;
@@ -119,7 +120,7 @@ import java.util.concurrent.atomic.AtomicInteger;
*/
public class Launcher extends Activity
implements View.OnClickListener, OnLongClickListener, LauncherModel.Callbacks,
- View.OnTouchListener {
+ View.OnTouchListener, PageSwitchListener {
static final String TAG = "Launcher";
static final boolean LOGD = false;
@@ -1230,6 +1231,7 @@ public class Launcher extends Activity
mLauncherView = findViewById(R.id.launcher);
mDragLayer = (DragLayer) findViewById(R.id.drag_layer);
mWorkspace = (Workspace) mDragLayer.findViewById(R.id.workspace);
+ mWorkspace.setPageSwitchListener(this);
mPageIndicators = mDragLayer.findViewById(R.id.page_indicator);
mLauncherView.setSystemUiVisibility(
@@ -4450,6 +4452,10 @@ public class Launcher extends Activity
mWorkspace.beginDragShared(dragView, source);
}
+ @Override
+ public void onPageSwitch(View newPage, int newPageIndex) {
+ }
+
/**
* Prints out out state for debugging.
*/