Merge "Making the PagedView full screen on tablets." into jb-mr1-lockscreen-dev

Author: Winson Chung

policy/src/com/android/internal/policy/impl/keyguard/KeyguardWidgetPager.java

@@ -20,6 +20,7 @@
 import android.animation.TimeInterpolator;
 import android.appwidget.AppWidgetHostView;
 import android.content.Context;
+import android.content.res.Resources;
 import android.util.AttributeSet;
 import android.view.Gravity;
 import android.view.MotionEvent;
@@ -30,6 +31,8 @@
 import android.view.animation.DecelerateInterpolator;
 import android.widget.FrameLayout;
 
+import com.android.internal.R;
+
 import com.android.internal.widget.LockPatternUtils;
 
 public class KeyguardWidgetPager extends PagedView implements PagedView.PageSwitchListener,
@@ -57,6 +60,8 @@ public class KeyguardWidgetPager extends PagedView implements PagedView.PageSwit
     private int mPage = 0;
     private Callbacks mCallbacks;
 
+    private boolean mCameraWidgetEnabled;
+
     public KeyguardWidgetPager(Context context, AttributeSet attrs) {
         this(context, attrs, 0);
     }
@@ -72,6 +77,9 @@ public KeyguardWidgetPager(Context context, AttributeSet attrs, int defStyle) {
         }
 
         setPageSwitchListener(this);
+
+        Resources r = getResources();
+        mCameraWidgetEnabled = r.getBoolean(R.bool.kg_enable_camera_default_widget);
     }
 
     public void setViewStateManager(KeyguardViewStateManager viewStateManager) {
@@ -377,6 +385,36 @@ protected void screenScrolled(int screenCenter) {
             }
         }
     }
+    @Override
+    void boundByReorderablePages(boolean isReordering, int[] range) {
+        if (isReordering) {
+            if (isAddWidgetPageVisible()) {
+                range[0]++;
+            }
+            if (isMusicWidgetVisible()) {
+                range[1]--;
+            }
+            if (isCameraWidgetVisible()) {
+                range[1]--;
+            }
+        }
+    }
+
+    /*
+     * Special widgets
+     */
+    boolean isAddWidgetPageVisible() {
+        // TODO: Make proper test once we decide whether the add-page is always showing
+        return true;
+    }
+    boolean isMusicWidgetVisible() {
+        // TODO: Make proper test once we have music in the list
+        return false;
+    }
+    boolean isCameraWidgetVisible() {
+        return mCameraWidgetEnabled;
+    }
+
     @Override
     protected void onStartReordering() {
         super.onStartReordering();