summaryrefslogtreecommitdiffstats
path: root/wear_ui.cpp
diff options
context:
space:
mode:
authorTao Bao <tbao@google.com>2018-07-31 23:53:16 +0200
committerTao Bao <tbao@google.com>2018-08-01 00:14:40 +0200
commit0bc88de7aabaec09fb2408ce008bbed41b56cfa5 (patch)
treee21c2394673bddde76b2dc2ace512c0c4260659d /wear_ui.cpp
parentMerge "recovery: Add ability to interrupt UI" (diff)
downloadandroid_bootable_recovery-0bc88de7aabaec09fb2408ce008bbed41b56cfa5.tar
android_bootable_recovery-0bc88de7aabaec09fb2408ce008bbed41b56cfa5.tar.gz
android_bootable_recovery-0bc88de7aabaec09fb2408ce008bbed41b56cfa5.tar.bz2
android_bootable_recovery-0bc88de7aabaec09fb2408ce008bbed41b56cfa5.tar.lz
android_bootable_recovery-0bc88de7aabaec09fb2408ce008bbed41b56cfa5.tar.xz
android_bootable_recovery-0bc88de7aabaec09fb2408ce008bbed41b56cfa5.tar.zst
android_bootable_recovery-0bc88de7aabaec09fb2408ce008bbed41b56cfa5.zip
Diffstat (limited to 'wear_ui.cpp')
-rw-r--r--wear_ui.cpp15
1 files changed, 10 insertions, 5 deletions
diff --git a/wear_ui.cpp b/wear_ui.cpp
index f50823688..3b057b761 100644
--- a/wear_ui.cpp
+++ b/wear_ui.cpp
@@ -25,17 +25,22 @@
#include <android-base/strings.h>
#include <minui/minui.h>
+constexpr int kDefaultProgressBarBaseline = 259;
+constexpr int kDefaultMenuUnusableRows = 9;
+
WearRecoveryUI::WearRecoveryUI()
: ScreenRecoveryUI(true),
- kProgressBarBaseline(RECOVERY_UI_PROGRESS_BAR_BASELINE),
- kMenuUnusableRows(RECOVERY_UI_MENU_UNUSABLE_ROWS) {
- // TODO: kMenuUnusableRows should be computed based on the lines in draw_screen_locked().
+ progress_bar_baseline_(android::base::GetIntProperty("ro.recovery.ui.progress_bar_baseline",
+ kDefaultProgressBarBaseline)),
+ menu_unusable_rows_(android::base::GetIntProperty("ro.recovery.ui.menu_unusable_rows",
+ kDefaultMenuUnusableRows)) {
+ // TODO: menu_unusable_rows_ should be computed based on the lines in draw_screen_locked().
touch_screen_allowed_ = true;
}
int WearRecoveryUI::GetProgressBaseline() const {
- return kProgressBarBaseline;
+ return progress_bar_baseline_;
}
// Draw background frame on the screen. Does not flip pages.
@@ -94,7 +99,7 @@ void WearRecoveryUI::StartMenu(const std::vector<std::string>& headers,
const std::vector<std::string>& items, size_t initial_selection) {
std::lock_guard<std::mutex> lg(updateMutex);
if (text_rows_ > 0 && text_cols_ > 0) {
- menu_ = std::make_unique<Menu>(scrollable_menu_, text_rows_ - kMenuUnusableRows - 1,
+ menu_ = std::make_unique<Menu>(scrollable_menu_, text_rows_ - menu_unusable_rows_ - 1,
text_cols_ - 1, headers, items, initial_selection);
update_screen_locked();
}