Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f69320a1 authored by Adam Cohen's avatar Adam Cohen Committed by Android (Google) Code Review
Browse files

Merge "Preventing more than five widgets from being added in the carousel... 

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

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

+7 −0
Original line number Diff line number Diff line
@@ -323,6 +323,13 @@ public class KeyguardHostView extends KeyguardViewBase { 
            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

+4 −0
Original line number Diff line number Diff line
@@ -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() {