Merge "Move the Tv volume dialog to a vertical layout" (1912f26f) · Commits · e / os / android_frameworks_base

packages/SystemUI/res/layout-land-television/volume_dialog.xml

+1 −8

Original line number	Diff line number	Diff line
		@@ -24,23 +24,17 @@

		<FrameLayout
		android:id="@+id/volume_dialog"
		android:minWidth="@dimen/volume_dialog_panel_width"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_gravity="right"
		android:background="@android:color/transparent"
		android:paddingRight="@dimen/volume_dialog_panel_transparent_padding_right"
		android:paddingTop="@dimen/volume_dialog_panel_transparent_padding"
		android:paddingBottom="@dimen/volume_dialog_panel_transparent_padding"
		android:paddingLeft="@dimen/volume_dialog_panel_transparent_padding"
		android:padding="@dimen/volume_dialog_panel_transparent_padding"
		android:clipToPadding="false">

		<LinearLayout
		android:id="@+id/main"
		android:layout_width="wrap_content"
		android:minWidth="@dimen/volume_dialog_panel_width"
		android:layout_height="wrap_content"
		android:layout_marginTop="68dp"
		android:layout_gravity="right"
		android:orientation="vertical"
		android:translationZ="@dimen/volume_dialog_elevation"
		@@ -52,7 +46,6 @@
		android:id="@+id/volume_dialog_rows"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:minWidth="@dimen/volume_dialog_panel_width"
		android:gravity="center"
		android:orientation="horizontal">
		<!-- volume rows added and removed here! :-) -->

packages/SystemUI/res/layout-land-television/volume_dialog_row.xml

+18 −21

Original line number	Diff line number	Diff line
		@@ -16,8 +16,8 @@
		<FrameLayout
		xmlns:android="http://schemas.android.com/apk/res/android"
		android:tag="row"
		android:layout_width="@dimen/volume_dialog_row_width"
		android:layout_height="wrap_content"
		android:layout_width="wrap_content"
		android:layout_height="@dimen/volume_dialog_row_height"
		android:background="@android:color/transparent"
		android:clipChildren="false"
		android:clipToPadding="false"
		@@ -30,15 +30,16 @@
		android:background="@android:color/transparent"
		android:gravity="center"
		android:layout_gravity="center"
		android:orientation="horizontal" >
		<com.android.keyguard.AlphaOptimizedImageButton
		android:id="@+id/volume_row_icon"
		style="@style/VolumeButtons"
		android:orientation="vertical" >
		<TextView
		android:id="@+id/volume_number"
		android:layout_width="@dimen/tv_volume_dialog_bubble_size"
		android:layout_height="@dimen/tv_volume_dialog_bubble_size"
		android:maxLength="2"
		android:gravity="center"
		android:background="@drawable/tv_volume_dialog_circle"
		android:tint="@color/accent_tint_color_selector"
		android:soundEffectsEnabled="false" />
		android:textSize="@dimen/tv_volume_number_text_size"
		android:textColor="@color/accent_tint_color_selector"/>
		<TextView
		android:id="@+id/volume_row_header"
		android:layout_width="wrap_content"
		@@ -51,28 +52,24 @@
		android:textAppearance="@style/TextAppearance.Volume.Header" />
		<FrameLayout
		android:id="@+id/volume_row_slider_frame"
		android:layout_height="match_parent"
		android:layoutDirection="ltr"
		android:layout_width="@dimen/volume_dialog_row_width">
		android:layout_width="match_parent"
		android:layout_height="@dimen/volume_dialog_row_height">
		<SeekBar
		android:id="@+id/volume_row_slider"
		android:clickable="false"
		android:layout_width="@dimen/volume_dialog_row_width"
		android:layout_width="@dimen/volume_dialog_row_height"
		android:layout_height="match_parent"
		android:layoutDirection="ltr"
		android:layout_gravity="center"
		android:rotation="0" />
		android:rotation="270" />
		</FrameLayout>
		<TextView
		android:id="@+id/volume_number"
		<com.android.keyguard.AlphaOptimizedImageButton
		android:id="@+id/volume_row_icon"
		style="@style/VolumeButtons"
		android:layout_width="@dimen/tv_volume_dialog_bubble_size"
		android:layout_height="@dimen/tv_volume_dialog_bubble_size"
		android:maxLength="2"
		android:gravity="center"
		android:background="@drawable/tv_volume_dialog_circle"
		android:fontFeatureSettings="tnum"
		android:textSize="@dimen/tv_volume_number_text_size"
		android:textColor="@color/accent_tint_color_selector"/>
		android:tint="@color/accent_tint_color_selector"
		android:soundEffectsEnabled="false" />
		</LinearLayout>

		<include layout="@layout/volume_dnd_icon"/>

packages/SystemUI/res/values-land-television/dimens.xml

+3 −2

Original line number	Diff line number	Diff line
		@@ -15,8 +15,9 @@
		-->

		<resources>
		<!-- Width of volume bar -->
		<dimen name="volume_dialog_row_width">252dp</dimen>
		<!-- Height of volume bar -->
		<dimen name="volume_dialog_row_height">200dp</dimen>
		<dimen name="volume_dialog_panel_transparent_padding">17dp</dimen>
		<dimen name="tv_volume_dialog_bubble_size">36dp</dimen>
		<dimen name="tv_volume_dialog_corner_radius">40dp</dimen>
		<dimen name="tv_volume_dialog_row_padding">5dp</dimen>

packages/SystemUI/res/values-television/integers.xml

+4 −3

Original line number	Diff line number	Diff line
		@@ -17,6 +17,7 @@
		<resources>
		<!-- The position of the volume dialog on the screen.
		See com.android.systemui.volume.VolumeDialogImpl.
		Value 81 corresponds to BOTTOM\|CENTER_HORIZONTAL. -->
		<integer name="volume_dialog_gravity">81</integer>
		Value 81 corresponds to BOTTOM\|CENTER_HORIZONTAL.
		Value 21 corresponds to RIGHT\|CENTER_VERTICAL. -->
		<integer name="volume_dialog_gravity">21</integer>
		</resources>