tequilaOS/platform_bootable_recovery
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Implement ShowMenu for StubRecoveryUI"

Browse source
This commit is contained in:
Tianjie Xu 2019-06-28 17:45:01 +00:00 committed by Gerrit Code Review
commit 6f114c72db
3 changed files with 39 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
recovery_ui/Android.bp
View file

@ -23,6 +23,7 @@ cc_library {
srcs: [
"device.cpp",
"screen_ui.cpp",
"stub_ui.cpp",
"ui.cpp",
"vr_ui.cpp",
"wear_ui.cpp",

6
recovery_ui/include/recovery_ui/stub_ui.h
View file

@ -62,11 +62,9 @@ class StubRecoveryUI : public RecoveryUI {
// menu display
size_t ShowMenu(const std::vector<std::string>& /* headers */,
const std::vector<std::string>& /* items */, size_t initial_selection,
const std::vector<std::string>& /* items */, size_t /* initial_selection */,
bool /* menu_only */,
const std::function<int(int, bool)>& /* key_handler */) override {
return initial_selection;
}
const std::function<int(int, bool)>& /* key_handler */) override;
size_t ShowPromptWipeDataMenu(const std::vector<std::string>& /* backup_headers */,
const std::vector<std::string>& /* backup_items */,

36
recovery_ui/stub_ui.cpp Normal file
View file

@ -0,0 +1,36 @@
/*
* Copyright (C) 2019 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#include "recovery_ui/stub_ui.h"
#include <android-base/logging.h>
#include "recovery_ui/device.h"
size_t StubRecoveryUI::ShowMenu(const std::vector<std::string>& /* headers */,
const std::vector<std::string>& /* items */,
size_t /* initial_selection */, bool /* menu_only */,
const std::function<int(int, bool)>& /*key_handler*/) {
while (true) {
int key = WaitKey();
// Exit the loop in the case of interruption or time out.
if (key == static_cast<int>(KeyError::INTERRUPTED) ||
key == static_cast<int>(KeyError::TIMED_OUT)) {
return static_cast<size_t>(key);
}
}
LOG(FATAL) << "Unreachable key selected in ShowMenu of stub UI";
}