Merge "Preventing more than five widgets from being added in the carousel (issue 7502935)" into jb-mr1-dev

Author: Adam Cohen

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

@@ -323,6 +323,13 @@ public void onUserActivityTimeoutChanged() {
             KeyguardHostView.this.onUserActivityTimeoutChanged();
         }
 
+        @Override
+        public void onAddView(View v) {
+            if (numWidgets() >= MAX_WIDGETS) {
+                setAddWidgetEnabled(false);
+            }
+        };
+
         @Override
         public void onRemoveView(View v) {
             if (numWidgets() < MAX_WIDGETS) {

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

@@ -236,6 +236,7 @@ public void setCallbacks(Callbacks callbacks) {
     public interface Callbacks {
         public void userActivity();
         public void onUserActivityTimeoutChanged();
+        public void onAddView(View v);
         public void onRemoveView(View v);
     }
 
@@ -262,6 +263,9 @@ public void onAddView(View v, final int index) {
         final int[] pagesRange = new int[mTempVisiblePagesRange.length];
         getVisiblePages(pagesRange);
         boundByReorderablePages(true, pagesRange);
+        if (mCallbacks != null) {
+            mCallbacks.onAddView(v);
+        }
         // Subtract from the index to take into account pages before the reorderable
         // pages (e.g. the "add widget" page)
         mBackgroundWorkerHandler.post(new Runnable() {