Merge "Improve the layout-related comments." into nyc-dev
am: 343eb72
* commit '343eb722ddd0146e5c752419b3ff9537cfa2d31d':
Improve the layout-related comments.
Change-Id: Ia765c16883d92c6a00846413e8ada372952e8cbf
This commit is contained in:
commit
a7f7e7093e
1 changed files with 10 additions and 8 deletions
|
@ -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]);
|
||||
|
|
Loading…
Reference in a new issue