Gitiles
Code Review Sign In
gerrit.twrp.me / android_bootable_recovery / 87f4650874346f1d0238e70b148a31cea5e19a2e
commit87f4650874346f1d0238e70b148a31cea5e19a2e[log] [tgz]
authorTao Bao <tbao@google.com>Mon Jun 19 23:10:44 2017 -0700
committerTao Bao <tbao@google.com>Tue Jun 20 13:19:22 2017 -0700
treee3504aa296dfa8196c9143d8435822ef30e91059
parentcdbfbb04bde1d04e62f77346352fbd755ff1aa41 [diff]
screen_ui: Allow setting screen margin space.

For round screen or screens with rounded corners, we don't want to show
texts within the margin which could otherwise be invisible.

Move the density computation to ScreenRecoveryUI ctor so that the value
can be used earlier.

Note that this is similar to the existing stuff in wear UI (outer_width,
outer_height). This CL gets ScreenRecoveryUI and WearRecoveryUI one-step
closer.

Bug: 62732748
Test: Setting and not setting margin_{width,height}_ on angler. Check the
      recovery texts (recovery menu as well as 'View recovery logs').
Change-Id: Ibf6238c9cc8949a42ed8a410e1c09d55b0b5a151
2 files changed
tree: e3504aa296dfa8196c9143d8435822ef30e91059
  1. applypatch/
  2. boot_control/
  3. bootloader_message/
  4. edify/
  5. etc/
  6. fonts/
  7. minadbd/
  8. minui/
  9. otafault/
  10. otautil/
  11. private/
  12. res-hdpi/
  13. res-mdpi/
  14. res-xhdpi/
  15. res-xxhdpi/
  16. res-xxxhdpi/
  17. tests/
  18. tools/
  19. uncrypt/
  20. update_verifier/
  21. updater/
  22. res-560dpi ⇨ res-xxxhdpi
  23. .clang-format
  24. adb_install.cpp
  25. adb_install.h
  26. Android.bp
  27. Android.mk
  28. asn1_decoder.cpp
  29. asn1_decoder.h
  30. bootloader.h
  31. CleanSpec.mk
  32. common.h
  33. default_device.cpp
  34. device.cpp
  35. device.h
  36. error_code.h
  37. fuse_sdcard_provider.cpp
  38. fuse_sdcard_provider.h
  39. fuse_sideload.cpp
  40. fuse_sideload.h
  41. install.cpp
  42. install.h
  43. interlace-frames.py
  44. mounts.cpp
  45. mounts.h
  46. NOTICE
  47. OWNERS
  48. print_sha1.h
  49. README.md
  50. recovery-persist.cpp
  51. recovery-persist.rc
  52. recovery-refresh.cpp
  53. recovery-refresh.rc
  54. recovery.cpp
  55. roots.cpp
  56. roots.h
  57. rotate_logs.cpp
  58. rotate_logs.h
  59. screen_ui.cpp
  60. screen_ui.h
  61. stub_ui.h
  62. ui.cpp
  63. ui.h
  64. verifier.cpp
  65. verifier.h
  66. vr_device.cpp
  67. vr_ui.cpp
  68. vr_ui.h
  69. wear_touch.cpp
  70. wear_touch.h
  71. wear_ui.cpp
  72. wear_ui.h
README.md

The Recovery Image

Quick turn-around testing

mm -j && m ramdisk-nodeps && m recoveryimage-nodeps

# To boot into the new recovery image
# without flashing the recovery partition:
adb reboot bootloader
fastboot boot $ANDROID_PRODUCT_OUT/recovery.img

Running the tests

# After setting up environment and lunch.
mmma -j bootable/recovery

# Running the tests on device.
adb root
adb sync data

# 32-bit device
adb shell /data/nativetest/recovery_unit_test/recovery_unit_test
adb shell /data/nativetest/recovery_component_test/recovery_component_test

# Or 64-bit device
adb shell /data/nativetest64/recovery_unit_test/recovery_unit_test
adb shell /data/nativetest64/recovery_component_test/recovery_component_test

Running the manual tests

recovery-refresh and recovery-persist executables exist only on systems without /cache partition. And we need to follow special steps to run tests for them.

  • Execute the test on an A/B device first. The test should fail but it will log some contents to pmsg.

  • Reboot the device immediately and run the test again. The test should save the contents of pmsg buffer into /data/misc/recovery/inject.txt. Test will pass if this file has expected contents.

ResourceTest validates whether the png files are qualified as background text image under recovery.

1. `adb sync data` to make sure the test-dir has the images to test.
2. The test will automatically pickup and verify all `_text.png` files in
   the test dir.