Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1c7a5d84 authored by Tianjie Xu's avatar Tianjie Xu Committed by android-build-merger
Browse files

Merge "Create a new function to return the help message for menu" am:... 

Merge "Create a new function to return the help message for menu" am: 5d9f963e am: b25d7415 am: c234be16
am: a89bb37a

Change-Id: I077384fda0680a73eaa7462773c9144d6d7fc0e2
parents 0ea09ffb a89bb37a

recovery_ui/include/recovery_ui/screen_ui.h

+3 −0
Original line number Diff line number Diff line
@@ -286,6 +286,9 @@ class ScreenRecoveryUI : public RecoveryUI, public DrawInterface { 
  // selected.

  virtual int SelectMenu(int sel);



  // Returns the help message displayed on top of the menu.

  virtual std::vector<std::string> GetMenuHelpMessage() const;



  virtual void draw_background_locked();

  virtual void draw_foreground_locked();

  virtual void draw_screen_locked();

recovery_ui/include/recovery_ui/ui.h

+1 −1
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ class RecoveryUI { 


  // Returns true if you have the volume up/down and power trio typical of phones and tablets, false

  // otherwise.

  virtual bool HasThreeButtons();

  virtual bool HasThreeButtons() const;



  // Returns true if it has a power key.

  virtual bool HasPowerKey() const;

recovery_ui/screen_ui.cpp

+14 −10
Original line number Diff line number Diff line
@@ -673,6 +673,19 @@ void ScreenRecoveryUI::SetTitle(const std::vector<std::string>& lines) { 
  title_lines_ = lines;

}



std::vector<std::string> ScreenRecoveryUI::GetMenuHelpMessage() const {

  // clang-format off

  static std::vector<std::string> REGULAR_HELP{

    "Use volume up/down and power.",

  };

  static std::vector<std::string> LONG_PRESS_HELP{

    "Any button cycles highlight.",

    "Long-press activates.",

  };

  // clang-format on

  return HasThreeButtons() ? REGULAR_HELP : LONG_PRESS_HELP;

}



// Redraws everything on the screen. Does not flip pages. Should only be called with updateMutex

// locked.

void ScreenRecoveryUI::draw_screen_locked() {
@@ -685,16 +698,7 @@ void ScreenRecoveryUI::draw_screen_locked() { 
  gr_color(0, 0, 0, 255);

  gr_clear();



  // clang-format off

  static std::vector<std::string> REGULAR_HELP{

    "Use volume up/down and power.",

  };

  static std::vector<std::string> LONG_PRESS_HELP{

    "Any button cycles highlight.",

    "Long-press activates.",

  };

  // clang-format on

  draw_menu_and_text_buffer_locked(HasThreeButtons() ? REGULAR_HELP : LONG_PRESS_HELP);

  draw_menu_and_text_buffer_locked(GetMenuHelpMessage());

}



// Draws the menu and text buffer on the screen. Should only be called with updateMutex locked.

recovery_ui/ui.cpp

+1 −1
Original line number Diff line number Diff line
@@ -528,7 +528,7 @@ bool RecoveryUI::IsLongPress() { 
  return result;

}



bool RecoveryUI::HasThreeButtons() {

bool RecoveryUI::HasThreeButtons() const {

  return has_power_key && has_up_key && has_down_key;

}