summaryrefslogtreecommitdiffstats
path: root/screen_ui.cpp
diff options
context:
space:
mode:
authorTao Bao <tbao@google.com>2017-09-11 20:25:23 +0200
committerandroid-build-merger <android-build-merger@google.com>2017-09-11 20:25:23 +0200
commitbd9ef0ad1acaf0cece1cdb0666ef4be43ed24781 (patch)
tree8fd8964cc96ecc6ad4a27e5ac156d5f874d891d8 /screen_ui.cpp
parentMerge "wear_ui: Remove Print()/ShowFile()/PutChar()." am: fa4f014063 (diff)
parentMerge "ui: Refactor the declaration orders." (diff)
downloadandroid_bootable_recovery-bd9ef0ad1acaf0cece1cdb0666ef4be43ed24781.tar
android_bootable_recovery-bd9ef0ad1acaf0cece1cdb0666ef4be43ed24781.tar.gz
android_bootable_recovery-bd9ef0ad1acaf0cece1cdb0666ef4be43ed24781.tar.bz2
android_bootable_recovery-bd9ef0ad1acaf0cece1cdb0666ef4be43ed24781.tar.lz
android_bootable_recovery-bd9ef0ad1acaf0cece1cdb0666ef4be43ed24781.tar.xz
android_bootable_recovery-bd9ef0ad1acaf0cece1cdb0666ef4be43ed24781.tar.zst
android_bootable_recovery-bd9ef0ad1acaf0cece1cdb0666ef4be43ed24781.zip
Diffstat (limited to 'screen_ui.cpp')
-rw-r--r--screen_ui.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/screen_ui.cpp b/screen_ui.cpp
index b8f6ea28b..c8dec4d50 100644
--- a/screen_ui.cpp
+++ b/screen_ui.cpp
@@ -54,7 +54,7 @@ ScreenRecoveryUI::ScreenRecoveryUI()
: kMarginWidth(RECOVERY_UI_MARGIN_WIDTH),
kMarginHeight(RECOVERY_UI_MARGIN_HEIGHT),
kAnimationFps(RECOVERY_UI_ANIMATION_FPS),
- density_(static_cast<float>(android::base::GetIntProperty("ro.sf.lcd_density", 160)) / 160.f),
+ kDensity(static_cast<float>(android::base::GetIntProperty("ro.sf.lcd_density", 160)) / 160.f),
currentIcon(NONE),
progressBarType(EMPTY),
progressScopeStart(0),
@@ -105,7 +105,7 @@ GRSurface* ScreenRecoveryUI::GetCurrentText() const {
}
int ScreenRecoveryUI::PixelsFromDp(int dp) const {
- return dp * density_;
+ return dp * kDensity;
}
// Here's the intended layout: