Merge "Make launcher implement PageSwitchListener." into ub-now-mister-ugly

This commit is contained in:
Anjali Koppal
2014-02-28 22:32:05 +00:00
committed by Android (Google) Code Review
+7 -1
View File
@@ -96,6 +96,7 @@ import android.widget.TextView;
import android.widget.Toast; import android.widget.Toast;
import com.android.launcher3.DropTarget.DragObject; import com.android.launcher3.DropTarget.DragObject;
import com.android.launcher3.PagedView.PageSwitchListener;
import java.io.DataInputStream; import java.io.DataInputStream;
import java.io.DataOutputStream; import java.io.DataOutputStream;
@@ -119,7 +120,7 @@ import java.util.concurrent.atomic.AtomicInteger;
*/ */
public class Launcher extends Activity public class Launcher extends Activity
implements View.OnClickListener, OnLongClickListener, LauncherModel.Callbacks, implements View.OnClickListener, OnLongClickListener, LauncherModel.Callbacks,
View.OnTouchListener { View.OnTouchListener, PageSwitchListener {
static final String TAG = "Launcher"; static final String TAG = "Launcher";
static final boolean LOGD = false; static final boolean LOGD = false;
@@ -1230,6 +1231,7 @@ public class Launcher extends Activity
mLauncherView = findViewById(R.id.launcher); mLauncherView = findViewById(R.id.launcher);
mDragLayer = (DragLayer) findViewById(R.id.drag_layer); mDragLayer = (DragLayer) findViewById(R.id.drag_layer);
mWorkspace = (Workspace) mDragLayer.findViewById(R.id.workspace); mWorkspace = (Workspace) mDragLayer.findViewById(R.id.workspace);
mWorkspace.setPageSwitchListener(this);
mPageIndicators = mDragLayer.findViewById(R.id.page_indicator); mPageIndicators = mDragLayer.findViewById(R.id.page_indicator);
mLauncherView.setSystemUiVisibility( mLauncherView.setSystemUiVisibility(
@@ -4450,6 +4452,10 @@ public class Launcher extends Activity
mWorkspace.beginDragShared(dragView, source); mWorkspace.beginDragShared(dragView, source);
} }
@Override
public void onPageSwitch(View newPage, int newPageIndex) {
}
/** /**
* Prints out out state for debugging. * Prints out out state for debugging.
*/ */