summaryrefslogtreecommitdiffstats
path: root/recovery_ui/screen_ui.cpp
diff options
context:
space:
mode:
authorTianjie Xu <xunchang@google.com>2018-08-20 22:40:47 +0200
committerxunchang <xunchang@google.com>2019-03-21 18:46:11 +0100
commit8f397309b41814205c8d32f1c10f6b056c13e8c3 (patch)
tree53c458f85d7ec6ea5243002786d340c8b57dbad6 /recovery_ui/screen_ui.cpp
parentMerge "Move apply_from_sdcard to fuse_sdcard_install" (diff)
downloadandroid_bootable_recovery-8f397309b41814205c8d32f1c10f6b056c13e8c3.tar
android_bootable_recovery-8f397309b41814205c8d32f1c10f6b056c13e8c3.tar.gz
android_bootable_recovery-8f397309b41814205c8d32f1c10f6b056c13e8c3.tar.bz2
android_bootable_recovery-8f397309b41814205c8d32f1c10f6b056c13e8c3.tar.lz
android_bootable_recovery-8f397309b41814205c8d32f1c10f6b056c13e8c3.tar.xz
android_bootable_recovery-8f397309b41814205c8d32f1c10f6b056c13e8c3.tar.zst
android_bootable_recovery-8f397309b41814205c8d32f1c10f6b056c13e8c3.zip
Diffstat (limited to '')
-rw-r--r--recovery_ui/screen_ui.cpp (renamed from screen_ui.cpp)16
1 files changed, 8 insertions, 8 deletions
diff --git a/screen_ui.cpp b/recovery_ui/screen_ui.cpp
index 6f2b68b41..870db621c 100644
--- a/screen_ui.cpp
+++ b/recovery_ui/screen_ui.cpp
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#include "screen_ui.h"
+#include "recovery_ui/screen_ui.h"
#include <dirent.h>
#include <errno.h>
@@ -42,10 +42,10 @@
#include <android-base/stringprintf.h>
#include <android-base/strings.h>
-#include "device.h"
#include "minui/minui.h"
#include "otautil/paths.h"
-#include "ui.h"
+#include "recovery_ui/device.h"
+#include "recovery_ui/ui.h"
// Return the current time as a double (including fractions of a second).
static double now() {
@@ -388,10 +388,10 @@ int ScreenRecoveryUI::PixelsFromDp(int dp) const {
enum Layout { PORTRAIT = 0, PORTRAIT_LARGE = 1, LANDSCAPE = 2, LANDSCAPE_LARGE = 3, LAYOUT_MAX };
enum Dimension { TEXT = 0, ICON = 1, DIMENSION_MAX };
static constexpr int kLayouts[LAYOUT_MAX][DIMENSION_MAX] = {
- { 32, 68, }, // PORTRAIT
- { 32, 68, }, // PORTRAIT_LARGE
- { 26, 56, }, // LANDSCAPE
- { 52, 112, }, // LANDSCAPE_LARGE
+ { 32, 68 }, // PORTRAIT
+ { 32, 68 }, // PORTRAIT_LARGE
+ { 26, 56 }, // LANDSCAPE
+ { 52, 112 }, // LANDSCAPE_LARGE
};
int ScreenRecoveryUI::GetAnimationBaseline() const {
@@ -1042,7 +1042,7 @@ void ScreenRecoveryUI::Print(const char* fmt, ...) {
va_end(ap);
}
-void ScreenRecoveryUI::PrintOnScreenOnly(const char *fmt, ...) {
+void ScreenRecoveryUI::PrintOnScreenOnly(const char* fmt, ...) {
va_list ap;
va_start(ap, fmt);
PrintV(fmt, false, ap);