Merge changes I64da9051,Idfaf9e90 into tm-qpr-dev am: 05e0c2ce65 (fae80e0b) · Commits · e / os / android_frameworks_base

packages/SystemUI/res/layout/combined_qs_header.xml

+2 −2

Original line number	Diff line number	Diff line
		@@ -73,8 +73,8 @@
		android:singleLine="true"
		android:textDirection="locale"
		android:textAppearance="@style/TextAppearance.QS.Status"
		android:transformPivotX="0sp"
		android:transformPivotY="20sp"
		android:transformPivotX="0dp"
		android:transformPivotY="24dp"
		android:scaleX="1"
		android:scaleY="1"
		/>

packages/SystemUI/res/values/dimens.xml

+2 −1

Original line number	Diff line number	Diff line
		@@ -519,7 +519,7 @@
		<dimen name="qs_tile_margin_horizontal">8dp</dimen>
		<dimen name="qs_tile_margin_vertical">@dimen/qs_tile_margin_horizontal</dimen>
		<dimen name="qs_tile_margin_top_bottom">4dp</dimen>
		<dimen name="qs_brightness_margin_top">8dp</dimen>
		<dimen name="qs_brightness_margin_top">12dp</dimen>
		<dimen name="qs_brightness_margin_bottom">16dp</dimen>
		<dimen name="qqs_layout_margin_top">16dp</dimen>
		<dimen name="qqs_layout_padding_bottom">24dp</dimen>
		@@ -572,6 +572,7 @@
		<dimen name="qs_header_row_min_height">48dp</dimen>

		<dimen name="qs_header_non_clickable_element_height">24dp</dimen>
		<dimen name="new_qs_header_non_clickable_element_height">20dp</dimen>

		<dimen name="qs_footer_padding">20dp</dimen>
		<dimen name="qs_security_footer_height">88dp</dimen>

packages/SystemUI/res/values/integers.xml

+7 −0

Original line number	Diff line number	Diff line
		@@ -28,4 +28,11 @@

		<!-- The time it takes for the over scroll release animation to complete, in milli seconds. -->
		<integer name="lockscreen_shade_over_scroll_release_duration">0</integer>

		<!-- Values for transition of QS Headers -->
		<integer name="fade_out_complete_frame">14</integer>
		<integer name="fade_in_start_frame">58</integer>
		<!-- Percentage of displacement for items in QQS to guarantee matching with bottom of clock at
		fade_out_complete_frame -->
		<dimen name="percent_displacement_at_fade_out" format="float">0.1066</dimen>
		</resources>
		No newline at end of file

packages/SystemUI/res/values/styles.xml

+1 −4

Original line number	Diff line number	Diff line
		@@ -128,11 +128,10 @@
		<!-- This is hard coded to be sans-serif-condensed to match the icons -->

		<style name="TextAppearance.QS.Status">
		<item name="android:fontFamily">@*android:string/config_bodyFontFamilyMedium</item>
		<item name="android:fontFamily">@*android:string/config_headlineFontFamily</item>
		<item name="android:textColor">?android:attr/textColorPrimary</item>
		<item name="android:textSize">14sp</item>
		<item name="android:letterSpacing">0.01</item>
		<item name="android:lineHeight">20sp</item>
		</style>

		<style name="TextAppearance.QS.SecurityFooter" parent="@style/TextAppearance.QS.Status">
		@@ -143,12 +142,10 @@
		<style name="TextAppearance.QS.Status.Carriers" />

		<style name="TextAppearance.QS.Status.Carriers.NoCarrierText">
		<item name="android:fontFamily">@*android:string/config_bodyFontFamily</item>
		<item name="android:textColor">?android:attr/textColorSecondary</item>
		</style>

		<style name="TextAppearance.QS.Status.Build">
		<item name="android:fontFamily">@*android:string/config_bodyFontFamily</item>
		<item name="android:textColor">?android:attr/textColorSecondary</item>
		</style>

packages/SystemUI/res/xml/combined_qs_header_scene.xml

+22 −29

