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

Commit 02abde50 authored by Doug Zongker's avatar Doug Zongker
Browse files

remove DefaultDevice's UI subclass 

RecoveryUI (which is the superclass of ScreenRecoveryUI), provides a
basic CheckKey method that is useful for devices that have KEY_POWER,
KEY_VOLUMEUP, and KEY_VOLUMEDOWN.  Stop overriding it with a less
featureful method; with this no recovery UI customization is needed
for most handheld devices (phones, tablets, etc.).

Change-Id: I7d57cfaaef79afea8af4fc3dbc570afc61aeb5bc
parent 276f37e4

default_device.cpp

+2 −11
Original line number Diff line number Diff line
@@ -31,20 +31,10 @@ static const char* ITEMS[] = {"reboot system now", 
                               "wipe cache partition",

                               NULL };



class DefaultUI : public ScreenRecoveryUI {

  public:

    virtual KeyAction CheckKey(int key) {

        if (key == KEY_HOME) {

            return TOGGLE;

        }

        return ENQUEUE;

    }

};



class DefaultDevice : public Device {

  public:

    DefaultDevice() :

        ui(new DefaultUI) {

        ui(new ScreenRecoveryUI) {

    }



    RecoveryUI* GetUI() { return ui; }
@@ -61,6 +51,7 @@ class DefaultDevice : public Device { 
                return kHighlightUp;



              case KEY_ENTER:

              case KEY_POWER:

                return kInvokeItem;

            }

        }

ui.cpp

+1 −1
Original line number Diff line number Diff line
@@ -276,7 +276,7 @@ void RecoveryUI::FlushKeys() { 
// - Press power seven times in a row to reboot.

// - Alternate vol-up and vol-down seven times to mount /system.

RecoveryUI::KeyAction RecoveryUI::CheckKey(int key) {

    if (IsKeyPressed(KEY_POWER) && key == KEY_VOLUMEUP) {

    if ((IsKeyPressed(KEY_POWER) && key == KEY_VOLUMEUP) || key == KEY_HOME) {

        return TOGGLE;

    }