Merge "Frameworks: fix possible NPE + and missing expandable panel" into cm-11.0 (f5f434cc) · Commits · e / os / android_frameworks_base

core/java/android/view/VolumePanel.java

+13 −2

Original line number	Diff line number	Diff line
		@@ -415,20 +415,26 @@ public class VolumePanel extends Handler implements OnSeekBarChangeListener, Vie
		mMoreButton.setVisibility(View.GONE);
		mDivider.setVisibility(View.GONE);
		mShowCombinedVolumes = false;
		if (mCurrentOverlayStyle != -1) {
		reorderSliders(mActiveStreamType);
		}
		mCurrentOverlayStyle = VOLUME_OVERLAY_SINGLE;
		break;
		case VOLUME_OVERLAY_EXPANDABLE :
		mMoreButton.setVisibility(View.VISIBLE);
		mDivider.setVisibility(View.VISIBLE);
		mShowCombinedVolumes = true;
		if (mCurrentOverlayStyle != -1) {
		reorderSliders(mActiveStreamType);
		}
		mCurrentOverlayStyle = VOLUME_OVERLAY_EXPANDABLE;
		break;
		case VOLUME_OVERLAY_EXPANDED :
		mMoreButton.setVisibility(View.GONE);
		mDivider.setVisibility(View.GONE);
		mShowCombinedVolumes = true;
		if (mCurrentOverlayStyle == VOLUME_OVERLAY_NONE) {
		addOtherVolumes();
		if (mCurrentOverlayStyle != -1) {
		reorderSliders(mActiveStreamType);
		expand();
		}
		mCurrentOverlayStyle = VOLUME_OVERLAY_EXPANDED;
		@@ -510,6 +516,11 @@ public class VolumePanel extends Handler implements OnSeekBarChangeListener, Vie
		}

		private void reorderSliders(int activeStreamType) {
		synchronized (this) {
		if (mStreamControls == null) {
		createSliders();
		}
		}
		mSliderGroup.removeAllViews();

		StreamControl active = mStreamControls.get(activeStreamType);