Merge "Fix bug 3338079 - Dialog styled activity decor" into honeycomb (16ffa6cb) · Commits · e / os / android_frameworks_base

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);

+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();

−1.28 KiB (7.71 KiB)

Loading image diff...

−1.92 KiB (6.7 KiB)

Loading image diff...

−721 B (4.45 KiB)

Loading image diff...