From a369104971a518c1f6ec5356f93c1a5f9548c833 Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Wed, 27 Apr 2016 17:40:11 -0700 Subject: Improve the layout-related comments. Bug: http://b/26548285 Change-Id: I20ae75c4ec2dc64b982a047dba498ebda029c90d --- screen_ui.cpp | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/screen_ui.cpp b/screen_ui.cpp index 465be23fa..ccff5bae5 100644 --- a/screen_ui.cpp +++ b/screen_ui.cpp @@ -105,16 +105,18 @@ int ScreenRecoveryUI::PixelsFromDp(int dp) { // Here's the intended layout: -// 162dp -// icon (200dp) -// 62dp -// text (14sp) -// 24dp -// progress (2dp) -// 172dp +// | regular large +// ---------+-------------------- +// | 220dp 366dp +// icon | (200dp) (200dp) +// | 68dp 68dp +// text | (14sp) (14sp) +// | 32dp 32dp +// progress | (2dp) (2dp) +// | 194dp 340dp // Note that "baseline" is actually the *top* of each icon (because that's how our drawing -// routines work), so that's the more useful measurement. +// routines work), so that's the more useful measurement for calling code. int ScreenRecoveryUI::GetAnimationBaseline() { return GetTextBaseline() - PixelsFromDp(68) - gr_get_height(loopFrames[0]); -- cgit v1.2.3