aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTao Bao2017-08-02 19:11:04 -0500
committerTao Bao2017-08-10 11:31:17 -0500
commit0470ceea381775b09eee931858c3320be88cc637 (patch)
tree7beb1970589bd76180f0342c3e8ef4323c8341f6 /Android.mk
parent0459799ea83d669df089c670f244771b7be211e3 (diff)
downloadplatform-bootable-recovery-0470ceea381775b09eee931858c3320be88cc637.tar.gz
platform-bootable-recovery-0470ceea381775b09eee931858c3320be88cc637.tar.xz
platform-bootable-recovery-0470ceea381775b09eee931858c3320be88cc637.zip
Allow customizing WearRecoveryUI via Makefile variables.
With the following Makefile variables, we can reduce the work of writing (copy/pasting) device-specific WearRecoveryUI classes. The list of Makefile variables (the ones useful for Wear devices): - TARGET_RECOVERY_UI_MARGIN_HEIGHT (default: 0) - TARGET_RECOVERY_UI_MARGIN_WIDTH (default: 0) Specify the margin space that we don't want to display texts. They replace the former outer_width and outer_height. - TARGET_RECOVERY_UI_TOUCH_LOW_THRESHOLD (default: 50) - TARGET_RECOVERY_UI_TOUCH_HIGH_THRESHOLD (default: 90) Specify the sensitivity of recognizing a swipe. Devices give absolute positions, so for some devices we need to adjust the thresholds. - TARGET_RECOVERY_UI_PROGRESS_BAR_BASELINE Specify the progress bar vertical position, which should be adjusted to the actual height of a device. It replaces the former progress_bar_y. - TARGET_RECOVERY_UI_ANIMATION_FPS (default: 30) Specify the animation FPS if using device-specific animation images. It replaces the former animation_fps. Devices can specify "TARGET_RECOVERY_UI_LIB := librecovery_ui_wear", with optionally defined Makefile vars above, in BoardConfig.mk to customize their WearRecoveryUI. Also remove the obsolete wear_touch.{cpp,h}, which has been merged into ui.cpp in commit 5f8dd9951d986b65d98d6a9ea38003427e9e46df. Bug: 64307776 Test: Change the device BoardConfig.mk and test recovery image. Change-Id: Id0fb2d4e3977ab5ddd31e71f9535470cab70e41b
Diffstat (limited to 'Android.mk')
-rw-r--r--Android.mk23
1 files changed, 22 insertions, 1 deletions
diff --git a/Android.mk b/Android.mk
index 967b9dfb..b1ee2440 100644
--- a/Android.mk
+++ b/Android.mk
@@ -79,7 +79,6 @@ LOCAL_SRC_FILES := \
79 ui.cpp \ 79 ui.cpp \
80 vr_ui.cpp \ 80 vr_ui.cpp \
81 wear_ui.cpp \ 81 wear_ui.cpp \
82 wear_touch.cpp \
83 82
84LOCAL_MODULE := recovery 83LOCAL_MODULE := recovery
85 84
@@ -120,6 +119,18 @@ else
120LOCAL_CFLAGS += -DRECOVERY_UI_TOUCH_HIGH_THRESHOLD=90 119LOCAL_CFLAGS += -DRECOVERY_UI_TOUCH_HIGH_THRESHOLD=90
121endif 120endif
122 121
122ifneq ($(TARGET_RECOVERY_UI_PROGRESS_BAR_BASELINE),)
123LOCAL_CFLAGS += -DRECOVERY_UI_PROGRESS_BAR_BASELINE=$(TARGET_RECOVERY_UI_PROGRESS_BAR_BASELINE)
124else
125LOCAL_CFLAGS += -DRECOVERY_UI_PROGRESS_BAR_BASELINE=259
126endif
127
128ifneq ($(TARGET_RECOVERY_UI_ANIMATION_FPS),)
129LOCAL_CFLAGS += -DRECOVERY_UI_ANIMATION_FPS=$(TARGET_RECOVERY_UI_ANIMATION_FPS)
130else
131LOCAL_CFLAGS += -DRECOVERY_UI_ANIMATION_FPS=30
132endif
133
123ifneq ($(TARGET_RECOVERY_UI_VR_STEREO_OFFSET),) 134ifneq ($(TARGET_RECOVERY_UI_VR_STEREO_OFFSET),)
124LOCAL_CFLAGS += -DRECOVERY_UI_VR_STEREO_OFFSET=$(TARGET_RECOVERY_UI_VR_STEREO_OFFSET) 135LOCAL_CFLAGS += -DRECOVERY_UI_VR_STEREO_OFFSET=$(TARGET_RECOVERY_UI_VR_STEREO_OFFSET)
125else 136else
@@ -216,6 +227,16 @@ LOCAL_STATIC_LIBRARIES := \
216LOCAL_CFLAGS := -Werror 227LOCAL_CFLAGS := -Werror
217include $(BUILD_STATIC_LIBRARY) 228include $(BUILD_STATIC_LIBRARY)
218 229
230# Wear default device
231# ===============================
232include $(CLEAR_VARS)
233LOCAL_SRC_FILES := wear_device.cpp
234
235# Should match TARGET_RECOVERY_UI_LIB in BoardConfig.mk.
236LOCAL_MODULE := librecovery_ui_wear
237
238include $(BUILD_STATIC_LIBRARY)
239
219# vr headset default device 240# vr headset default device
220# =============================== 241# ===============================
221include $(CLEAR_VARS) 242include $(CLEAR_VARS)