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

Commit 32aa2c90 authored by Adam Powell's avatar Adam Powell
Browse files

Fix bug 3338079 - Dialog styled activity decor 

Fixed a bug in FastScroller that could cause a crash on an empty list
in always-show mode.

Fix holo light button text color

Change-Id: I7b50043d715b9b870eb34808017d743ba64d2e08
parent 2275cd48

core/java/android/widget/FastScroller.java

+1 −1
Original line number Diff line number Diff line
@@ -606,7 +606,7 @@ class FastScroller { 
        final int positionsInSection = nextSectionPos - sectionPos;



        final View child = mList.getChildAt(0);

        final float incrementalPos = firstVisibleItem +

        final float incrementalPos = child == null ? 0 : firstVisibleItem +

                (float) (mList.getPaddingTop() - child.getTop()) / child.getHeight();

        final float posWithinSection = (incrementalPos - sectionPos) / positionsInSection;

        int result = (int) ((section + posWithinSection) / sectionCount * trackHeight);

core/java/com/android/internal/app/AlertController.java

+11 −3
Original line number Diff line number Diff line
@@ -412,10 +412,18 @@ public class AlertController { 
        /* Only display the divider if we have a title and a 

         * custom view or a message.

         */

        if (hasTitle && ((mMessage != null) || (mView != null))) {

            View divider = mWindow.findViewById(R.id.titleDivider);

        if (hasTitle) {

            View divider = null;

            if (mMessage != null || mView != null || mListView != null) {

                divider = mWindow.findViewById(R.id.titleDivider);

            } else {

                divider = mWindow.findViewById(R.id.titleDividerTop);

            }



            if (divider != null) {

                divider.setVisibility(View.VISIBLE);

            }

        }

        

        setBackground(topPanel, contentPanel, customPanel, hasButtons, a, hasTitle, buttonPanel);

        a.recycle();

core/res/res/drawable-hdpi/dialog_full_holo_dark.9.png

−1.28 KiB (7.71 KiB)
Loading image diff...

core/res/res/drawable-hdpi/dialog_full_holo_light.9.png

−1.92 KiB (6.7 KiB)
Loading image diff...

core/res/res/drawable-mdpi/dialog_full_holo_dark.9.png

−721 B (4.45 KiB)
Loading image diff...