Merge branch '6145-s-qs_media' into 'v1-s' (a8fd5442) · Commits · e / os / android_frameworks_base

packages/SystemUI/res/layout/media_view.xml

+9 −4

Original line number	Diff line number	Diff line
		@@ -56,7 +56,8 @@
		android:layout_alignParentStart="true"
		android:fontFamily="@*android:string/config_bodyFontFamily"
		android:gravity="start"
		android:textSize="12sp" />
		android:textSize="12sp"
		android:textColor="@color/qs_media_title" />

		<TextView
		android:id="@+id/media_total_time"
		@@ -65,7 +66,8 @@
		android:layout_alignParentEnd="true"
		android:fontFamily="@*android:string/config_bodyFontFamily"
		android:gravity="end"
		android:textSize="12sp" />
		android:textSize="12sp"
		android:textColor="@color/qs_media_title" />
		</FrameLayout>

		<!-- Actions must be ordered left-to-right even in RTL layout. However, they appear in a chain
		@@ -147,7 +149,7 @@
		android:layout_width="@dimen/qs_seamless_icon_size"
		android:layout_height="@dimen/qs_seamless_icon_size"
		android:layout_gravity="center"
		android:tint="@android:color/white"
		android:tint="@color/qs_media_source_switcher_foreground"
		android:src="@*android:drawable/ic_media_seamless" />
		<TextView
		android:id="@+id/media_seamless_text"
		@@ -157,7 +159,7 @@
		android:layout_marginStart="4dp"
		android:fontFamily="@*android:string/config_headlineFontFamilyMedium"
		android:singleLine="true"
		android:textColor="@android:color/white"
		android:textColor="@color/qs_media_source_switcher_foreground"
		android:text="@*android:string/ext_media_seamless_action"
		android:textDirection="locale"
		android:textSize="12sp"
		@@ -185,6 +187,7 @@
		android:layout_height="wrap_content"
		android:fontFamily="@*android:string/config_headlineFontFamilyMedium"
		android:singleLine="true"
		android:textColor="@color/qs_media_title"
		android:textSize="16sp" />

		<!-- Artist name -->
		@@ -195,6 +198,7 @@
		android:fontFamily="@*android:string/config_headlineFontFamily"
		android:singleLine="true"
		style="@style/MediaPlayer.Subtitle"
		android:textColor="@color/qs_media_subtitle"
		android:textSize="14sp" />

		<com.android.internal.widget.CachingIconView
		@@ -216,6 +220,7 @@
		android:ellipsize="marquee"
		android:marqueeRepeatLimit="marquee_forever"
		android:text="@string/controls_media_close_session"
		android:textColor="@color/qs_media_title"
		android:gravity="center_horizontal\|top"
		app:layout_constraintTop_toTopOf="parent"
		app:layout_constraintStart_toStartOf="parent"

packages/SystemUI/res/values-night/colors.xml

+12 −0

Original line number	Diff line number	Diff line
		@@ -104,4 +104,16 @@
		<color name="accessibility_floating_menu_background">#B3000000</color> <!-- 70% -->

		<color name="people_tile_background">@android:color/system_accent2_800</color>


		<!-- /e/ QS media player additions -->
		<color name="qs_media_background">#2F3034</color>
		<color name="qs_media_title">#FFFFFF</color>
		<color name="qs_media_subtitle">#99FFFFFF</color>
		<color name="qs_media_buttons">#FFFFFF</color>
		<color name="qs_media_source_switcher_background">#5DB2FF</color>
		<color name="qs_media_source_switcher_foreground">#2F3034</color>
		<color name="qs_media_progress">#5DB2FF</color>
		<color name="qs_media_progress_background">#3D5DB2FF</color>
		<color name="qs_media_button_outline">#262626</color>
		</resources>

packages/SystemUI/res/values/colors.xml

+13 −0

