Merge "Improve the layout-related comments." into nyc-dev am: 343eb72
am: 1dc396f
* commit '1dc396f8f4bcadca3c39ea9f4025d669564f171b':
Improve the layout-related comments.
Change-Id: I900676d63fdb55957de1d6a798c1530f2d2e0f12
diff --git a/screen_ui.cpp b/screen_ui.cpp
index 546c114..cd3671f 100644
--- a/screen_ui.cpp
+++ b/screen_ui.cpp
@@ -105,16 +105,18 @@
// 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]);