Original line number	Diff line number	Diff line
		@@ -27,67 +27,60 @@
		<KeyPosition
		app:keyPositionType="deltaRelative"
		app:percentX="0"
		app:percentY="0"
		app:framePosition="49"
		app:percentY="@dimen/percent_displacement_at_fade_out"
		app:framePosition="@integer/fade_out_complete_frame"
		app:sizePercent="0"
		app:curveFit="linear"
		app:motionTarget="@id/date" />
		<KeyPosition
		app:keyPositionType="deltaRelative"
		app:percentX="1"
		app:percentY="0.51"
		app:percentY="0.5"
		app:sizePercent="1"
		app:framePosition="51"
		app:framePosition="50"
		app:curveFit="linear"
		app:motionTarget="@id/date" />
		<KeyAttribute
		app:motionTarget="@id/date"
		app:framePosition="30"
		app:framePosition="14"
		android:alpha="0"
		/>
		<KeyAttribute
		app:motionTarget="@id/date"
		app:framePosition="70"
		app:framePosition="@integer/fade_in_start_frame"
		android:alpha="0"
		/>
		<KeyPosition
		app:keyPositionType="pathRelative"
		app:percentX="0"
		app:percentY="0"
		app:framePosition="0"
		app:curveFit="linear"
		app:motionTarget="@id/statusIcons" />
		<KeyPosition
		app:keyPositionType="pathRelative"
		app:keyPositionType="deltaRelative"
		app:percentX="0"
		app:percentY="0"
		app:framePosition="50"
		app:percentY="@dimen/percent_displacement_at_fade_out"
		app:framePosition="@integer/fade_out_complete_frame"
		app:sizePercent="0"
		app:curveFit="linear"
		app:motionTarget="@id/statusIcons" />
		<KeyPosition
		app:keyPositionType="deltaRelative"
		app:percentX="1"
		app:percentY="0.51"
		app:framePosition="51"
		app:percentY="0.5"
		app:framePosition="50"
		app:sizePercent="1"
		app:curveFit="linear"
		app:motionTarget="@id/statusIcons" />
		<KeyAttribute
		app:motionTarget="@id/statusIcons"
		app:framePosition="30"
		app:framePosition="@integer/fade_out_complete_frame"
		android:alpha="0"
		/>
		<KeyAttribute
		app:motionTarget="@id/statusIcons"
		app:framePosition="70"
		app:framePosition="@integer/fade_in_start_frame"
		android:alpha="0"
		/>
		<KeyPosition
		app:keyPositionType="deltaRelative"
		app:percentX="0"
		app:percentY="0"
		app:framePosition="50"
		app:percentY="@dimen/percent_displacement_at_fade_out"
		app:framePosition="@integer/fade_out_complete_frame"
		app:percentWidth="1"
		app:percentHeight="1"
		app:curveFit="linear"
		@@ -95,27 +88,27 @@
		<KeyPosition
		app:keyPositionType="deltaRelative"
		app:percentX="1"
		app:percentY="0.51"
		app:framePosition="51"
		app:percentY="0.5"
		app:framePosition="50"
		app:percentWidth="1"
		app:percentHeight="1"
		app:curveFit="linear"
		app:motionTarget="@id/batteryRemainingIcon" />
		<KeyAttribute
		app:motionTarget="@id/batteryRemainingIcon"
		app:framePosition="30"
		app:framePosition="@integer/fade_out_complete_frame"
		android:alpha="0"
		/>
		<KeyAttribute
		app:motionTarget="@id/batteryRemainingIcon"
		app:framePosition="70"
		app:framePosition="@integer/fade_in_start_frame"
		android:alpha="0"
		/>
		<KeyPosition
		app:motionTarget="@id/carrier_group"
		app:percentX="1"
		app:percentY="0.51"
		app:framePosition="51"
		app:percentY="0.5"
		app:framePosition="50"
		app:percentWidth="1"
		app:percentHeight="1"
		app:curveFit="linear"
		@@ -126,7 +119,7 @@
		android:alpha="0" />
		<KeyAttribute
		app:motionTarget="@id/carrier_group"
		app:framePosition="70"
		app:framePosition="@integer/fade_in_start_frame"
		android:alpha="0" />
		</KeyFrameSet>
		</Transition>