Tao Bao
2aa8516102
Merge "wear_ui: Address a TODO regarding {intro,loop}_frames." am: 0f3aa6ec38 am: b730743b40
...
am: 6171da90c5
Change-Id: I53abe3ff30d8d60389a429c837c230758af54d50
2018-05-15 21:20:23 -07:00
Tao Bao
6171da90c5
Merge "wear_ui: Address a TODO regarding {intro,loop}_frames." am: 0f3aa6ec38
...
am: b730743b40
Change-Id: I0a8ba6bf7836bde00e93f2ce9a011ace9acbac5d
2018-05-15 21:16:22 -07:00
Tao Bao
b730743b40
Merge "wear_ui: Address a TODO regarding {intro,loop}_frames."
...
am: 0f3aa6ec38
Change-Id: Ia9bc12ff45cf42124601cffb33da960bd9e377c1
2018-05-15 21:12:19 -07:00
Tao Bao
0f3aa6ec38
Merge "wear_ui: Address a TODO regarding {intro,loop}_frames."
2018-05-16 04:04:54 +00:00
Tao Bao
152e0eb20b
wear_ui: Address a TODO regarding {intro,loop}_frames.
...
Also add tests for LoadAnimation that cover the change.
Test: Run `recovery_unit_test` on marlin.
Change-Id: I0380a5cdd0d85d55baecf7759eb647b6a9f3a085
2018-05-14 11:14:00 -07:00
Tao Bao
baa4f0d2af
Merge "Clean up the Makefile for recovery and tests." am: 1f0b9962b0 am: 0c2998ffe3
...
am: 554a876cc1
Change-Id: I830f6023b59de90e42706359a12d38191a74bf34
2018-05-11 18:15:46 -07:00
Tao Bao
554a876cc1
Merge "Clean up the Makefile for recovery and tests." am: 1f0b9962b0
...
am: 0c2998ffe3
Change-Id: I5d4765279fa10317e7f8d61cc4f0972baf10040e
2018-05-11 18:06:19 -07:00
Tao Bao
0c2998ffe3
Merge "Clean up the Makefile for recovery and tests."
...
am: 1f0b9962b0
Change-Id: I79b21e9b93f8876a00176751a4664f6175a384be
2018-05-11 18:01:48 -07:00
Tao Bao
1f0b9962b0
Merge "Clean up the Makefile for recovery and tests."
2018-05-12 00:55:35 +00:00
Tao Bao
9e30997676
Clean up the Makefile for recovery and tests.
...
Reorder librecovery and librecovery_ui, so that librecovery stays closer
to recovery (in preparation for later changes that move more files
between the two). For the libraries in LOCAL_STATIC_LIBRARIES, reorder
them based on the dependency - local modules coming first, with external
libraries near the end. Sort the local / external modules, unless a
specific order is needed.
In tests/Android.mk, split the monolithic list of LOCAL_STATIC_LIBRARIES
based on modules. This makes adding / finding libraries easier.
There's no functionality in this CL.
Test: mmma -j bootable/recovery
Change-Id: I6836be574df565001ae9cd3d466a2b6460d90d08
2018-05-11 15:53:58 -07:00
Tao Bao
b8c632aa9a
Merge "screen_ui: Fix an issue in RTL locale detection." am: 13d56e9bed am: 0e42c5680c
...
am: a8c819d98c
Change-Id: Ic7b0d44650e686a5fcd68fe9cb4e0e10b0f13772
2018-05-11 15:27:19 -07:00
Tao Bao
b3ef346da7
Merge "Move device.cpp into librecovery_ui." am: db6dc14bff am: fb8636f48f
...
am: 81726e4430
Change-Id: I9e9651052e6d9ab8573b13164e4fdcfd84104613
2018-05-11 15:19:12 -07:00
Tao Bao
a8c819d98c
Merge "screen_ui: Fix an issue in RTL locale detection." am: 13d56e9bed
...
am: 0e42c5680c
Change-Id: Id4819920e9fca4223cd7e3b80a7b909f392ab008
2018-05-11 14:50:40 -07:00
Tao Bao
0e42c5680c
Merge "screen_ui: Fix an issue in RTL locale detection."
...
am: 13d56e9bed
Change-Id: Icd9b2db1895f3329f34ca959d072abc5226d7cdd
2018-05-11 14:50:21 -07:00
Tao Bao
81726e4430
Merge "Move device.cpp into librecovery_ui." am: db6dc14bff
...
am: fb8636f48f
Change-Id: I18cad42da6f9f560c3ed1568a20889419520cd21
2018-05-11 14:50:21 -07:00
Treehugger Robot
13d56e9bed
Merge "screen_ui: Fix an issue in RTL locale detection."
2018-05-11 21:46:52 +00:00
Tao Bao
fb8636f48f
Merge "Move device.cpp into librecovery_ui."
...
am: db6dc14bff
Change-Id: I2ebd04cded12b61173d9334ddd241511efc6e406
2018-05-11 14:46:51 -07:00
Tao Bao
db6dc14bff
Merge "Move device.cpp into librecovery_ui."
2018-05-11 21:38:01 +00:00
Tao Bao
c03916ae5a
Merge "tests: Add tests for ScreenRecoveryUI." am: 8c6f699b36 am: ca88c67135
...
am: e0871294aa
Change-Id: I20f7a642596df6112acbc208e20eac3b1b4569a7
2018-05-11 14:34:42 -07:00
Tao Bao
e0871294aa
Merge "tests: Add tests for ScreenRecoveryUI." am: 8c6f699b36
...
am: ca88c67135
Change-Id: I238b8b412046c883863828d2b7578d51dadef9e0
2018-05-11 13:22:26 -07:00
Tao Bao
ca88c67135
Merge "tests: Add tests for ScreenRecoveryUI."
...
am: 8c6f699b36
Change-Id: I1fc42208d91ed211ac4b45c2d392a251c3d5ae53
2018-05-11 13:18:25 -07:00
Tao Bao
8c6f699b36
Merge "tests: Add tests for ScreenRecoveryUI."
2018-05-11 20:06:22 +00:00
Tao Bao
3bb7332a1e
Merge "recovery: Configure device menu based on runtime info." am: e498ef2f03 am: bd32e1b50b
...
am: 20976a0913
Change-Id: Ib76e58e8c2ce672184a056bc9dedc838adcabeda
2018-05-11 11:22:56 -07:00
Tao Bao
20976a0913
Merge "recovery: Configure device menu based on runtime info." am: e498ef2f03
...
am: bd32e1b50b
Change-Id: Id611c10a6f84afdec38ca01d6932f4c964f9c2ac
2018-05-11 10:57:40 -07:00
Tao Bao
bd32e1b50b
Merge "recovery: Configure device menu based on runtime info."
...
am: e498ef2f03
Change-Id: Ib513582394b796ca64c5e3ce46fc2bd535c621de
2018-05-11 10:54:10 -07:00
Tao Bao
6a542dcc3b
Move device.cpp into librecovery_ui.
...
librecovery_ui will be exposed for device-specific RecoveryUI. With the
current code structure, 'device.h' and 'ui.h' will always be needed in
order to implement device-specific RecoveryUI.
Bug: 76436783
Test: lunch aosp_{angler,marlin,dragon,walleye}-userdebug;
`mmma -j bootable/recovery` respectively.
Change-Id: I15e8851b230a65526ac9310e0ee6621b7daea589
2018-05-11 10:51:26 -07:00
Tao Bao
e498ef2f03
Merge "recovery: Configure device menu based on runtime info."
2018-05-11 17:34:01 +00:00
Tao Bao
e5d2c25ecf
recovery: Configure device menu based on runtime info.
...
Drop the dependency on build time flag of AB_OTA_UPDATER when compiling
device.cpp. Note that AB_OTA_UPDATER still guards the package install
behavior (install.cpp).
This can be extended to cover the entry of "Apply update from SD card".
Test: Build and boot into recovery on angler and walleye respectively.
Check the recovery menu.
Change-Id: I36a6a6b4101ba61d4d374e32353c36cc5716f9ce
2018-05-10 20:46:46 -07:00
Zhomart Mukhamejanov
76e6734173
Merge "updater_sample: add HAL compatibility check" am: 563d34f712 am: 0045e76c7c
...
am: 9ca1e2778a
Change-Id: I5a2c566ce804618eeef26b8096de3bb43cd5084e
2018-05-10 20:25:30 -07:00
Zhomart Mukhamejanov
9ca1e2778a
Merge "updater_sample: add HAL compatibility check" am: 563d34f712
...
am: 0045e76c7c
Change-Id: I433e03d9f9fad55b2b8b0b5a4b3eb492af34e8a5
2018-05-10 20:19:57 -07:00
Zhomart Mukhamejanov
0045e76c7c
Merge "updater_sample: add HAL compatibility check"
...
am: 563d34f712
Change-Id: If8e53285455f6b140ea2f0ebda06c35d6a94462f
2018-05-10 20:14:25 -07:00
Zhomart Mukhamejanov
563d34f712
Merge "updater_sample: add HAL compatibility check"
2018-05-11 03:05:21 +00:00
Tao Bao
0acf8ab264
Merge "Document the clang-format usage." am: 797550fb8b am: cc71d271c1
...
am: 374498ff33
Change-Id: I42d240997fa16637b5a32812292bcc5877b18978
2018-05-10 17:49:33 -07:00
Tao Bao
07c495ac07
Merge "Device owns the RecoveryUI instance." am: 6df846e337 am: 8d593973d6
...
am: 4fd58ca28a
Change-Id: I0373e17e90f88c6817d938c4bab3ea475fa9434f
2018-05-10 17:30:11 -07:00
Tao Bao
374498ff33
Merge "Document the clang-format usage." am: 797550fb8b
...
am: cc71d271c1
Change-Id: Ib48d6d84bb691a9fb5ef38233f44abe0d289a46b
2018-05-10 17:20:59 -07:00
Tao Bao
4fd58ca28a
Merge "Device owns the RecoveryUI instance." am: 6df846e337
...
am: 8d593973d6
Change-Id: I006ae17453913b7e9cd23bafc30862f1532e1f60
2018-05-10 17:20:02 -07:00
Tao Bao
cc71d271c1
Merge "Document the clang-format usage."
...
am: 797550fb8b
Change-Id: I810e2e89e3437c98a519c60c3582c4dcb1678d36
2018-05-10 17:16:52 -07:00
Tao Bao
8d593973d6
Merge "Device owns the RecoveryUI instance."
...
am: 6df846e337
Change-Id: I39b0576e0ff11f3c5d62b1611f47f44b8f18c382
2018-05-10 17:16:00 -07:00
Tao Bao
797550fb8b
Merge "Document the clang-format usage."
2018-05-11 00:04:06 +00:00
Tao Bao
6df846e337
Merge "Device owns the RecoveryUI instance."
2018-05-11 00:03:55 +00:00
Zhomart Mukhamejanov
d3ed5c4120
Merge "updater_sample: fix UpdateConfig" am: 7217e7045d am: 48294e3d86
...
am: cc65b655bb
Change-Id: Ia72f37dd0d43dfec957c48da3cebb369800a43d0
2018-05-10 15:32:42 -07:00
Zhomart Mukhamejanov
cc65b655bb
Merge "updater_sample: fix UpdateConfig" am: 7217e7045d
...
am: 48294e3d86
Change-Id: I62b089575d1cf2e576404f4df2fe9cb25ba685cb
2018-05-10 15:00:57 -07:00
Zhomart Mukhamejanov
48294e3d86
Merge "updater_sample: fix UpdateConfig"
...
am: 7217e7045d
Change-Id: I63af09b000961e79613798c818eeea626eb221b6
2018-05-10 14:56:56 -07:00
Zhomart Mukhamejanov
46a51ac4b6
updater_sample: add HAL compatibility check
...
- Refactor PrepareStreamingService#onHandleIntent
- Add PrepareStreamingService#verifyPackageCompatibility
Test: on the device
Bug: 79471299
Signed-off-by: Zhomart Mukhamejanov <zhomart@google.com >
Change-Id: I1b18502f0638d66810a3f7ada582e4c7cea20cdb
2018-05-10 14:45:52 -07:00
Zhomart Mukhamejanov
7217e7045d
Merge "updater_sample: fix UpdateConfig"
2018-05-10 21:45:03 +00:00
Tao Bao
601493e8c4
Document the clang-format usage.
...
`repo upload` and `git clang-format` may give slightly different
results, because they may trigger different `clang-format` binaries.
Document the setup to get consistent formatting results.
Test: N/A
Change-Id: I927dd25c7a6dd51be4812d5b3857a4b08c5a3f81
2018-05-10 13:12:59 -07:00
Zhomart Mukhamejanov
bb8a215138
updater_sample: fix UpdateConfig
...
- fix UpdateConfig
- fix smaple.json
- fix FileDownloaderTest
Test: manually
Change-Id: I09d272f77c89a02f54a24cf753fdfda4ce243927
Signed-off-by: Zhomart Mukhamejanov <zhomart@google.com >
2018-05-10 12:19:16 -07:00
Zhomart Mukhamejanov
c2378be37b
Merge "updater_sample: add http header demo" am: fe5b3e2b2d am: 319e191238
...
am: 775cdd1c76
Change-Id: Ia1af7a313965f8d0e9b4740f870080f5ecdc5cfd
2018-05-10 11:37:11 -07:00
Zhomart Mukhamejanov
775cdd1c76
Merge "updater_sample: add http header demo" am: fe5b3e2b2d
...
am: 319e191238
Change-Id: Icc1d5a3f2b627e4d63c98688dd6eb42200ad7c09
2018-05-10 11:10:09 -07:00
Zhomart Mukhamejanov
319e191238
Merge "updater_sample: add http header demo"
...
am: fe5b3e2b2d
Change-Id: I5f76d9f27d69fcdbe4f95194b34bad548f7e28e2
2018-05-10 10:59:06 -07:00