Commit Graph

4728 Commits

Author SHA1 Message Date
Luke Song cffd5e58cf Merge "Restructure vr_ui" 2017-06-23 23:34:33 +00:00
Tao Bao a5172224a5 Use Makefile variables to specify margin settings. am: 855eaffff6 -s ours
am: 989385200f

Change-Id: I0bec043db9e23cb7c47ed2929b906e42561eacef
2017-06-23 22:46:48 +00:00
Tao Bao 781ba1f1ad screen_ui: Allow setting screen margin space. am: 8f7547edfa -s ours
am: 2abdb8d6e7

Change-Id: I0b2f63adc3b06b4ee72093821f31d76e6ccc82ef
2017-06-23 22:46:46 +00:00
Tao Bao 989385200f Use Makefile variables to specify margin settings.
am: 855eaffff6  -s ours

Change-Id: I25a554cd60a9e08d954180792c2b3d0931fe2400
2017-06-23 22:41:49 +00:00
Tao Bao 2abdb8d6e7 screen_ui: Allow setting screen margin space.
am: 8f7547edfa  -s ours

Change-Id: Ie480acb2efab18ec32c4964914457aac4f34e74e
2017-06-23 22:41:46 +00:00
Tao Bao 8226cd3906 Merge changes Icb6f7466,Ibf6238c9 am: eef231567c am: d1fa3c2380 am: 2eb2c0b276
am: 10ffcd12e9

Change-Id: I5286296ee5f9ea19fe2b3184db21c3b734a8a565
2017-06-23 22:07:00 +00:00
Tao Bao 10ffcd12e9 Merge changes Icb6f7466,Ibf6238c9 am: eef231567c am: d1fa3c2380
am: 2eb2c0b276

Change-Id: I228c3ccfa659b1d81e841eb66b9e446d665dd8ce
2017-06-23 22:01:44 +00:00
Tao Bao 2eb2c0b276 Merge changes Icb6f7466,Ibf6238c9 am: eef231567c
am: d1fa3c2380

Change-Id: Ib7e71dd067f73367b3461de613e63e476ad8f1de
2017-06-23 21:56:44 +00:00
Tao Bao d1fa3c2380 Merge changes Icb6f7466,Ibf6238c9
am: eef231567c

Change-Id: I02789095a2bfec89803f7484abc072d05d8b0148
2017-06-23 21:52:14 +00:00
Tao Bao eef231567c Merge changes Icb6f7466,Ibf6238c9
* changes:
  Use Makefile variables to specify margin settings.
  screen_ui: Allow setting screen margin space.
2017-06-23 21:44:01 +00:00
Luke Song 81a8e4cab2 Restructure vr_ui
Get rid of pixel offset variables, and use makefile variables in
BoardConfigs.

Bug: 37779982
Test: Verified vr ui has same behavior.
Change-Id: Ifbf44e27d7101aedbe3c0e6db4b8181d56efadfd
2017-06-23 14:33:46 -07:00
Tao Bao 855eaffff6 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 a92d8fb456)
2017-06-23 09:45:28 -07:00
Tao Bao 8f7547edfa 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
(cherry picked from commit 87f4650874)
2017-06-23 09:45:23 -07:00
Tao Bao 4521b7027f 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 a92d8fb456)
2017-06-23 09:22:34 -07:00
Tao Bao d9bc424960 Merge changes from topic 'recovery_ui_taimen'
* changes:
  Use Makefile variables to specify margin settings.
  screen_ui: Allow setting screen margin space.
2017-06-23 16:19:55 +00:00
Tianjie Xu 203544605e Merge "Remove the obsolete package_extract_dir() test" am: e916cca8a9 am: af913974a5 am: e002d96194
am: 617b702104

Change-Id: If64f4217fbdbfc849c851a2b94d306cf1755e65d
2017-06-23 05:02:27 +00:00
Tianjie Xu 617b702104 Merge "Remove the obsolete package_extract_dir() test" am: e916cca8a9 am: af913974a5
am: e002d96194

Change-Id: If4887683362c1a00ee20b0d6e447d70bff442c28
2017-06-23 04:58:26 +00:00
Tianjie Xu e002d96194 Merge "Remove the obsolete package_extract_dir() test" am: e916cca8a9
am: af913974a5

Change-Id: I6afcdb92726231325a7d2e8171e3e2b1b3b940e0
2017-06-23 04:53:56 +00:00
Tianjie Xu af913974a5 Merge "Remove the obsolete package_extract_dir() test"
am: e916cca8a9

