PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Improve the layout-related comments." into nyc-dev am: 343eb72

Browse Source 
am: a7f7e70

* commit 'a7f7e7093ea67c3ddda03f52edb440c780d69b0d':
  Improve the layout-related comments.

Change-Id: I957cc75b064b1d0be5cee54af7b27f008a7a22a1
This commit is contained in:
TreeHugger Robot
2016-04-28 02:43:30 +00:00
committed by android-build-merger
parent 43a4bb0ba0 a7f7e7093e
commit ed5b648c0e
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
screen_ui.cpp
+10 -8
View File
@@ -105,16 +105,18 @@ int ScreenRecoveryUI::PixelsFromDp(int dp) {
// Here's the intended layout: // Here's the intended layout:
// 162dp // | regular large
// icon (200dp) // ---------+--------------------
// 62dp // | 220dp 366dp
// text (14sp) // icon | (200dp) (200dp)
// 24dp // | 68dp 68dp
// progress (2dp) // text | (14sp) (14sp)
// 172dp // | 32dp 32dp
// progress | (2dp) (2dp)
// | 194dp 340dp
// Note that "baseline" is actually the *top* of each icon (because that's how our drawing // 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() { int ScreenRecoveryUI::GetAnimationBaseline() {
return GetTextBaseline() - PixelsFromDp(68) - gr_get_height(loopFrames[0]); return GetTextBaseline() - PixelsFromDp(68) - gr_get_height(loopFrames[0]);