commit 855eaffff674f0c90cf6fe107f8d10b50efc3965
author Tao Bao <tbao@google.com> Tue Jun 20 18:11:21 2017 -0700
committer Tao Bao <tbao@google.com> Fri Jun 23 09:45:28 2017 -0700
tree 3321376f646731706c186ea61884ee342e1b96f6
parent 8f7547edfa7ca76e2d2c0a162911e4925675258e

Use Makefile variables to specify margin settings.

Instead of defining device-specific UI class, this CL allows using
Makefile variables to specify margin values directly.

Values explicitly defined via TARGET_RECOVERY_UI_MARGIN_HEIGHT and
TARGET_RECOVERY_UI_MARGIN_WIDTH will be used. Otherwise they will
default to zero.

Bug: 62732748
Test: Specify the height and width and check recovery texts.
Change-Id: Icb6f7466c8d407f877b93da38aebfdf7e6b41be7
(cherry picked from commit a92d8fb45676566a56d7c27d2e8fb644523adc94)

Android.mk

diff --git a/Android.mk b/Android.mk
index e619db0..5f3a8a4 100644
--- a/Android.mk
+++ b/Android.mk
@@ -92,6 +92,18 @@
 LOCAL_CFLAGS += -DRECOVERY_API_VERSION=$(RECOVERY_API_VERSION)
 LOCAL_CFLAGS += -Wno-unused-parameter -Werror
 
+ifneq ($(TARGET_RECOVERY_UI_MARGIN_HEIGHT),)
+LOCAL_CFLAGS += -DRECOVERY_UI_MARGIN_HEIGHT=$(TARGET_RECOVERY_UI_MARGIN_HEIGHT)
+else
+LOCAL_CFLAGS += -DRECOVERY_UI_MARGIN_HEIGHT=0
+endif
+
+ifneq ($(TARGET_RECOVERY_UI_MARGIN_WIDTH),)
+LOCAL_CFLAGS += -DRECOVERY_UI_MARGIN_WIDTH=$(TARGET_RECOVERY_UI_MARGIN_WIDTH)
+else
+LOCAL_CFLAGS += -DRECOVERY_UI_MARGIN_WIDTH=0
+endif
+
 LOCAL_C_INCLUDES += \
     system/vold \