diff options
| author | Elliott Hughes <enh@google.com> | 2016-04-28 04:46:14 +0200 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-04-28 04:46:14 +0200 |
| commit | b554a2b1430a2e0b1dc09a6b80a4ecbf16382938 (patch) | |
| tree | b7d7aa7ab5cbb099202c5f8dddc1503230c7071a | |
| parent | Merge "Update background text for recovery UI" into nyc-dev am: eeca191 am: e890e19 (diff) | |
| parent | Merge "Improve the layout-related comments." into nyc-dev am: 343eb72 (diff) | |
| download | android_bootable_recovery-b554a2b1430a2e0b1dc09a6b80a4ecbf16382938.tar android_bootable_recovery-b554a2b1430a2e0b1dc09a6b80a4ecbf16382938.tar.gz android_bootable_recovery-b554a2b1430a2e0b1dc09a6b80a4ecbf16382938.tar.bz2 android_bootable_recovery-b554a2b1430a2e0b1dc09a6b80a4ecbf16382938.tar.lz android_bootable_recovery-b554a2b1430a2e0b1dc09a6b80a4ecbf16382938.tar.xz android_bootable_recovery-b554a2b1430a2e0b1dc09a6b80a4ecbf16382938.tar.zst android_bootable_recovery-b554a2b1430a2e0b1dc09a6b80a4ecbf16382938.zip | |
| -rw-r--r-- | screen_ui.cpp | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/screen_ui.cpp b/screen_ui.cpp index 546c1147b..cd3671f55 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]); |