summaryrefslogtreecommitdiffstats
path: root/screen_ui.cpp
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2016-04-28 04:43:30 +0200
committerandroid-build-merger <android-build-merger@google.com>2016-04-28 04:43:30 +0200
commited5b648c0e669e4c81a70868a545bb0ecc75cf0c (patch)
treeb2ec48d671cd4afd7ce1a5d0409c0d05b4dd8848 /screen_ui.cpp
parentMerge "Update background text for recovery UI" into nyc-dev am: eeca191 (diff)
parentMerge "Improve the layout-related comments." into nyc-dev (diff)
downloadandroid_bootable_recovery-ed5b648c0e669e4c81a70868a545bb0ecc75cf0c.tar
android_bootable_recovery-ed5b648c0e669e4c81a70868a545bb0ecc75cf0c.tar.gz
android_bootable_recovery-ed5b648c0e669e4c81a70868a545bb0ecc75cf0c.tar.bz2
android_bootable_recovery-ed5b648c0e669e4c81a70868a545bb0ecc75cf0c.tar.lz
android_bootable_recovery-ed5b648c0e669e4c81a70868a545bb0ecc75cf0c.tar.xz
android_bootable_recovery-ed5b648c0e669e4c81a70868a545bb0ecc75cf0c.tar.zst
android_bootable_recovery-ed5b648c0e669e4c81a70868a545bb0ecc75cf0c.zip
Diffstat (limited to 'screen_ui.cpp')
-rw-r--r--screen_ui.cpp18
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]);