Original line number	Diff line number	Diff line
		@@ -215,4 +215,17 @@
		<color name="settingslib_track_off_color">@color/settingslib_track_off</color>
		<color name="connected_network_primary_color">#191C18</color>
		<color name="connected_network_secondary_color">#41493D</color>

		<!-- /e/ QS media player additions -->
		<color name="qs_media_background">#FFFFFF</color>
		<color name="qs_media_title">#000000</color>
		<color name="qs_media_subtitle">#99000000</color>
		<color name="qs_media_buttons">#000000</color>
		<color name="qs_media_source_switcher_background">#0086FF</color>
		<color name="qs_media_source_switcher_foreground">#FFFFFF</color>
		<color name="qs_media_default_app_icon_background">#F42E47</color>
		<color name="qs_media_default_app_icon_foreground">#FFFFFF</color>
		<color name="qs_media_progress">#0086FF</color>
		<color name="qs_media_progress_background">#3D0086FF</color>
		<color name="qs_media_button_outline">#D6D6D9</color>
		</resources>

packages/SystemUI/res/values/styles.xml

+11 −11

Original line number	Diff line number	Diff line
		@@ -546,13 +546,13 @@
		<!-- Media controls always have light background -->
		<style name="MediaPlayer" parent="@*android:style/Theme.DeviceDefault.Light">
		<item name="android:textColor">?android:attr/textColorPrimary</item>
		<item name="android:backgroundTint">@android:color/system_accent2_50</item>
		<item name="android:backgroundTint">@color/qs_media_background</item>
		</style>

		<style name="MediaPlayer.ProgressBar" parent="@android:style/Widget.ProgressBar.Horizontal">
		<item name="android:thumbTint">?android:attr/textColorPrimary</item>
		<item name="android:progressTint">?android:attr/textColorPrimary</item>
		<item name="android:progressBackgroundTint">?android:attr/textColorTertiary</item>
		<item name="android:thumbTint">@color/qs_media_progress</item>
		<item name="android:progressTint">@color/qs_media_progress</item>
		<item name="android:progressBackgroundTint">@color/qs_media_progress_background</item>
		<item name="android:clickable">true</item>
		<item name="android:splitTrack">false</item>
		</style>
		@@ -563,7 +563,7 @@

		<style name="MediaPlayer.Action" parent="@android:style/Widget.Material.Button.Borderless.Small">
		<item name="android:background">@drawable/qs_media_light_source</item>
		<item name="android:tint">?android:attr/textColorPrimary</item>
		<item name="android:tint">@color/qs_media_buttons</item>
		<item name="android:stateListAnimator">@anim/media_button_state_list_animator</item>
		<item name="android:paddingTop">8dp</item>
		<item name="android:paddingStart">12dp</item>
		@@ -574,22 +574,22 @@

		<style name="MediaPlayer.OutlineButton">
		<item name="android:background">@drawable/qs_media_button_background</item>
		<item name="android:textColor">?android:attr/textColorPrimary</item>
		<item name="android:backgroundTint">@color/media_player_outline_button_bg</item>
		<item name="android:textColor">@color/qs_media_title</item>
		<item name="android:backgroundTint">@color/qs_media_button_outline</item>
		<item name="android:fontFamily">@*android:string/config_headlineFontFamilyMedium</item>
		<item name="android:layout_gravity">center</item>
		<item name="android:singleLine">true</item>
		</style>

		<style name="MediaPlayer.SolidButton">
		<item name="android:backgroundTint">@color/media_player_solid_button_bg</item>
		<item name="android:tint">?android:attr/colorPrimary</item>
		<item name="android:textColor">?android:attr/textColorPrimary</item>
		<item name="android:backgroundTint">@color/qs_media_source_switcher_background</item>
		<item name="android:tint">@color/qs_media_source_switcher_foreground</item>
		<item name="android:textColor">@color/qs_media_source_switcher_foreground</item>
		</style>

		<style name="MediaPlayer.AppIcon">
		<item name="android:background">@drawable/qs_media_icon_background</item>
		<item name="android:backgroundTint">@color/media_player_solid_button_bg</item>
		<item name="android:backgroundTint">@color/qs_media_default_app_icon_background</item>
		<item name="android:padding">4dp</item>
		</style>

packages/SystemUI/src/com/android/systemui/media/MediaControlPanel.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -363,7 +363,7 @@ public class MediaControlPanel {
		appIconView.clearColorFilter();
		if (data.getAppIcon() != null && !data.getResumption()) {
		appIconView.setImageIcon(data.getAppIcon());
		int color = mContext.getColor(android.R.color.white);
		int color = mContext.getColor(R.color.qs_media_default_app_icon_foreground);
		appIconView.setColorFilter(color);
		} else {
		appIconView.setColorFilter(getGrayscaleFilter());