Change-Id: If43bfd9b134a1b2630e5ad906770c6f9516c494d
2017-06-23 04:49:56 +00:00
Tianjie Xu e916cca8a9 Merge "Remove the obsolete package_extract_dir() test" 2017-06-23 04:46:14 +00:00
Tianjie Xu bb7e005a79 Remove the obsolete package_extract_dir() test
package_extract_dir() was removed in go/aog/402383, and the
corresponding UpdaterTest should be removed as well.

Bug: 62918308
Test: mma && code search
Change-Id: Ibe9c473a5d41d2fa4d26abca5684e71b104891b0
2017-06-22 17:35:06 -07:00
David Zeuthen 3cd634d311 update_verifier: Support AVB. am: 336cbce252 -s ours
am: eb0dfc0dc6  -s ours

Change-Id: I0e3bae1447fee7441daf6e5d3a2e3dcfa64f7775
2017-06-23 00:26:35 +00:00
David Zeuthen eb0dfc0dc6 update_verifier: Support AVB.
am: 336cbce252  -s ours

Change-Id: I3907377b5896f9b859703a5acad47486bd17a52d
2017-06-23 00:22:05 +00:00
David Zeuthen 336cbce252 update_verifier: Support AVB.
When using AVB, PRODUCT_SUPPORTS_VERITY is not set so check for
BOARD_ENABLE_AVB as well. Also AVB sets up the root filesystem as
'vroot' so map that to 'system' since this is what is
expected. Managed to test at least that the code is at least compiled
in:

 $ fastboot --set-active=_a
 Setting current slot to 'a'...
 OKAY [  0.023s]
 finished. total time: 0.023s

 $ fastboot reboot
 rebooting...

 finished. total time: 0.050s

 $ adb wait-for-device

 $ adb logcat |grep update_verifier
 03-04 05:28:56.773   630   630 I /system/bin/update_verifier: Started with arg 1: nonencrypted
 03-04 05:28:56.776   630   630 I /system/bin/update_verifier: Booting slot 0: isSlotMarkedSuccessful=0
 03-04 05:28:56.776   630   630 W /system/bin/update_verifier: Failed to open /data/ota_package/care_map.txt: No such file or directory
 03-04 05:28:56.788   630   630 I /system/bin/update_verifier: Marked slot 0 as booted successfully.
 03-04 05:28:56.788   630   630 I /system/bin/update_verifier: Leaving update_verifier.

Bug: 62464819
Test: Manually tested on device using AVB bootloader.
Merged-In: I13c0fe1cc5d0f397e36f5e62fcc05c8dfee5fd85
Change-Id: I2834b17688053411e7b904e31df9c83bf904cd56
2017-06-22 18:04:26 -04:00
David Zeuthen d0f330026f Merge "update_verifier: Support AVB." am: e248e434ea am: 1f108dae49 am: b0c38f1cce
am: 0f6a109f14

Change-Id: I8bcac1f9bbb2a84055708a74237ea6f3c60be21c
2017-06-22 20:03:54 +00:00
David Zeuthen 0f6a109f14 Merge "update_verifier: Support AVB." am: e248e434ea am: 1f108dae49
am: b0c38f1cce

Change-Id: If4e8be8b8277143cad9447a487a674e39ba5a832
2017-06-22 19:56:37 +00:00
Tao Bao a92d8fb456 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
2017-06-22 12:40:22 -07:00
David Zeuthen b0c38f1cce Merge "update_verifier: Support AVB." am: e248e434ea
am: 1f108dae49

Change-Id: I85544f829783fade5e91cfa1d48013047056924d
2017-06-22 19:26:10 +00:00
David Zeuthen 1f108dae49 Merge "update_verifier: Support AVB."
am: e248e434ea

Change-Id: Ia17522bce3427eb29fc0e8860ea6e05749047d49
2017-06-22 19:22:11 +00:00
Treehugger Robot e248e434ea Merge "update_verifier: Support AVB." 2017-06-22 19:15:15 +00:00
Tao Bao 171b4c4cbe screen_ui: Allow setting screen margin space.
We already have outer_width and outer_height in wear UI, and x_offset
and y_offset in VR UI. This CL adds margin_width_ and margin_height_ to
their base class (ScreenRecoveryUI) to shorten the gap. This will be in
general useful for round or round-cornered screens.

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

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
(cherry picked from commit 87f4650874)
2017-06-20 15:47:06 -07:00
Tao Bao 87f4650874 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
2017-06-20 13:19:22 -07:00
Jin Qian ac31808cd3 recovery: replace make_ext4 with e2fsprogs
Execute mke2fs to create empty ext4 filesystem.
Execute e2fsdroid to add files to filesystem.

