Merge "Fix some rotation and tapping problems" (de5682c7) · Commits · e / os / android_frameworks_base

packages/SystemUI/res/layout/volume_dialog_row.xml

+4 −1

Original line number	Diff line number	Diff line
		@@ -73,15 +73,18 @@
		android:id="@+id/volume_row_slider_frame"
		android:padding="0dp"
		android:layout_width="@dimen/volume_dialog_panel_width"
		android:layoutDirection="rtl"
		android:layout_height="150dp">
		<SeekBar
		android:id="@+id/volume_row_slider"
		android:clickable="true"
		android:padding="0dp"
		android:layout_margin="0dp"
		android:layout_width="150dp"
		android:layout_height="@dimen/volume_dialog_panel_width"
		android:layoutDirection="rtl"
		android:layout_gravity="center"
		android:rotation="270" />
		android:rotation="90" />
		</FrameLayout>

		<com.android.keyguard.AlphaOptimizedImageButton

+3 −9

Original line number	Diff line number	Diff line
		@@ -133,11 +133,11 @@ public class VolumeUiLayout extends FrameLayout {
		for (int i = 0; i < rowCount; i++) {
		View row = rows.getChildAt(i);
		if (to == ROTATION_SEASCAPE) {
		rotateSeekBars(row, to, 180);
		} else if (to == ROTATION_LANDSCAPE) {
		rotateSeekBars(row, to, 0);
		} else if (to == ROTATION_LANDSCAPE) {
		rotateSeekBars(row, to, 180);
		} else {
		rotateSeekBars(row, to, 270);
		rotateSeekBars(row, to, 90);
		}
		rotate(row, from, to, true);
		}
		@@ -309,12 +309,6 @@ public class VolumeUiLayout extends FrameLayout {
		return super.getOutlineProvider();
		}

		@Override
		public void setPressed(boolean pressed)
		{
		// Ignore presses because it activates the seekbar thumb unnecessarily.
		}

		public void setOutsideTouchListener(OnClickListener onClickListener) {
		mHasOutsideTouch = true;
		requestLayout();