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

2 files changed, 11 insertions, 0 deletions

diff --git a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardHostView.java b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardHostView.java
index 964537c6941a..de19bd57dcf6 100644
--- a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardHostView.java
+++ b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardHostView.java
@@ -324,6 +324,13 @@ public class KeyguardHostView extends KeyguardViewBase {
         }
 
         @Override
+        public void onAddView(View v) {
+            if (numWidgets() >= MAX_WIDGETS) {
+                setAddWidgetEnabled(false);
+            }
+        };
+
+        @Override
         public void onRemoveView(View v) {
             if (numWidgets() < MAX_WIDGETS) {
                 setAddWidgetEnabled(true);
diff --git a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardWidgetPager.java b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardWidgetPager.java
index 24eebffd1af4..25e278182f44 100644
--- a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardWidgetPager.java
+++ b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardWidgetPager.java
@@ -236,6 +236,7 @@ public class KeyguardWidgetPager extends PagedView implements PagedView.PageSwit
     public interface Callbacks {
         public void userActivity();
         public void onUserActivityTimeoutChanged();
+        public void onAddView(View v);
         public void onRemoveView(View v);
     }
 
@@ -262,6 +263,9 @@ public class KeyguardWidgetPager extends PagedView implements PagedView.PageSwit
         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() {