Test: enter recovery mode and wipe data
Bug: 35219933
Change-Id: I10a9f4c1f4754ad864b2df45b1f879180ab33876
2017-06-19 19:22:24 +00:00
Luke Song cdbfbb04bd Merge "Introduce VR recovery ui" am: 5efe2bca22 am: 850e00951a am: 8daabacce5
am: e003fbaa2e

Change-Id: Id250042bae68eb4b2d93cfdeb1c7ec3a36d1e507
2017-06-17 00:47:27 +00:00
Luke Song e003fbaa2e Merge "Introduce VR recovery ui" am: 5efe2bca22 am: 850e00951a
am: 8daabacce5

Change-Id: I7aaad686f788672b9fd8be2173c7b9976c19e04f
2017-06-17 00:20:39 +00:00
Luke Song 8daabacce5 Merge "Introduce VR recovery ui" am: 5efe2bca22
am: 850e00951a

Change-Id: I498b7b568523631f41f92994a003e77492616916
2017-06-17 00:11:37 +00:00
Luke Song 850e00951a Merge "Introduce VR recovery ui"
am: 5efe2bca22

Change-Id: I5fb663d9922866aa57e0afcd6d86f3afdf0de8c9
2017-06-17 00:09:37 +00:00
Treehugger Robot 5efe2bca22 Merge "Introduce VR recovery ui" 2017-06-17 00:00:00 +00:00
Luke Song e2bd876043 Introduce VR recovery ui
A version of screen ui with specific adjustments for vr device
compatibility.

(cherrypick of a44dba7f4e to AOSP)

Bug: 37779982
Test: "adb reboot recovery" to view
Change-Id: If6b0f26c1b587f8d0176060685b5efb6c67593b1
2017-06-16 15:33:02 -07:00
Luke Song 0f8b3710db Merge "Introduce VR recovery ui" 2017-06-16 19:30:53 +00:00
Chih-hung Hsieh 7f1b5ecd08 Merge "Add OWNERS in bootable/recovery" am: ffd8505f4d am: 9f20e861b6 am: 80eb02dcbf
am: 14307c0c5f

Change-Id: I872e9aec11ebc60950edecf65c5e2f5ba894d5ff
2017-06-16 16:16:58 +00:00
Chih-hung Hsieh 14307c0c5f Merge "Add OWNERS in bootable/recovery" am: ffd8505f4d am: 9f20e861b6
am: 80eb02dcbf

Change-Id: Id5ee47cf4f4537b041ce9313dc45c9ad1f498d7f
2017-06-16 16:13:28 +00:00
Chih-hung Hsieh 80eb02dcbf Merge "Add OWNERS in bootable/recovery" am: ffd8505f4d
am: 9f20e861b6

Change-Id: If364b9bcb40126e8b892e2ac6ed1530f9959a1a6
2017-06-16 16:09:29 +00:00
Chih-hung Hsieh 9f20e861b6 Merge "Add OWNERS in bootable/recovery"
am: ffd8505f4d

Change-Id: I2675a929464997b106818afd4cf8a28b3b65f69c
2017-06-16 16:05:57 +00:00
Chih-hung Hsieh ffd8505f4d Merge "Add OWNERS in bootable/recovery" 2017-06-16 15:56:16 +00:00
Jeff Vander Stoep d2b09f1d90 Merge "Fix "No file_contexts" warning am: e35926e1af am: 3445b94c89" into oc-dr1-dev-plus-aosp
am: 2ea95442ed

Change-Id: I6ed6e51f75a28dc76977393b30c824a54b71553f
2017-06-16 03:05:17 +00:00
Jeff Vander Stoep 276f0cd1c7 Fix "No file_contexts" warning am: e35926e1af am: eba11fa574
am: 29476681cb

Change-Id: Ib8f7981adf3455af83ac28481bb109d9d924e900
2017-06-16 03:04:58 +00:00
Android Build Merger (Role) 2ea95442ed Merge "Fix "No file_contexts" warning am: e35926e1af am: 3445b94c89" into oc-dr1-dev-plus-aosp 2017-06-16 03:01:38 +00:00
Jeff Vander Stoep 29476681cb Fix "No file_contexts" warning am: e35926e1af
am: eba11fa574

Change-Id: I278bc4d7af6892ecf3c2d259f6d7fd32a34f19ec
2017-06-16 03:01:28 +00:00
Jeff Vander Stoep ce3f4dc513 Fix "No file_contexts" warning am: e35926e1af
am: 3445b94c89

Change-Id: I43f6596b266caff05e27c12ad1517e03e584d491
2017-06-16 03:01:28 +00:00