aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTao Bao2017-09-10 13:28:32 -0500
committerTao Bao2017-09-10 13:36:54 -0500
commit7577965ba12ec2ea0df2e523cf335c9c8e5cfd16 (patch)
treed14fe469b75e23f3b3abf048b0628f151b5624ef /screen_ui.cpp
parentfa4f0140637ea2d2c24e9d8739ab3a573fbd22fe (diff)
downloadplatform-bootable-recovery-7577965ba12ec2ea0df2e523cf335c9c8e5cfd16.tar.gz
platform-bootable-recovery-7577965ba12ec2ea0df2e523cf335c9c8e5cfd16.tar.xz
platform-bootable-recovery-7577965ba12ec2ea0df2e523cf335c9c8e5cfd16.zip
ui: Refactor the declaration orders.
By grouping similar kinds together, in an order of types, constants, ctor/dtor, all other methods and data members. Also rename ScreenRecoveryUI::density_ to ScreenRecoveryUI::kDensity to align with others. Test: mmma bootable/recovery Change-Id: I1ba2d15c05ba7be8c39762f3d9dadf1fb2130de4
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 b8f6ea28..c8dec4d5 100644
--- a/screen_ui.cpp
+++ b/screen_ui.cpp
@@ -54,7 +54,7 @@ ScreenRecoveryUI::ScreenRecoveryUI()
54 : kMarginWidth(RECOVERY_UI_MARGIN_WIDTH), 54 : kMarginWidth(RECOVERY_UI_MARGIN_WIDTH),
55 kMarginHeight(RECOVERY_UI_MARGIN_HEIGHT), 55 kMarginHeight(RECOVERY_UI_MARGIN_HEIGHT),
56 kAnimationFps(RECOVERY_UI_ANIMATION_FPS), 56 kAnimationFps(RECOVERY_UI_ANIMATION_FPS),
57 density_(static_cast<float>(android::base::GetIntProperty("ro.sf.lcd_density", 160)) / 160.f), 57 kDensity(static_cast<float>(android::base::GetIntProperty("ro.sf.lcd_density", 160)) / 160.f),
58 currentIcon(NONE), 58 currentIcon(NONE),
59 progressBarType(EMPTY), 59 progressBarType(EMPTY),
60 progressScopeStart(0), 60 progressScopeStart(0),
@@ -105,7 +105,7 @@ GRSurface* ScreenRecoveryUI::GetCurrentText() const {
105} 105}
106 106
107int ScreenRecoveryUI::PixelsFromDp(int dp) const { 107int ScreenRecoveryUI::PixelsFromDp(int dp) const {
108 return dp * density_; 108 return dp * kDensity;
109} 109}
110 110
111// Here's the intended layout: 111// Here's the intended layout: