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

Commit 4a6ee6d9 authored by /e/ robot's avatar /e/ robot
Browse files

Merge remote-tracking branch 'origin/lineage-21.0' into v1-u

parents f17aaffa 8d9befac
Loading
Loading
Loading
Loading
+2 −0
Original line number Diff line number Diff line
@@ -535,6 +535,8 @@ class ScreenRecoveryUI : public RecoveryUI, public DrawInterface {
  // Switch the display to active one after graphics is ready
  bool is_graphics_available;

  bool is_battery_less;

 private:
  void SetLocale(const std::string&);

+6 −2
Original line number Diff line number Diff line
@@ -905,6 +905,8 @@ void ScreenRecoveryUI::draw_battery_capacity_locked() {
  int y = margin_height_ + gr_get_height(e_logo_.get());
  int icon_x, icon_y, icon_h, icon_w;

  if (is_battery_less) return;

  // Battery status
  std::string batt_capacity = std::to_string(batt_capacity_) + '%';

@@ -1224,6 +1226,8 @@ bool ScreenRecoveryUI::Init(const std::string& locale) {

  LoadAnimation();

  is_battery_less = android::base::GetBoolProperty("ro.recovery.batteryless", false);
  if (!is_battery_less)
    // Keep the battery capacity updated.
    batt_monitor_thread_ = std::thread(&ScreenRecoveryUI::BattMonitorThreadLoop, this);