Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[Overlay] Bottom align text in clocktime complication" into tm-qpr-dev am: e15f55ef7e am: 4ab097e567

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22217249

Change-Id: I8e262670251c751beb42b627e10899e81e392118
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Coco Duan
2023-03-24 17:42:58 +00:00
committed by Automerger Merge Worker
parent 6ba2c3e436 4ab097e567
commit 9887bdc7a4
4 changed files with 24 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/SystemUI/res/layout/dream_overlay_complication_clock_time.xml
View File

@@ -29,9 +29,10 @@
android:format12Hour="@string/dream_time_complication_12_hr_time_format"
android:format24Hour="@string/dream_time_complication_24_hr_time_format"
android:fontFeatureSettings="pnum, lnum"
android:includeFontPadding="false"
android:letterSpacing="0.02"
android:maxLines="1"
android:textSize="@dimen/dream_overlay_complication_clock_time_text_size"
android:translationY="@dimen/dream_overlay_complication_clock_time_translation_y"
app:keyShadowBlur="@dimen/dream_overlay_clock_key_text_shadow_radius"
app:keyShadowOffsetX="@dimen/dream_overlay_clock_key_text_shadow_dx"
app:keyShadowOffsetY="@dimen/dream_overlay_clock_key_text_shadow_dy"
@@ -40,6 +41,7 @@
app:ambientShadowOffsetX="@dimen/dream_overlay_clock_ambient_text_shadow_dx"
app:ambientShadowOffsetY="@dimen/dream_overlay_clock_ambient_text_shadow_dy"
app:ambientShadowAlpha="0.3"
/>
app:removeTextDescent="true"
app:textDescentExtraPadding="@dimen/dream_overlay_clock_text_descent_extra_padding" />
</FrameLayout>

2
packages/SystemUI/res/values/dimens.xml
View File

@@ -1636,7 +1636,6 @@
<dimen name="dream_overlay_bottom_affordance_radius">32dp</dimen>
<dimen name="dream_overlay_bottom_affordance_padding">14dp</dimen>
<dimen name="dream_overlay_complication_clock_time_text_size">86dp</dimen>
<dimen name="dream_overlay_complication_clock_time_translation_y">28dp</dimen>
<dimen name="dream_overlay_complication_clock_subtitle_text_size">24sp</dimen>
<dimen name="dream_overlay_complication_preview_text_size">36sp</dimen>
<dimen name="dream_overlay_complication_preview_icon_padding">28dp</dimen>
@@ -1737,6 +1736,7 @@
<dimen name="dream_overlay_clock_ambient_text_shadow_dx">0dp</dimen>
<dimen name="dream_overlay_clock_ambient_text_shadow_dy">0dp</dimen>
<dimen name="dream_overlay_clock_ambient_text_shadow_radius">1dp</dimen>
<dimen name="dream_overlay_clock_text_descent_extra_padding">1dp</dimen>
<!-- Shadow for dream overlay status bar complications -->
<dimen name="dream_overlay_status_bar_key_text_shadow_dx">0.5dp</dimen>

3
packages/SystemUI/shared/res/values/attrs.xml
View File

@@ -40,6 +40,9 @@
<attr name="ambientShadowOffsetX" />
<attr name="ambientShadowOffsetY" />
<attr name="ambientShadowAlpha" />
<attr name="removeTextDescent" format="boolean" />
<!-- padding to add back when removing text descent so it ensures text is not clipped -->
<attr name="textDescentExtraPadding" format="dimension" />
</declare-styleable>
<declare-styleable name="DoubleShadowTextView">

16
packages/SystemUI/shared/src/com/android/systemui/shared/shadow/DoubleShadowTextClock.kt
View File

@@ -22,6 +22,7 @@ import android.widget.TextClock
import com.android.systemui.shared.R
import com.android.systemui.shared.shadow.DoubleShadowTextHelper.ShadowInfo
import com.android.systemui.shared.shadow.DoubleShadowTextHelper.applyShadows
import kotlin.math.floor
/** Extension of [TextClock] which draws two shadows on the text (ambient and key shadows) */
class DoubleShadowTextClock
@@ -89,6 +90,21 @@ constructor(
ambientShadowOffsetY.toFloat(),
ambientShadowAlpha
)
val removeTextDescent =
attributes.getBoolean(R.styleable.DoubleShadowTextClock_removeTextDescent, false)
val textDescentExtraPadding =
attributes.getDimensionPixelSize(
R.styleable.DoubleShadowTextClock_textDescentExtraPadding,
0
)
if (removeTextDescent) {
setPaddingRelative(
0,
0,
0,
textDescentExtraPadding - floor(paint.fontMetrics.descent.toDouble()).toInt()
)
}
} finally {
attributes.recycle()
}