diff options
345 files changed, 623 insertions, 56 deletions
diff --git a/assetstudio/src/images/clipart/big/1-navigation-accept.png b/assetstudio/src/images/clipart/big/1-navigation-accept.png Binary files differnew file mode 100644 index 0000000..121b347 --- /dev/null +++ b/assetstudio/src/images/clipart/big/1-navigation-accept.png diff --git a/assetstudio/src/images/clipart/big/1-navigation-back.png b/assetstudio/src/images/clipart/big/1-navigation-back.png Binary files differnew file mode 100644 index 0000000..863074c --- /dev/null +++ b/assetstudio/src/images/clipart/big/1-navigation-back.png diff --git a/assetstudio/src/images/clipart/big/1-navigation-cancel.png b/assetstudio/src/images/clipart/big/1-navigation-cancel.png Binary files differnew file mode 100644 index 0000000..d968d34 --- /dev/null +++ b/assetstudio/src/images/clipart/big/1-navigation-cancel.png diff --git a/assetstudio/src/images/clipart/big/1-navigation-collapse.png b/assetstudio/src/images/clipart/big/1-navigation-collapse.png Binary files differnew file mode 100644 index 0000000..e525983 --- /dev/null +++ b/assetstudio/src/images/clipart/big/1-navigation-collapse.png diff --git a/assetstudio/src/images/clipart/big/1-navigation-expand.png b/assetstudio/src/images/clipart/big/1-navigation-expand.png Binary files differnew file mode 100644 index 0000000..f5b0728 --- /dev/null +++ b/assetstudio/src/images/clipart/big/1-navigation-expand.png diff --git a/assetstudio/src/images/clipart/big/1-navigation-forward.png b/assetstudio/src/images/clipart/big/1-navigation-forward.png Binary files differnew file mode 100644 index 0000000..4cae802 --- /dev/null +++ b/assetstudio/src/images/clipart/big/1-navigation-forward.png diff --git a/assetstudio/src/images/clipart/big/1-navigation-next-item.png b/assetstudio/src/images/clipart/big/1-navigation-next-item.png Binary files differnew file mode 100644 index 0000000..a1b8b83 --- /dev/null +++ b/assetstudio/src/images/clipart/big/1-navigation-next-item.png diff --git a/assetstudio/src/images/clipart/big/1-navigation-previous-item.png b/assetstudio/src/images/clipart/big/1-navigation-previous-item.png Binary files differnew file mode 100644 index 0000000..9312bf6 --- /dev/null +++ b/assetstudio/src/images/clipart/big/1-navigation-previous-item.png diff --git a/assetstudio/src/images/clipart/big/1-navigation-refresh.png b/assetstudio/src/images/clipart/big/1-navigation-refresh.png Binary files differnew file mode 100644 index 0000000..b5202f9 --- /dev/null +++ b/assetstudio/src/images/clipart/big/1-navigation-refresh.png diff --git a/assetstudio/src/images/clipart/big/10-device-access-accounts.png b/assetstudio/src/images/clipart/big/10-device-access-accounts.png Binary files differnew file mode 100644 index 0000000..64544c5 --- /dev/null +++ b/assetstudio/src/images/clipart/big/10-device-access-accounts.png diff --git a/assetstudio/src/images/clipart/big/10-device-access-add-alarm.png b/assetstudio/src/images/clipart/big/10-device-access-add-alarm.png Binary files differnew file mode 100644 index 0000000..bd4bcc3 --- /dev/null +++ b/assetstudio/src/images/clipart/big/10-device-access-add-alarm.png diff --git a/assetstudio/src/images/clipart/big/10-device-access-alarms.png b/assetstudio/src/images/clipart/big/10-device-access-alarms.png Binary files differnew file mode 100644 index 0000000..a5b1ead --- /dev/null +++ b/assetstudio/src/images/clipart/big/10-device-access-alarms.png diff --git a/assetstudio/src/images/clipart/big/10-device-access-battery.png b/assetstudio/src/images/clipart/big/10-device-access-battery.png Binary files differnew file mode 100644 index 0000000..d86b2c1 --- /dev/null +++ b/assetstudio/src/images/clipart/big/10-device-access-battery.png diff --git a/assetstudio/src/images/clipart/big/10-device-access-bightness-low.png b/assetstudio/src/images/clipart/big/10-device-access-bightness-low.png Binary files differnew file mode 100644 index 0000000..738f203 --- /dev/null +++ b/assetstudio/src/images/clipart/big/10-device-access-bightness-low.png diff --git a/assetstudio/src/images/clipart/big/10-device-access-bluetooth-connected.png b/assetstudio/src/images/clipart/big/10-device-access-bluetooth-connected.png Binary files differnew file mode 100644 index 0000000..403a0b5 --- /dev/null +++ b/assetstudio/src/images/clipart/big/10-device-access-bluetooth-connected.png diff --git a/assetstudio/src/images/clipart/big/10-device-access-bluetooth-searching.png b/assetstudio/src/images/clipart/big/10-device-access-bluetooth-searching.png Binary files differnew file mode 100644 index 0000000..a99f65a --- /dev/null +++ b/assetstudio/src/images/clipart/big/10-device-access-bluetooth-searching.png diff --git a/assetstudio/src/images/clipart/big/10-device-access-bluetooth.png b/assetstudio/src/images/clipart/big/10-device-access-bluetooth.png Binary files differnew file mode 100644 index 0000000..556499d --- /dev/null +++ b/assetstudio/src/images/clipart/big/10-device-access-bluetooth.png diff --git a/assetstudio/src/images/clipart/big/10-device-access-brightness-auto.png b/assetstudio/src/images/clipart/big/10-device-access-brightness-auto.png Binary files differnew file mode 100644 index 0000000..46d2b8a --- /dev/null +++ b/assetstudio/src/images/clipart/big/10-device-access-brightness-auto.png diff --git a/assetstudio/src/images/clipart/big/10-device-access-brightness-high.png b/assetstudio/src/images/clipart/big/10-device-access-brightness-high.png Binary files differnew file mode 100644 index 0000000..97e3f19 --- /dev/null +++ b/assetstudio/src/images/clipart/big/10-device-access-brightness-high.png diff --git a/assetstudio/src/images/clipart/big/10-device-access-brightness-medium.png b/assetstudio/src/images/clipart/big/10-device-access-brightness-medium.png Binary files differnew file mode 100644 index 0000000..5e361cb --- /dev/null +++ b/assetstudio/src/images/clipart/big/10-device-access-brightness-medium.png diff --git a/assetstudio/src/images/clipart/big/10-device-access-call.png b/assetstudio/src/images/clipart/big/10-device-access-call.png Binary files differnew file mode 100644 index 0000000..940bcb6 --- /dev/null +++ b/assetstudio/src/images/clipart/big/10-device-access-call.png diff --git a/assetstudio/src/images/clipart/big/10-device-access-camera.png b/assetstudio/src/images/clipart/big/10-device-access-camera.png Binary files differnew file mode 100644 index 0000000..ad8857a --- /dev/null +++ b/assetstudio/src/images/clipart/big/10-device-access-camera.png diff --git a/assetstudio/src/images/clipart/big/10-device-access-data-usage.png b/assetstudio/src/images/clipart/big/10-device-access-data-usage.png Binary files differnew file mode 100644 index 0000000..9fa73a5 --- /dev/null +++ b/assetstudio/src/images/clipart/big/10-device-access-data-usage.png diff --git a/assetstudio/src/images/clipart/big/10-device-access-dial-pad.png b/assetstudio/src/images/clipart/big/10-device-access-dial-pad.png Binary files differnew file mode 100644 index 0000000..81da080 --- /dev/null +++ b/assetstudio/src/images/clipart/big/10-device-access-dial-pad.png diff --git a/assetstudio/src/images/clipart/big/10-device-access-end-call.png b/assetstudio/src/images/clipart/big/10-device-access-end-call.png Binary files differnew file mode 100644 index 0000000..c28f284 --- /dev/null +++ b/assetstudio/src/images/clipart/big/10-device-access-end-call.png diff --git a/assetstudio/src/images/clipart/big/10-device-access-flash-automatic.png b/assetstudio/src/images/clipart/big/10-device-access-flash-automatic.png Binary files differnew file mode 100644 index 0000000..e5c2c03 --- /dev/null +++ b/assetstudio/src/images/clipart/big/10-device-access-flash-automatic.png diff --git a/assetstudio/src/images/clipart/big/10-device-access-flash-off.png b/assetstudio/src/images/clipart/big/10-device-access-flash-off.png Binary files differnew file mode 100644 index 0000000..dfcb747 --- /dev/null +++ b/assetstudio/src/images/clipart/big/10-device-access-flash-off.png diff --git a/assetstudio/src/images/clipart/big/10-device-access-flash-on.png b/assetstudio/src/images/clipart/big/10-device-access-flash-on.png Binary files differnew file mode 100644 index 0000000..1109aa0 --- /dev/null +++ b/assetstudio/src/images/clipart/big/10-device-access-flash-on.png diff --git a/assetstudio/src/images/clipart/big/10-device-access-location-found.png b/assetstudio/src/images/clipart/big/10-device-access-location-found.png Binary files differnew file mode 100644 index 0000000..d829a3c --- /dev/null +++ b/assetstudio/src/images/clipart/big/10-device-access-location-found.png diff --git a/assetstudio/src/images/clipart/big/10-device-access-location-off.png b/assetstudio/src/images/clipart/big/10-device-access-location-off.png Binary files differnew file mode 100644 index 0000000..e58c258 --- /dev/null +++ b/assetstudio/src/images/clipart/big/10-device-access-location-off.png diff --git a/assetstudio/src/images/clipart/big/10-device-access-location-searching.png b/assetstudio/src/images/clipart/big/10-device-access-location-searching.png Binary files differnew file mode 100644 index 0000000..3de2f26 --- /dev/null +++ b/assetstudio/src/images/clipart/big/10-device-access-location-searching.png diff --git a/assetstudio/src/images/clipart/big/10-device-access-mic-muted.png b/assetstudio/src/images/clipart/big/10-device-access-mic-muted.png Binary files differnew file mode 100644 index 0000000..65b4ae6 --- /dev/null +++ b/assetstudio/src/images/clipart/big/10-device-access-mic-muted.png diff --git a/assetstudio/src/images/clipart/big/10-device-access-mic.png b/assetstudio/src/images/clipart/big/10-device-access-mic.png Binary files differnew file mode 100644 index 0000000..02c1ee8 --- /dev/null +++ b/assetstudio/src/images/clipart/big/10-device-access-mic.png diff --git a/assetstudio/src/images/clipart/big/10-device-access-network-cell.png b/assetstudio/src/images/clipart/big/10-device-access-network-cell.png Binary files differnew file mode 100644 index 0000000..9d60dbd --- /dev/null +++ b/assetstudio/src/images/clipart/big/10-device-access-network-cell.png diff --git a/assetstudio/src/images/clipart/big/10-device-access-network-wifi.png b/assetstudio/src/images/clipart/big/10-device-access-network-wifi.png Binary files differnew file mode 100644 index 0000000..577abdb --- /dev/null +++ b/assetstudio/src/images/clipart/big/10-device-access-network-wifi.png diff --git a/assetstudio/src/images/clipart/big/10-device-access-new-account.png b/assetstudio/src/images/clipart/big/10-device-access-new-account.png Binary files differnew file mode 100644 index 0000000..d9707d8 --- /dev/null +++ b/assetstudio/src/images/clipart/big/10-device-access-new-account.png diff --git a/assetstudio/src/images/clipart/big/10-device-access-not-secure.png b/assetstudio/src/images/clipart/big/10-device-access-not-secure.png Binary files differnew file mode 100644 index 0000000..2ea293a --- /dev/null +++ b/assetstudio/src/images/clipart/big/10-device-access-not-secure.png diff --git a/assetstudio/src/images/clipart/big/10-device-access-ring-volume.png b/assetstudio/src/images/clipart/big/10-device-access-ring-volume.png Binary files differnew file mode 100644 index 0000000..9d19f89 --- /dev/null +++ b/assetstudio/src/images/clipart/big/10-device-access-ring-volume.png diff --git a/assetstudio/src/images/clipart/big/10-device-access-screen-locked-to-landscape.png b/assetstudio/src/images/clipart/big/10-device-access-screen-locked-to-landscape.png Binary files differnew file mode 100644 index 0000000..c702480 --- /dev/null +++ b/assetstudio/src/images/clipart/big/10-device-access-screen-locked-to-landscape.png diff --git a/assetstudio/src/images/clipart/big/10-device-access-screen-locked-to-portrait.png b/assetstudio/src/images/clipart/big/10-device-access-screen-locked-to-portrait.png Binary files differnew file mode 100644 index 0000000..f66923c --- /dev/null +++ b/assetstudio/src/images/clipart/big/10-device-access-screen-locked-to-portrait.png diff --git a/assetstudio/src/images/clipart/big/10-device-access-screen-rotation.png b/assetstudio/src/images/clipart/big/10-device-access-screen-rotation.png Binary files differnew file mode 100644 index 0000000..22e0fcb --- /dev/null +++ b/assetstudio/src/images/clipart/big/10-device-access-screen-rotation.png diff --git a/assetstudio/src/images/clipart/big/10-device-access-sd-storage.png b/assetstudio/src/images/clipart/big/10-device-access-sd-storage.png Binary files differnew file mode 100644 index 0000000..cbde363 --- /dev/null +++ b/assetstudio/src/images/clipart/big/10-device-access-sd-storage.png diff --git a/assetstudio/src/images/clipart/big/10-device-access-secure.png b/assetstudio/src/images/clipart/big/10-device-access-secure.png Binary files differnew file mode 100644 index 0000000..83f4f7d --- /dev/null +++ b/assetstudio/src/images/clipart/big/10-device-access-secure.png diff --git a/assetstudio/src/images/clipart/big/10-device-access-storage.png b/assetstudio/src/images/clipart/big/10-device-access-storage.png Binary files differnew file mode 100644 index 0000000..5addbad --- /dev/null +++ b/assetstudio/src/images/clipart/big/10-device-access-storage.png diff --git a/assetstudio/src/images/clipart/big/10-device-access-switch-camera.png b/assetstudio/src/images/clipart/big/10-device-access-switch-camera.png Binary files differnew file mode 100644 index 0000000..8b2a2e3 --- /dev/null +++ b/assetstudio/src/images/clipart/big/10-device-access-switch-camera.png diff --git a/assetstudio/src/images/clipart/big/10-device-access-switch-video.png b/assetstudio/src/images/clipart/big/10-device-access-switch-video.png Binary files differnew file mode 100644 index 0000000..a2919f1 --- /dev/null +++ b/assetstudio/src/images/clipart/big/10-device-access-switch-video.png diff --git a/assetstudio/src/images/clipart/big/10-device-access-time.png b/assetstudio/src/images/clipart/big/10-device-access-time.png Binary files differnew file mode 100644 index 0000000..aa21482 --- /dev/null +++ b/assetstudio/src/images/clipart/big/10-device-access-time.png diff --git a/assetstudio/src/images/clipart/big/10-device-access-usb.png b/assetstudio/src/images/clipart/big/10-device-access-usb.png Binary files differnew file mode 100644 index 0000000..ba01983 --- /dev/null +++ b/assetstudio/src/images/clipart/big/10-device-access-usb.png diff --git a/assetstudio/src/images/clipart/big/10-device-access-video.png b/assetstudio/src/images/clipart/big/10-device-access-video.png Binary files differnew file mode 100644 index 0000000..e18c6bd --- /dev/null +++ b/assetstudio/src/images/clipart/big/10-device-access-video.png diff --git a/assetstudio/src/images/clipart/big/10-device-access-volume-muted.png b/assetstudio/src/images/clipart/big/10-device-access-volume-muted.png Binary files differnew file mode 100644 index 0000000..10433a7 --- /dev/null +++ b/assetstudio/src/images/clipart/big/10-device-access-volume-muted.png diff --git a/assetstudio/src/images/clipart/big/10-device-access-volume-on.png b/assetstudio/src/images/clipart/big/10-device-access-volume-on.png Binary files differnew file mode 100644 index 0000000..bc86a7b --- /dev/null +++ b/assetstudio/src/images/clipart/big/10-device-access-volume-on.png diff --git a/assetstudio/src/images/clipart/big/11-alerts-and-states-airplane-mode-off.png b/assetstudio/src/images/clipart/big/11-alerts-and-states-airplane-mode-off.png Binary files differnew file mode 100644 index 0000000..f7db5e8 --- /dev/null +++ b/assetstudio/src/images/clipart/big/11-alerts-and-states-airplane-mode-off.png diff --git a/assetstudio/src/images/clipart/big/11-alerts-and-states-airplane-mode-on.png b/assetstudio/src/images/clipart/big/11-alerts-and-states-airplane-mode-on.png Binary files differnew file mode 100644 index 0000000..7e8bf73 --- /dev/null +++ b/assetstudio/src/images/clipart/big/11-alerts-and-states-airplane-mode-on.png diff --git a/assetstudio/src/images/clipart/big/11-alerts-and-states-error.png b/assetstudio/src/images/clipart/big/11-alerts-and-states-error.png Binary files differnew file mode 100644 index 0000000..24335f9 --- /dev/null +++ b/assetstudio/src/images/clipart/big/11-alerts-and-states-error.png diff --git a/assetstudio/src/images/clipart/big/11-alerts-and-states-warning.png b/assetstudio/src/images/clipart/big/11-alerts-and-states-warning.png Binary files differnew file mode 100644 index 0000000..be321f4 --- /dev/null +++ b/assetstudio/src/images/clipart/big/11-alerts-and-states-warning.png diff --git a/assetstudio/src/images/clipart/big/12-hardware-computer.png b/assetstudio/src/images/clipart/big/12-hardware-computer.png Binary files differnew file mode 100644 index 0000000..6170018 --- /dev/null +++ b/assetstudio/src/images/clipart/big/12-hardware-computer.png diff --git a/assetstudio/src/images/clipart/big/12-hardware-dock.png b/assetstudio/src/images/clipart/big/12-hardware-dock.png Binary files differnew file mode 100644 index 0000000..c2fc8c8 --- /dev/null +++ b/assetstudio/src/images/clipart/big/12-hardware-dock.png diff --git a/assetstudio/src/images/clipart/big/12-hardware-gamepad.png b/assetstudio/src/images/clipart/big/12-hardware-gamepad.png Binary files differnew file mode 100644 index 0000000..3ddc322 --- /dev/null +++ b/assetstudio/src/images/clipart/big/12-hardware-gamepad.png diff --git a/assetstudio/src/images/clipart/big/12-hardware-headphones.png b/assetstudio/src/images/clipart/big/12-hardware-headphones.png Binary files differnew file mode 100644 index 0000000..e7bce69 --- /dev/null +++ b/assetstudio/src/images/clipart/big/12-hardware-headphones.png diff --git a/assetstudio/src/images/clipart/big/12-hardware-headset.png b/assetstudio/src/images/clipart/big/12-hardware-headset.png Binary files differnew file mode 100644 index 0000000..29f659b --- /dev/null +++ b/assetstudio/src/images/clipart/big/12-hardware-headset.png diff --git a/assetstudio/src/images/clipart/big/12-hardware-keyboard.png b/assetstudio/src/images/clipart/big/12-hardware-keyboard.png Binary files differnew file mode 100644 index 0000000..4a2bf70 --- /dev/null +++ b/assetstudio/src/images/clipart/big/12-hardware-keyboard.png diff --git a/assetstudio/src/images/clipart/big/12-hardware-mouse.png b/assetstudio/src/images/clipart/big/12-hardware-mouse.png Binary files differnew file mode 100644 index 0000000..2bf8c05 --- /dev/null +++ b/assetstudio/src/images/clipart/big/12-hardware-mouse.png diff --git a/assetstudio/src/images/clipart/big/12-hardware-phone.png b/assetstudio/src/images/clipart/big/12-hardware-phone.png Binary files differnew file mode 100644 index 0000000..423fe65 --- /dev/null +++ b/assetstudio/src/images/clipart/big/12-hardware-phone.png diff --git a/assetstudio/src/images/clipart/big/2-action-about.png b/assetstudio/src/images/clipart/big/2-action-about.png Binary files differnew file mode 100644 index 0000000..6d43316 --- /dev/null +++ b/assetstudio/src/images/clipart/big/2-action-about.png diff --git a/assetstudio/src/images/clipart/big/2-action-help.png b/assetstudio/src/images/clipart/big/2-action-help.png Binary files differnew file mode 100644 index 0000000..16eb8ef --- /dev/null +++ b/assetstudio/src/images/clipart/big/2-action-help.png diff --git a/assetstudio/src/images/clipart/big/2-action-search.png b/assetstudio/src/images/clipart/big/2-action-search.png Binary files differnew file mode 100644 index 0000000..9345a06 --- /dev/null +++ b/assetstudio/src/images/clipart/big/2-action-search.png diff --git a/assetstudio/src/images/clipart/big/2-action-settings.png b/assetstudio/src/images/clipart/big/2-action-settings.png Binary files differnew file mode 100644 index 0000000..a049ca0 --- /dev/null +++ b/assetstudio/src/images/clipart/big/2-action-settings.png diff --git a/assetstudio/src/images/clipart/big/3-rating-bad.png b/assetstudio/src/images/clipart/big/3-rating-bad.png Binary files differnew file mode 100644 index 0000000..1ab8c5b --- /dev/null +++ b/assetstudio/src/images/clipart/big/3-rating-bad.png diff --git a/assetstudio/src/images/clipart/big/3-rating-favorite.png b/assetstudio/src/images/clipart/big/3-rating-favorite.png Binary files differnew file mode 100644 index 0000000..9b68720 --- /dev/null +++ b/assetstudio/src/images/clipart/big/3-rating-favorite.png diff --git a/assetstudio/src/images/clipart/big/3-rating-good.png b/assetstudio/src/images/clipart/big/3-rating-good.png Binary files differnew file mode 100644 index 0000000..c72826b --- /dev/null +++ b/assetstudio/src/images/clipart/big/3-rating-good.png diff --git a/assetstudio/src/images/clipart/big/3-rating-half-important.png b/assetstudio/src/images/clipart/big/3-rating-half-important.png Binary files differnew file mode 100644 index 0000000..2110a0f --- /dev/null +++ b/assetstudio/src/images/clipart/big/3-rating-half-important.png diff --git a/assetstudio/src/images/clipart/big/3-rating-important.png b/assetstudio/src/images/clipart/big/3-rating-important.png Binary files differnew file mode 100644 index 0000000..dbad544 --- /dev/null +++ b/assetstudio/src/images/clipart/big/3-rating-important.png diff --git a/assetstudio/src/images/clipart/big/3-rating-not-important.png b/assetstudio/src/images/clipart/big/3-rating-not-important.png Binary files differnew file mode 100644 index 0000000..f7cf26f --- /dev/null +++ b/assetstudio/src/images/clipart/big/3-rating-not-important.png diff --git a/assetstudio/src/images/clipart/big/4-collections-cloud.png b/assetstudio/src/images/clipart/big/4-collections-cloud.png Binary files differnew file mode 100644 index 0000000..a2cedbf --- /dev/null +++ b/assetstudio/src/images/clipart/big/4-collections-cloud.png diff --git a/assetstudio/src/images/clipart/big/4-collections-collection.png b/assetstudio/src/images/clipart/big/4-collections-collection.png Binary files differnew file mode 100644 index 0000000..dfb2508 --- /dev/null +++ b/assetstudio/src/images/clipart/big/4-collections-collection.png diff --git a/assetstudio/src/images/clipart/big/4-collections-go-to-today.png b/assetstudio/src/images/clipart/big/4-collections-go-to-today.png Binary files differnew file mode 100644 index 0000000..b4971ca --- /dev/null +++ b/assetstudio/src/images/clipart/big/4-collections-go-to-today.png diff --git a/assetstudio/src/images/clipart/big/4-collections-labels.png b/assetstudio/src/images/clipart/big/4-collections-labels.png Binary files differnew file mode 100644 index 0000000..16f35a8 --- /dev/null +++ b/assetstudio/src/images/clipart/big/4-collections-labels.png diff --git a/assetstudio/src/images/clipart/big/4-collections-new-label.png b/assetstudio/src/images/clipart/big/4-collections-new-label.png Binary files differnew file mode 100644 index 0000000..cbf02af --- /dev/null +++ b/assetstudio/src/images/clipart/big/4-collections-new-label.png diff --git a/assetstudio/src/images/clipart/big/4-collections-sort-by-size.png b/assetstudio/src/images/clipart/big/4-collections-sort-by-size.png Binary files differnew file mode 100644 index 0000000..10aec0d --- /dev/null +++ b/assetstudio/src/images/clipart/big/4-collections-sort-by-size.png diff --git a/assetstudio/src/images/clipart/big/4-collections-view-as-grid.png b/assetstudio/src/images/clipart/big/4-collections-view-as-grid.png Binary files differnew file mode 100644 index 0000000..10a8fe3 --- /dev/null +++ b/assetstudio/src/images/clipart/big/4-collections-view-as-grid.png diff --git a/assetstudio/src/images/clipart/big/4-collections-view-as-list.png b/assetstudio/src/images/clipart/big/4-collections-view-as-list.png Binary files differnew file mode 100644 index 0000000..5cf08e4 --- /dev/null +++ b/assetstudio/src/images/clipart/big/4-collections-view-as-list.png diff --git a/assetstudio/src/images/clipart/big/5-content-attachment.png b/assetstudio/src/images/clipart/big/5-content-attachment.png Binary files differnew file mode 100644 index 0000000..92e6726 --- /dev/null +++ b/assetstudio/src/images/clipart/big/5-content-attachment.png diff --git a/assetstudio/src/images/clipart/big/5-content-backspace.png b/assetstudio/src/images/clipart/big/5-content-backspace.png Binary files differnew file mode 100644 index 0000000..9a7e456 --- /dev/null +++ b/assetstudio/src/images/clipart/big/5-content-backspace.png diff --git a/assetstudio/src/images/clipart/big/5-content-copy.png b/assetstudio/src/images/clipart/big/5-content-copy.png Binary files differnew file mode 100644 index 0000000..284a5ce --- /dev/null +++ b/assetstudio/src/images/clipart/big/5-content-copy.png diff --git a/assetstudio/src/images/clipart/big/5-content-cut.png b/assetstudio/src/images/clipart/big/5-content-cut.png Binary files differnew file mode 100644 index 0000000..18d1763 --- /dev/null +++ b/assetstudio/src/images/clipart/big/5-content-cut.png diff --git a/assetstudio/src/images/clipart/big/5-content-discard.png b/assetstudio/src/images/clipart/big/5-content-discard.png Binary files differnew file mode 100644 index 0000000..e40e1fe --- /dev/null +++ b/assetstudio/src/images/clipart/big/5-content-discard.png diff --git a/assetstudio/src/images/clipart/big/5-content-edit.png b/assetstudio/src/images/clipart/big/5-content-edit.png Binary files differnew file mode 100644 index 0000000..f75157c --- /dev/null +++ b/assetstudio/src/images/clipart/big/5-content-edit.png diff --git a/assetstudio/src/images/clipart/big/5-content-email.png b/assetstudio/src/images/clipart/big/5-content-email.png Binary files differnew file mode 100644 index 0000000..6bec626 --- /dev/null +++ b/assetstudio/src/images/clipart/big/5-content-email.png diff --git a/assetstudio/src/images/clipart/big/5-content-event.png b/assetstudio/src/images/clipart/big/5-content-event.png Binary files differnew file mode 100644 index 0000000..dc4ed94 --- /dev/null +++ b/assetstudio/src/images/clipart/big/5-content-event.png diff --git a/assetstudio/src/images/clipart/big/5-content-import-export.png b/assetstudio/src/images/clipart/big/5-content-import-export.png Binary files differnew file mode 100644 index 0000000..7dcd6b0 --- /dev/null +++ b/assetstudio/src/images/clipart/big/5-content-import-export.png diff --git a/assetstudio/src/images/clipart/big/5-content-merge.png b/assetstudio/src/images/clipart/big/5-content-merge.png Binary files differnew file mode 100644 index 0000000..45ca498 --- /dev/null +++ b/assetstudio/src/images/clipart/big/5-content-merge.png diff --git a/assetstudio/src/images/clipart/big/5-content-new-attachment.png b/assetstudio/src/images/clipart/big/5-content-new-attachment.png Binary files differnew file mode 100644 index 0000000..3e441d8 --- /dev/null +++ b/assetstudio/src/images/clipart/big/5-content-new-attachment.png diff --git a/assetstudio/src/images/clipart/big/5-content-new-email.png b/assetstudio/src/images/clipart/big/5-content-new-email.png Binary files differnew file mode 100644 index 0000000..fdcd64b --- /dev/null +++ b/assetstudio/src/images/clipart/big/5-content-new-email.png diff --git a/assetstudio/src/images/clipart/big/5-content-new-event.png b/assetstudio/src/images/clipart/big/5-content-new-event.png Binary files differnew file mode 100644 index 0000000..29ef513 --- /dev/null +++ b/assetstudio/src/images/clipart/big/5-content-new-event.png diff --git a/assetstudio/src/images/clipart/big/5-content-new-picture.png b/assetstudio/src/images/clipart/big/5-content-new-picture.png Binary files differnew file mode 100644 index 0000000..1975219 --- /dev/null +++ b/assetstudio/src/images/clipart/big/5-content-new-picture.png diff --git a/assetstudio/src/images/clipart/big/5-content-new.png b/assetstudio/src/images/clipart/big/5-content-new.png Binary files differnew file mode 100644 index 0000000..9bb4337 --- /dev/null +++ b/assetstudio/src/images/clipart/big/5-content-new.png diff --git a/assetstudio/src/images/clipart/big/5-content-paste.png b/assetstudio/src/images/clipart/big/5-content-paste.png Binary files differnew file mode 100644 index 0000000..f9393c0 --- /dev/null +++ b/assetstudio/src/images/clipart/big/5-content-paste.png diff --git a/assetstudio/src/images/clipart/big/5-content-picture.png b/assetstudio/src/images/clipart/big/5-content-picture.png Binary files differnew file mode 100644 index 0000000..dc3251b --- /dev/null +++ b/assetstudio/src/images/clipart/big/5-content-picture.png diff --git a/assetstudio/src/images/clipart/big/5-content-read.png b/assetstudio/src/images/clipart/big/5-content-read.png Binary files differnew file mode 100644 index 0000000..0a48d75 --- /dev/null +++ b/assetstudio/src/images/clipart/big/5-content-read.png diff --git a/assetstudio/src/images/clipart/big/5-content-remove.png b/assetstudio/src/images/clipart/big/5-content-remove.png Binary files differnew file mode 100644 index 0000000..d968d34 --- /dev/null +++ b/assetstudio/src/images/clipart/big/5-content-remove.png diff --git a/assetstudio/src/images/clipart/big/5-content-save.png b/assetstudio/src/images/clipart/big/5-content-save.png Binary files differnew file mode 100644 index 0000000..befe49a --- /dev/null +++ b/assetstudio/src/images/clipart/big/5-content-save.png diff --git a/assetstudio/src/images/clipart/big/5-content-select-all.png b/assetstudio/src/images/clipart/big/5-content-select-all.png Binary files differnew file mode 100644 index 0000000..572b2b5 --- /dev/null +++ b/assetstudio/src/images/clipart/big/5-content-select-all.png diff --git a/assetstudio/src/images/clipart/big/5-content-split.png b/assetstudio/src/images/clipart/big/5-content-split.png Binary files differnew file mode 100644 index 0000000..7e5d059 --- /dev/null +++ b/assetstudio/src/images/clipart/big/5-content-split.png diff --git a/assetstudio/src/images/clipart/big/5-content-undo.png b/assetstudio/src/images/clipart/big/5-content-undo.png Binary files differnew file mode 100644 index 0000000..07fc7d8 --- /dev/null +++ b/assetstudio/src/images/clipart/big/5-content-undo.png diff --git a/assetstudio/src/images/clipart/big/5-content-unread.png b/assetstudio/src/images/clipart/big/5-content-unread.png Binary files differnew file mode 100644 index 0000000..41ba9e2 --- /dev/null +++ b/assetstudio/src/images/clipart/big/5-content-unread.png diff --git a/assetstudio/src/images/clipart/big/6-social-add-group.png b/assetstudio/src/images/clipart/big/6-social-add-group.png Binary files differnew file mode 100644 index 0000000..7822f4f --- /dev/null +++ b/assetstudio/src/images/clipart/big/6-social-add-group.png diff --git a/assetstudio/src/images/clipart/big/6-social-add-person.png b/assetstudio/src/images/clipart/big/6-social-add-person.png Binary files differnew file mode 100644 index 0000000..b335788 --- /dev/null +++ b/assetstudio/src/images/clipart/big/6-social-add-person.png diff --git a/assetstudio/src/images/clipart/big/6-social-cc-bcc.png b/assetstudio/src/images/clipart/big/6-social-cc-bcc.png Binary files differnew file mode 100644 index 0000000..4db30a7 --- /dev/null +++ b/assetstudio/src/images/clipart/big/6-social-cc-bcc.png diff --git a/assetstudio/src/images/clipart/big/6-social-chat.png b/assetstudio/src/images/clipart/big/6-social-chat.png Binary files differnew file mode 100644 index 0000000..b0cccb3 --- /dev/null +++ b/assetstudio/src/images/clipart/big/6-social-chat.png diff --git a/assetstudio/src/images/clipart/big/6-social-forward.png b/assetstudio/src/images/clipart/big/6-social-forward.png Binary files differnew file mode 100644 index 0000000..a5abbfc --- /dev/null +++ b/assetstudio/src/images/clipart/big/6-social-forward.png diff --git a/assetstudio/src/images/clipart/big/6-social-group.png b/assetstudio/src/images/clipart/big/6-social-group.png Binary files differnew file mode 100644 index 0000000..1b18678 --- /dev/null +++ b/assetstudio/src/images/clipart/big/6-social-group.png diff --git a/assetstudio/src/images/clipart/big/6-social-person.png b/assetstudio/src/images/clipart/big/6-social-person.png Binary files differnew file mode 100644 index 0000000..27ade22 --- /dev/null +++ b/assetstudio/src/images/clipart/big/6-social-person.png diff --git a/assetstudio/src/images/clipart/big/6-social-reply-all.png b/assetstudio/src/images/clipart/big/6-social-reply-all.png Binary files differnew file mode 100644 index 0000000..c2a87c6 --- /dev/null +++ b/assetstudio/src/images/clipart/big/6-social-reply-all.png diff --git a/assetstudio/src/images/clipart/big/6-social-reply.png b/assetstudio/src/images/clipart/big/6-social-reply.png Binary files differnew file mode 100644 index 0000000..550aa80 --- /dev/null +++ b/assetstudio/src/images/clipart/big/6-social-reply.png diff --git a/assetstudio/src/images/clipart/big/6-social-send-now.png b/assetstudio/src/images/clipart/big/6-social-send-now.png Binary files differnew file mode 100644 index 0000000..c3dad3c --- /dev/null +++ b/assetstudio/src/images/clipart/big/6-social-send-now.png diff --git a/assetstudio/src/images/clipart/big/6-social-share.png b/assetstudio/src/images/clipart/big/6-social-share.png Binary files differnew file mode 100644 index 0000000..b664970 --- /dev/null +++ b/assetstudio/src/images/clipart/big/6-social-share.png diff --git a/assetstudio/src/images/clipart/big/7-location-directions.png b/assetstudio/src/images/clipart/big/7-location-directions.png Binary files differnew file mode 100644 index 0000000..c0e67e4 --- /dev/null +++ b/assetstudio/src/images/clipart/big/7-location-directions.png diff --git a/assetstudio/src/images/clipart/big/7-location-map.png b/assetstudio/src/images/clipart/big/7-location-map.png Binary files differnew file mode 100644 index 0000000..e32dc26 --- /dev/null +++ b/assetstudio/src/images/clipart/big/7-location-map.png diff --git a/assetstudio/src/images/clipart/big/7-location-place.png b/assetstudio/src/images/clipart/big/7-location-place.png Binary files differnew file mode 100644 index 0000000..fec173c --- /dev/null +++ b/assetstudio/src/images/clipart/big/7-location-place.png diff --git a/assetstudio/src/images/clipart/big/7-location-web-site.png b/assetstudio/src/images/clipart/big/7-location-web-site.png Binary files differnew file mode 100644 index 0000000..4ef24a3 --- /dev/null +++ b/assetstudio/src/images/clipart/big/7-location-web-site.png diff --git a/assetstudio/src/images/clipart/big/8-images-crop.png b/assetstudio/src/images/clipart/big/8-images-crop.png Binary files differnew file mode 100644 index 0000000..bd44bf9 --- /dev/null +++ b/assetstudio/src/images/clipart/big/8-images-crop.png diff --git a/assetstudio/src/images/clipart/big/8-images-rotate-left.png b/assetstudio/src/images/clipart/big/8-images-rotate-left.png Binary files differnew file mode 100644 index 0000000..0410adb --- /dev/null +++ b/assetstudio/src/images/clipart/big/8-images-rotate-left.png diff --git a/assetstudio/src/images/clipart/big/8-images-rotate-right.png b/assetstudio/src/images/clipart/big/8-images-rotate-right.png Binary files differnew file mode 100644 index 0000000..abcff9c --- /dev/null +++ b/assetstudio/src/images/clipart/big/8-images-rotate-right.png diff --git a/assetstudio/src/images/clipart/big/8-images-slideshow.png b/assetstudio/src/images/clipart/big/8-images-slideshow.png Binary files differnew file mode 100644 index 0000000..94e47b4 --- /dev/null +++ b/assetstudio/src/images/clipart/big/8-images-slideshow.png diff --git a/assetstudio/src/images/clipart/big/9-av-add-to-queue.png b/assetstudio/src/images/clipart/big/9-av-add-to-queue.png Binary files differnew file mode 100644 index 0000000..57b2e61 --- /dev/null +++ b/assetstudio/src/images/clipart/big/9-av-add-to-queue.png diff --git a/assetstudio/src/images/clipart/big/9-av-download.png b/assetstudio/src/images/clipart/big/9-av-download.png Binary files differnew file mode 100644 index 0000000..46a1919 --- /dev/null +++ b/assetstudio/src/images/clipart/big/9-av-download.png diff --git a/assetstudio/src/images/clipart/big/9-av-fast-forward.png b/assetstudio/src/images/clipart/big/9-av-fast-forward.png Binary files differnew file mode 100644 index 0000000..f820f5a --- /dev/null +++ b/assetstudio/src/images/clipart/big/9-av-fast-forward.png diff --git a/assetstudio/src/images/clipart/big/9-av-full-screen.png b/assetstudio/src/images/clipart/big/9-av-full-screen.png Binary files differnew file mode 100644 index 0000000..1dfd01a --- /dev/null +++ b/assetstudio/src/images/clipart/big/9-av-full-screen.png diff --git a/assetstudio/src/images/clipart/big/9-av-make-available-offline.png b/assetstudio/src/images/clipart/big/9-av-make-available-offline.png Binary files differnew file mode 100644 index 0000000..2efcb11 --- /dev/null +++ b/assetstudio/src/images/clipart/big/9-av-make-available-offline.png diff --git a/assetstudio/src/images/clipart/big/9-av-next.png b/assetstudio/src/images/clipart/big/9-av-next.png Binary files differnew file mode 100644 index 0000000..871587c --- /dev/null +++ b/assetstudio/src/images/clipart/big/9-av-next.png diff --git a/assetstudio/src/images/clipart/big/9-av-pause-over-video.png b/assetstudio/src/images/clipart/big/9-av-pause-over-video.png Binary files differnew file mode 100644 index 0000000..a2665f2 --- /dev/null +++ b/assetstudio/src/images/clipart/big/9-av-pause-over-video.png diff --git a/assetstudio/src/images/clipart/big/9-av-pause.png b/assetstudio/src/images/clipart/big/9-av-pause.png Binary files differnew file mode 100644 index 0000000..506b1d4 --- /dev/null +++ b/assetstudio/src/images/clipart/big/9-av-pause.png diff --git a/assetstudio/src/images/clipart/big/9-av-play-over-video.png b/assetstudio/src/images/clipart/big/9-av-play-over-video.png Binary files differnew file mode 100644 index 0000000..3db3a1a --- /dev/null +++ b/assetstudio/src/images/clipart/big/9-av-play-over-video.png diff --git a/assetstudio/src/images/clipart/big/9-av-play.png b/assetstudio/src/images/clipart/big/9-av-play.png Binary files differnew file mode 100644 index 0000000..0c12f86 --- /dev/null +++ b/assetstudio/src/images/clipart/big/9-av-play.png diff --git a/assetstudio/src/images/clipart/big/9-av-previous.png b/assetstudio/src/images/clipart/big/9-av-previous.png Binary files differnew file mode 100644 index 0000000..28f2596 --- /dev/null +++ b/assetstudio/src/images/clipart/big/9-av-previous.png diff --git a/assetstudio/src/images/clipart/big/9-av-repeat.png b/assetstudio/src/images/clipart/big/9-av-repeat.png Binary files differnew file mode 100644 index 0000000..9a7a79a --- /dev/null +++ b/assetstudio/src/images/clipart/big/9-av-repeat.png diff --git a/assetstudio/src/images/clipart/big/9-av-replay.png b/assetstudio/src/images/clipart/big/9-av-replay.png Binary files differnew file mode 100644 index 0000000..ce9df7f --- /dev/null +++ b/assetstudio/src/images/clipart/big/9-av-replay.png diff --git a/assetstudio/src/images/clipart/big/9-av-return-from-full-screen.png b/assetstudio/src/images/clipart/big/9-av-return-from-full-screen.png Binary files differnew file mode 100644 index 0000000..24725c0 --- /dev/null +++ b/assetstudio/src/images/clipart/big/9-av-return-from-full-screen.png diff --git a/assetstudio/src/images/clipart/big/9-av-rewind.png b/assetstudio/src/images/clipart/big/9-av-rewind.png Binary files differnew file mode 100644 index 0000000..b09f61a --- /dev/null +++ b/assetstudio/src/images/clipart/big/9-av-rewind.png diff --git a/assetstudio/src/images/clipart/big/9-av-shuffle.png b/assetstudio/src/images/clipart/big/9-av-shuffle.png Binary files differnew file mode 100644 index 0000000..6e90f7c --- /dev/null +++ b/assetstudio/src/images/clipart/big/9-av-shuffle.png diff --git a/assetstudio/src/images/clipart/big/9-av-stop.png b/assetstudio/src/images/clipart/big/9-av-stop.png Binary files differnew file mode 100644 index 0000000..9ba88ee --- /dev/null +++ b/assetstudio/src/images/clipart/big/9-av-stop.png diff --git a/assetstudio/src/images/clipart/big/9-av-upload.png b/assetstudio/src/images/clipart/big/9-av-upload.png Binary files differnew file mode 100644 index 0000000..41da601 --- /dev/null +++ b/assetstudio/src/images/clipart/big/9-av-upload.png diff --git a/assetstudio/src/images/clipart/big/attach.png b/assetstudio/src/images/clipart/big/attach.png Binary files differdeleted file mode 100644 index cfadc2b..0000000 --- a/assetstudio/src/images/clipart/big/attach.png +++ /dev/null diff --git a/assetstudio/src/images/clipart/big/call.png b/assetstudio/src/images/clipart/big/call.png Binary files differdeleted file mode 100644 index b642c81..0000000 --- a/assetstudio/src/images/clipart/big/call.png +++ /dev/null diff --git a/assetstudio/src/images/clipart/big/copy.png b/assetstudio/src/images/clipart/big/copy.png Binary files differdeleted file mode 100644 index a018ff3..0000000 --- a/assetstudio/src/images/clipart/big/copy.png +++ /dev/null diff --git a/assetstudio/src/images/clipart/big/cut.png b/assetstudio/src/images/clipart/big/cut.png Binary files differdeleted file mode 100644 index 29034d1..0000000 --- a/assetstudio/src/images/clipart/big/cut.png +++ /dev/null diff --git a/assetstudio/src/images/clipart/big/delete.png b/assetstudio/src/images/clipart/big/delete.png Binary files differdeleted file mode 100644 index ea82cc7..0000000 --- a/assetstudio/src/images/clipart/big/delete.png +++ /dev/null diff --git a/assetstudio/src/images/clipart/big/done.png b/assetstudio/src/images/clipart/big/done.png Binary files differdeleted file mode 100644 index 56e57b9..0000000 --- a/assetstudio/src/images/clipart/big/done.png +++ /dev/null diff --git a/assetstudio/src/images/clipart/big/edit.png b/assetstudio/src/images/clipart/big/edit.png Binary files differdeleted file mode 100644 index 5a98da6..0000000 --- a/assetstudio/src/images/clipart/big/edit.png +++ /dev/null diff --git a/assetstudio/src/images/clipart/big/locate.png b/assetstudio/src/images/clipart/big/locate.png Binary files differdeleted file mode 100644 index 222f25c..0000000 --- a/assetstudio/src/images/clipart/big/locate.png +++ /dev/null diff --git a/assetstudio/src/images/clipart/big/mail.png b/assetstudio/src/images/clipart/big/mail.png Binary files differdeleted file mode 100644 index 5f66d14..0000000 --- a/assetstudio/src/images/clipart/big/mail.png +++ /dev/null diff --git a/assetstudio/src/images/clipart/big/microphone.png b/assetstudio/src/images/clipart/big/microphone.png Binary files differdeleted file mode 100644 index 0ede452..0000000 --- a/assetstudio/src/images/clipart/big/microphone.png +++ /dev/null diff --git a/assetstudio/src/images/clipart/big/overflow.png b/assetstudio/src/images/clipart/big/overflow.png Binary files differdeleted file mode 100644 index e88a95a..0000000 --- a/assetstudio/src/images/clipart/big/overflow.png +++ /dev/null diff --git a/assetstudio/src/images/clipart/big/paste.png b/assetstudio/src/images/clipart/big/paste.png Binary files differdeleted file mode 100644 index 5a9a59d..0000000 --- a/assetstudio/src/images/clipart/big/paste.png +++ /dev/null diff --git a/assetstudio/src/images/clipart/big/photo.png b/assetstudio/src/images/clipart/big/photo.png Binary files differdeleted file mode 100644 index 9e52bfb..0000000 --- a/assetstudio/src/images/clipart/big/photo.png +++ /dev/null diff --git a/assetstudio/src/images/clipart/big/refresh.png b/assetstudio/src/images/clipart/big/refresh.png Binary files differdeleted file mode 100644 index 4c4e7cf..0000000 --- a/assetstudio/src/images/clipart/big/refresh.png +++ /dev/null diff --git a/assetstudio/src/images/clipart/big/search.png b/assetstudio/src/images/clipart/big/search.png Binary files differdeleted file mode 100644 index b5a3572..0000000 --- a/assetstudio/src/images/clipart/big/search.png +++ /dev/null diff --git a/assetstudio/src/images/clipart/big/select_all.png b/assetstudio/src/images/clipart/big/select_all.png Binary files differdeleted file mode 100644 index b962a04..0000000 --- a/assetstudio/src/images/clipart/big/select_all.png +++ /dev/null diff --git a/assetstudio/src/images/clipart/big/send.png b/assetstudio/src/images/clipart/big/send.png Binary files differdeleted file mode 100644 index e7644cf..0000000 --- a/assetstudio/src/images/clipart/big/send.png +++ /dev/null diff --git a/assetstudio/src/images/clipart/big/share.png b/assetstudio/src/images/clipart/big/share.png Binary files differdeleted file mode 100644 index 95185d5..0000000 --- a/assetstudio/src/images/clipart/big/share.png +++ /dev/null diff --git a/assetstudio/src/images/clipart/big/star.png b/assetstudio/src/images/clipart/big/star.png Binary files differdeleted file mode 100644 index 0a245ce..0000000 --- a/assetstudio/src/images/clipart/big/star.png +++ /dev/null diff --git a/assetstudio/src/images/clipart/big/user.png b/assetstudio/src/images/clipart/big/user.png Binary files differdeleted file mode 100644 index bc1d946..0000000 --- a/assetstudio/src/images/clipart/big/user.png +++ /dev/null diff --git a/assetstudio/src/images/clipart/big/video.png b/assetstudio/src/images/clipart/big/video.png Binary files differdeleted file mode 100644 index 473076f..0000000 --- a/assetstudio/src/images/clipart/big/video.png +++ /dev/null diff --git a/assetstudio/src/images/clipart/small/1-navigation-accept.png b/assetstudio/src/images/clipart/small/1-navigation-accept.png Binary files differnew file mode 100644 index 0000000..f5069d9 --- /dev/null +++ b/assetstudio/src/images/clipart/small/1-navigation-accept.png diff --git a/assetstudio/src/images/clipart/small/1-navigation-back.png b/assetstudio/src/images/clipart/small/1-navigation-back.png Binary files differnew file mode 100644 index 0000000..f35aec5 --- /dev/null +++ b/assetstudio/src/images/clipart/small/1-navigation-back.png diff --git a/assetstudio/src/images/clipart/small/1-navigation-cancel.png b/assetstudio/src/images/clipart/small/1-navigation-cancel.png Binary files differnew file mode 100644 index 0000000..4302320 --- /dev/null +++ b/assetstudio/src/images/clipart/small/1-navigation-cancel.png diff --git a/assetstudio/src/images/clipart/small/1-navigation-collapse.png b/assetstudio/src/images/clipart/small/1-navigation-collapse.png Binary files differnew file mode 100644 index 0000000..9c40e2c --- /dev/null +++ b/assetstudio/src/images/clipart/small/1-navigation-collapse.png diff --git a/assetstudio/src/images/clipart/small/1-navigation-expand.png b/assetstudio/src/images/clipart/small/1-navigation-expand.png Binary files differnew file mode 100644 index 0000000..684fc5a --- /dev/null +++ b/assetstudio/src/images/clipart/small/1-navigation-expand.png diff --git a/assetstudio/src/images/clipart/small/1-navigation-forward.png b/assetstudio/src/images/clipart/small/1-navigation-forward.png Binary files differnew file mode 100644 index 0000000..beb6cf7 --- /dev/null +++ b/assetstudio/src/images/clipart/small/1-navigation-forward.png diff --git a/assetstudio/src/images/clipart/small/1-navigation-next-item.png b/assetstudio/src/images/clipart/small/1-navigation-next-item.png Binary files differnew file mode 100644 index 0000000..932d787 --- /dev/null +++ b/assetstudio/src/images/clipart/small/1-navigation-next-item.png diff --git a/assetstudio/src/images/clipart/small/1-navigation-previous-item.png b/assetstudio/src/images/clipart/small/1-navigation-previous-item.png Binary files differnew file mode 100644 index 0000000..679b586 --- /dev/null +++ b/assetstudio/src/images/clipart/small/1-navigation-previous-item.png diff --git a/assetstudio/src/images/clipart/small/1-navigation-refresh.png b/assetstudio/src/images/clipart/small/1-navigation-refresh.png Binary files differnew file mode 100644 index 0000000..b946402 --- /dev/null +++ b/assetstudio/src/images/clipart/small/1-navigation-refresh.png diff --git a/assetstudio/src/images/clipart/small/10-device-access-accounts.png b/assetstudio/src/images/clipart/small/10-device-access-accounts.png Binary files differnew file mode 100644 index 0000000..34b4d6a --- /dev/null +++ b/assetstudio/src/images/clipart/small/10-device-access-accounts.png diff --git a/assetstudio/src/images/clipart/small/10-device-access-add-alarm.png b/assetstudio/src/images/clipart/small/10-device-access-add-alarm.png Binary files differnew file mode 100644 index 0000000..27c528a --- /dev/null +++ b/assetstudio/src/images/clipart/small/10-device-access-add-alarm.png diff --git a/assetstudio/src/images/clipart/small/10-device-access-alarms.png b/assetstudio/src/images/clipart/small/10-device-access-alarms.png Binary files differnew file mode 100644 index 0000000..545a8fa --- /dev/null +++ b/assetstudio/src/images/clipart/small/10-device-access-alarms.png diff --git a/assetstudio/src/images/clipart/small/10-device-access-battery.png b/assetstudio/src/images/clipart/small/10-device-access-battery.png Binary files differnew file mode 100644 index 0000000..52e08bf --- /dev/null +++ b/assetstudio/src/images/clipart/small/10-device-access-battery.png diff --git a/assetstudio/src/images/clipart/small/10-device-access-bightness-low.png b/assetstudio/src/images/clipart/small/10-device-access-bightness-low.png Binary files differnew file mode 100644 index 0000000..a34cdea --- /dev/null +++ b/assetstudio/src/images/clipart/small/10-device-access-bightness-low.png diff --git a/assetstudio/src/images/clipart/small/10-device-access-bluetooth-connected.png b/assetstudio/src/images/clipart/small/10-device-access-bluetooth-connected.png Binary files differnew file mode 100644 index 0000000..d04e9f4 --- /dev/null +++ b/assetstudio/src/images/clipart/small/10-device-access-bluetooth-connected.png diff --git a/assetstudio/src/images/clipart/small/10-device-access-bluetooth-searching.png b/assetstudio/src/images/clipart/small/10-device-access-bluetooth-searching.png Binary files differnew file mode 100644 index 0000000..06d69ae --- /dev/null +++ b/assetstudio/src/images/clipart/small/10-device-access-bluetooth-searching.png diff --git a/assetstudio/src/images/clipart/small/10-device-access-bluetooth.png b/assetstudio/src/images/clipart/small/10-device-access-bluetooth.png Binary files differnew file mode 100644 index 0000000..11ad6b3 --- /dev/null +++ b/assetstudio/src/images/clipart/small/10-device-access-bluetooth.png diff --git a/assetstudio/src/images/clipart/small/10-device-access-brightness-auto.png b/assetstudio/src/images/clipart/small/10-device-access-brightness-auto.png Binary files differnew file mode 100644 index 0000000..cd50b9d --- /dev/null +++ b/assetstudio/src/images/clipart/small/10-device-access-brightness-auto.png diff --git a/assetstudio/src/images/clipart/small/10-device-access-brightness-high.png b/assetstudio/src/images/clipart/small/10-device-access-brightness-high.png Binary files differnew file mode 100644 index 0000000..b9d8501 --- /dev/null +++ b/assetstudio/src/images/clipart/small/10-device-access-brightness-high.png diff --git a/assetstudio/src/images/clipart/small/10-device-access-brightness-medium.png b/assetstudio/src/images/clipart/small/10-device-access-brightness-medium.png Binary files differnew file mode 100644 index 0000000..7145eee --- /dev/null +++ b/assetstudio/src/images/clipart/small/10-device-access-brightness-medium.png diff --git a/assetstudio/src/images/clipart/small/10-device-access-call.png b/assetstudio/src/images/clipart/small/10-device-access-call.png Binary files differnew file mode 100644 index 0000000..732e551 --- /dev/null +++ b/assetstudio/src/images/clipart/small/10-device-access-call.png diff --git a/assetstudio/src/images/clipart/small/10-device-access-camera.png b/assetstudio/src/images/clipart/small/10-device-access-camera.png Binary files differnew file mode 100644 index 0000000..f61ab27 --- /dev/null +++ b/assetstudio/src/images/clipart/small/10-device-access-camera.png diff --git a/assetstudio/src/images/clipart/small/10-device-access-data-usage.png b/assetstudio/src/images/clipart/small/10-device-access-data-usage.png Binary files differnew file mode 100644 index 0000000..a78127f --- /dev/null +++ b/assetstudio/src/images/clipart/small/10-device-access-data-usage.png diff --git a/assetstudio/src/images/clipart/small/10-device-access-dial-pad.png b/assetstudio/src/images/clipart/small/10-device-access-dial-pad.png Binary files differnew file mode 100644 index 0000000..cfbee88 --- /dev/null +++ b/assetstudio/src/images/clipart/small/10-device-access-dial-pad.png diff --git a/assetstudio/src/images/clipart/small/10-device-access-end-call.png b/assetstudio/src/images/clipart/small/10-device-access-end-call.png Binary files differnew file mode 100644 index 0000000..2562d0d --- /dev/null +++ b/assetstudio/src/images/clipart/small/10-device-access-end-call.png diff --git a/assetstudio/src/images/clipart/small/10-device-access-flash-automatic.png b/assetstudio/src/images/clipart/small/10-device-access-flash-automatic.png Binary files differnew file mode 100644 index 0000000..574219c --- /dev/null +++ b/assetstudio/src/images/clipart/small/10-device-access-flash-automatic.png diff --git a/assetstudio/src/images/clipart/small/10-device-access-flash-off.png b/assetstudio/src/images/clipart/small/10-device-access-flash-off.png Binary files differnew file mode 100644 index 0000000..80e3d06 --- /dev/null +++ b/assetstudio/src/images/clipart/small/10-device-access-flash-off.png diff --git a/assetstudio/src/images/clipart/small/10-device-access-flash-on.png b/assetstudio/src/images/clipart/small/10-device-access-flash-on.png Binary files differnew file mode 100644 index 0000000..c9c2fff --- /dev/null +++ b/assetstudio/src/images/clipart/small/10-device-access-flash-on.png diff --git a/assetstudio/src/images/clipart/small/10-device-access-location-found.png b/assetstudio/src/images/clipart/small/10-device-access-location-found.png Binary files differnew file mode 100644 index 0000000..4221d83 --- /dev/null +++ b/assetstudio/src/images/clipart/small/10-device-access-location-found.png diff --git a/assetstudio/src/images/clipart/small/10-device-access-location-off.png b/assetstudio/src/images/clipart/small/10-device-access-location-off.png Binary files differnew file mode 100644 index 0000000..ea0511d --- /dev/null +++ b/assetstudio/src/images/clipart/small/10-device-access-location-off.png diff --git a/assetstudio/src/images/clipart/small/10-device-access-location-searching.png b/assetstudio/src/images/clipart/small/10-device-access-location-searching.png Binary files differnew file mode 100644 index 0000000..ef9dc2e --- /dev/null +++ b/assetstudio/src/images/clipart/small/10-device-access-location-searching.png diff --git a/assetstudio/src/images/clipart/small/10-device-access-mic-muted.png b/assetstudio/src/images/clipart/small/10-device-access-mic-muted.png Binary files differnew file mode 100644 index 0000000..87bc6b3 --- /dev/null +++ b/assetstudio/src/images/clipart/small/10-device-access-mic-muted.png diff --git a/assetstudio/src/images/clipart/small/10-device-access-mic.png b/assetstudio/src/images/clipart/small/10-device-access-mic.png Binary files differnew file mode 100644 index 0000000..7569d6a --- /dev/null +++ b/assetstudio/src/images/clipart/small/10-device-access-mic.png diff --git a/assetstudio/src/images/clipart/small/10-device-access-network-cell.png b/assetstudio/src/images/clipart/small/10-device-access-network-cell.png Binary files differnew file mode 100644 index 0000000..7a2c443 --- /dev/null +++ b/assetstudio/src/images/clipart/small/10-device-access-network-cell.png diff --git a/assetstudio/src/images/clipart/small/10-device-access-network-wifi.png b/assetstudio/src/images/clipart/small/10-device-access-network-wifi.png Binary files differnew file mode 100644 index 0000000..e25cc64 --- /dev/null +++ b/assetstudio/src/images/clipart/small/10-device-access-network-wifi.png diff --git a/assetstudio/src/images/clipart/small/10-device-access-new-account.png b/assetstudio/src/images/clipart/small/10-device-access-new-account.png Binary files differnew file mode 100644 index 0000000..c537899 --- /dev/null +++ b/assetstudio/src/images/clipart/small/10-device-access-new-account.png diff --git a/assetstudio/src/images/clipart/small/10-device-access-not-secure.png b/assetstudio/src/images/clipart/small/10-device-access-not-secure.png Binary files differnew file mode 100644 index 0000000..89c732e --- /dev/null +++ b/assetstudio/src/images/clipart/small/10-device-access-not-secure.png diff --git a/assetstudio/src/images/clipart/small/10-device-access-ring-volume.png b/assetstudio/src/images/clipart/small/10-device-access-ring-volume.png Binary files differnew file mode 100644 index 0000000..5bfe27a --- /dev/null +++ b/assetstudio/src/images/clipart/small/10-device-access-ring-volume.png diff --git a/assetstudio/src/images/clipart/small/10-device-access-screen-locked-to-landscape.png b/assetstudio/src/images/clipart/small/10-device-access-screen-locked-to-landscape.png Binary files differnew file mode 100644 index 0000000..a3b2bbb --- /dev/null +++ b/assetstudio/src/images/clipart/small/10-device-access-screen-locked-to-landscape.png diff --git a/assetstudio/src/images/clipart/small/10-device-access-screen-locked-to-portrait.png b/assetstudio/src/images/clipart/small/10-device-access-screen-locked-to-portrait.png Binary files differnew file mode 100644 index 0000000..270c069 --- /dev/null +++ b/assetstudio/src/images/clipart/small/10-device-access-screen-locked-to-portrait.png diff --git a/assetstudio/src/images/clipart/small/10-device-access-screen-rotation.png b/assetstudio/src/images/clipart/small/10-device-access-screen-rotation.png Binary files differnew file mode 100644 index 0000000..a5337e9 --- /dev/null +++ b/assetstudio/src/images/clipart/small/10-device-access-screen-rotation.png diff --git a/assetstudio/src/images/clipart/small/10-device-access-sd-storage.png b/assetstudio/src/images/clipart/small/10-device-access-sd-storage.png Binary files differnew file mode 100644 index 0000000..fe09aca --- /dev/null +++ b/assetstudio/src/images/clipart/small/10-device-access-sd-storage.png diff --git a/assetstudio/src/images/clipart/small/10-device-access-secure.png b/assetstudio/src/images/clipart/small/10-device-access-secure.png Binary files differnew file mode 100644 index 0000000..9bf3627 --- /dev/null +++ b/assetstudio/src/images/clipart/small/10-device-access-secure.png diff --git a/assetstudio/src/images/clipart/small/10-device-access-storage.png b/assetstudio/src/images/clipart/small/10-device-access-storage.png Binary files differnew file mode 100644 index 0000000..1d38109 --- /dev/null +++ b/assetstudio/src/images/clipart/small/10-device-access-storage.png diff --git a/assetstudio/src/images/clipart/small/10-device-access-switch-camera.png b/assetstudio/src/images/clipart/small/10-device-access-switch-camera.png Binary files differnew file mode 100644 index 0000000..972e3b3 --- /dev/null +++ b/assetstudio/src/images/clipart/small/10-device-access-switch-camera.png diff --git a/assetstudio/src/images/clipart/small/10-device-access-switch-video.png b/assetstudio/src/images/clipart/small/10-device-access-switch-video.png Binary files differnew file mode 100644 index 0000000..2ae54f4 --- /dev/null +++ b/assetstudio/src/images/clipart/small/10-device-access-switch-video.png diff --git a/assetstudio/src/images/clipart/small/10-device-access-time.png b/assetstudio/src/images/clipart/small/10-device-access-time.png Binary files differnew file mode 100644 index 0000000..f3d932e --- /dev/null +++ b/assetstudio/src/images/clipart/small/10-device-access-time.png diff --git a/assetstudio/src/images/clipart/small/10-device-access-usb.png b/assetstudio/src/images/clipart/small/10-device-access-usb.png Binary files differnew file mode 100644 index 0000000..490d286 --- /dev/null +++ b/assetstudio/src/images/clipart/small/10-device-access-usb.png diff --git a/assetstudio/src/images/clipart/small/10-device-access-video.png b/assetstudio/src/images/clipart/small/10-device-access-video.png Binary files differnew file mode 100644 index 0000000..d069de4 --- /dev/null +++ b/assetstudio/src/images/clipart/small/10-device-access-video.png diff --git a/assetstudio/src/images/clipart/small/10-device-access-volume-muted.png b/assetstudio/src/images/clipart/small/10-device-access-volume-muted.png Binary files differnew file mode 100644 index 0000000..283d621 --- /dev/null +++ b/assetstudio/src/images/clipart/small/10-device-access-volume-muted.png diff --git a/assetstudio/src/images/clipart/small/10-device-access-volume-on.png b/assetstudio/src/images/clipart/small/10-device-access-volume-on.png Binary files differnew file mode 100644 index 0000000..a1d6670 --- /dev/null +++ b/assetstudio/src/images/clipart/small/10-device-access-volume-on.png diff --git a/assetstudio/src/images/clipart/small/11-alerts-and-states-airplane-mode-off.png b/assetstudio/src/images/clipart/small/11-alerts-and-states-airplane-mode-off.png Binary files differnew file mode 100644 index 0000000..bfce2ee --- /dev/null +++ b/assetstudio/src/images/clipart/small/11-alerts-and-states-airplane-mode-off.png diff --git a/assetstudio/src/images/clipart/small/11-alerts-and-states-airplane-mode-on.png b/assetstudio/src/images/clipart/small/11-alerts-and-states-airplane-mode-on.png Binary files differnew file mode 100644 index 0000000..fba67ae --- /dev/null +++ b/assetstudio/src/images/clipart/small/11-alerts-and-states-airplane-mode-on.png diff --git a/assetstudio/src/images/clipart/small/11-alerts-and-states-error.png b/assetstudio/src/images/clipart/small/11-alerts-and-states-error.png Binary files differnew file mode 100644 index 0000000..a32766b --- /dev/null +++ b/assetstudio/src/images/clipart/small/11-alerts-and-states-error.png diff --git a/assetstudio/src/images/clipart/small/11-alerts-and-states-warning.png b/assetstudio/src/images/clipart/small/11-alerts-and-states-warning.png Binary files differnew file mode 100644 index 0000000..37af134 --- /dev/null +++ b/assetstudio/src/images/clipart/small/11-alerts-and-states-warning.png diff --git a/assetstudio/src/images/clipart/small/12-hardware-computer.png b/assetstudio/src/images/clipart/small/12-hardware-computer.png Binary files differnew file mode 100644 index 0000000..91c7cdf --- /dev/null +++ b/assetstudio/src/images/clipart/small/12-hardware-computer.png diff --git a/assetstudio/src/images/clipart/small/12-hardware-dock.png b/assetstudio/src/images/clipart/small/12-hardware-dock.png Binary files differnew file mode 100644 index 0000000..c4a20ae --- /dev/null +++ b/assetstudio/src/images/clipart/small/12-hardware-dock.png diff --git a/assetstudio/src/images/clipart/small/12-hardware-gamepad.png b/assetstudio/src/images/clipart/small/12-hardware-gamepad.png Binary files differnew file mode 100644 index 0000000..db62572 --- /dev/null +++ b/assetstudio/src/images/clipart/small/12-hardware-gamepad.png diff --git a/assetstudio/src/images/clipart/small/12-hardware-headphones.png b/assetstudio/src/images/clipart/small/12-hardware-headphones.png Binary files differnew file mode 100644 index 0000000..9d3b020 --- /dev/null +++ b/assetstudio/src/images/clipart/small/12-hardware-headphones.png diff --git a/assetstudio/src/images/clipart/small/12-hardware-headset.png b/assetstudio/src/images/clipart/small/12-hardware-headset.png Binary files differnew file mode 100644 index 0000000..d4efdf3 --- /dev/null +++ b/assetstudio/src/images/clipart/small/12-hardware-headset.png diff --git a/assetstudio/src/images/clipart/small/12-hardware-keyboard.png b/assetstudio/src/images/clipart/small/12-hardware-keyboard.png Binary files differnew file mode 100644 index 0000000..7b143d2 --- /dev/null +++ b/assetstudio/src/images/clipart/small/12-hardware-keyboard.png diff --git a/assetstudio/src/images/clipart/small/12-hardware-mouse.png b/assetstudio/src/images/clipart/small/12-hardware-mouse.png Binary files differnew file mode 100644 index 0000000..4f8d2df --- /dev/null +++ b/assetstudio/src/images/clipart/small/12-hardware-mouse.png diff --git a/assetstudio/src/images/clipart/small/12-hardware-phone.png b/assetstudio/src/images/clipart/small/12-hardware-phone.png Binary files differnew file mode 100644 index 0000000..b5f78e1 --- /dev/null +++ b/assetstudio/src/images/clipart/small/12-hardware-phone.png diff --git a/assetstudio/src/images/clipart/small/2-action-about.png b/assetstudio/src/images/clipart/small/2-action-about.png Binary files differnew file mode 100644 index 0000000..56a3a55 --- /dev/null +++ b/assetstudio/src/images/clipart/small/2-action-about.png diff --git a/assetstudio/src/images/clipart/small/2-action-help.png b/assetstudio/src/images/clipart/small/2-action-help.png Binary files differnew file mode 100644 index 0000000..9104862 --- /dev/null +++ b/assetstudio/src/images/clipart/small/2-action-help.png diff --git a/assetstudio/src/images/clipart/small/2-action-search.png b/assetstudio/src/images/clipart/small/2-action-search.png Binary files differnew file mode 100644 index 0000000..1d3f206 --- /dev/null +++ b/assetstudio/src/images/clipart/small/2-action-search.png diff --git a/assetstudio/src/images/clipart/small/2-action-settings.png b/assetstudio/src/images/clipart/small/2-action-settings.png Binary files differnew file mode 100644 index 0000000..1dd6bbb --- /dev/null +++ b/assetstudio/src/images/clipart/small/2-action-settings.png diff --git a/assetstudio/src/images/clipart/small/3-rating-bad.png b/assetstudio/src/images/clipart/small/3-rating-bad.png Binary files differnew file mode 100644 index 0000000..76060f7 --- /dev/null +++ b/assetstudio/src/images/clipart/small/3-rating-bad.png diff --git a/assetstudio/src/images/clipart/small/3-rating-favorite.png b/assetstudio/src/images/clipart/small/3-rating-favorite.png Binary files differnew file mode 100644 index 0000000..b6ab63f --- /dev/null +++ b/assetstudio/src/images/clipart/small/3-rating-favorite.png diff --git a/assetstudio/src/images/clipart/small/3-rating-good.png b/assetstudio/src/images/clipart/small/3-rating-good.png Binary files differnew file mode 100644 index 0000000..0e6f861 --- /dev/null +++ b/assetstudio/src/images/clipart/small/3-rating-good.png diff --git a/assetstudio/src/images/clipart/small/3-rating-half-important.png b/assetstudio/src/images/clipart/small/3-rating-half-important.png Binary files differnew file mode 100644 index 0000000..d9aa154 --- /dev/null +++ b/assetstudio/src/images/clipart/small/3-rating-half-important.png diff --git a/assetstudio/src/images/clipart/small/3-rating-important.png b/assetstudio/src/images/clipart/small/3-rating-important.png Binary files differnew file mode 100644 index 0000000..0bc5c54 --- /dev/null +++ b/assetstudio/src/images/clipart/small/3-rating-important.png diff --git a/assetstudio/src/images/clipart/small/3-rating-not-important.png b/assetstudio/src/images/clipart/small/3-rating-not-important.png Binary files differnew file mode 100644 index 0000000..6ea5892 --- /dev/null +++ b/assetstudio/src/images/clipart/small/3-rating-not-important.png diff --git a/assetstudio/src/images/clipart/small/4-collections-cloud.png b/assetstudio/src/images/clipart/small/4-collections-cloud.png Binary files differnew file mode 100644 index 0000000..5d80291 --- /dev/null +++ b/assetstudio/src/images/clipart/small/4-collections-cloud.png diff --git a/assetstudio/src/images/clipart/small/4-collections-collection.png b/assetstudio/src/images/clipart/small/4-collections-collection.png Binary files differnew file mode 100644 index 0000000..d4a7dcb --- /dev/null +++ b/assetstudio/src/images/clipart/small/4-collections-collection.png diff --git a/assetstudio/src/images/clipart/small/4-collections-go-to-today.png b/assetstudio/src/images/clipart/small/4-collections-go-to-today.png Binary files differnew file mode 100644 index 0000000..3326ead --- /dev/null +++ b/assetstudio/src/images/clipart/small/4-collections-go-to-today.png diff --git a/assetstudio/src/images/clipart/small/4-collections-labels.png b/assetstudio/src/images/clipart/small/4-collections-labels.png Binary files differnew file mode 100644 index 0000000..e647488 --- /dev/null +++ b/assetstudio/src/images/clipart/small/4-collections-labels.png diff --git a/assetstudio/src/images/clipart/small/4-collections-new-label.png b/assetstudio/src/images/clipart/small/4-collections-new-label.png Binary files differnew file mode 100644 index 0000000..f822806 --- /dev/null +++ b/assetstudio/src/images/clipart/small/4-collections-new-label.png diff --git a/assetstudio/src/images/clipart/small/4-collections-sort-by-size.png b/assetstudio/src/images/clipart/small/4-collections-sort-by-size.png Binary files differnew file mode 100644 index 0000000..b097f67 --- /dev/null +++ b/assetstudio/src/images/clipart/small/4-collections-sort-by-size.png diff --git a/assetstudio/src/images/clipart/small/4-collections-view-as-grid.png b/assetstudio/src/images/clipart/small/4-collections-view-as-grid.png Binary files differnew file mode 100644 index 0000000..9f9e0c1 --- /dev/null +++ b/assetstudio/src/images/clipart/small/4-collections-view-as-grid.png diff --git a/assetstudio/src/images/clipart/small/4-collections-view-as-list.png b/assetstudio/src/images/clipart/small/4-collections-view-as-list.png Binary files differnew file mode 100644 index 0000000..39a2f1f --- /dev/null +++ b/assetstudio/src/images/clipart/small/4-collections-view-as-list.png diff --git a/assetstudio/src/images/clipart/small/5-content-attachment.png b/assetstudio/src/images/clipart/small/5-content-attachment.png Binary files differnew file mode 100644 index 0000000..ae5dac4 --- /dev/null +++ b/assetstudio/src/images/clipart/small/5-content-attachment.png diff --git a/assetstudio/src/images/clipart/small/5-content-backspace.png b/assetstudio/src/images/clipart/small/5-content-backspace.png Binary files differnew file mode 100644 index 0000000..f2743fe --- /dev/null +++ b/assetstudio/src/images/clipart/small/5-content-backspace.png diff --git a/assetstudio/src/images/clipart/small/5-content-copy.png b/assetstudio/src/images/clipart/small/5-content-copy.png Binary files differnew file mode 100644 index 0000000..7efa0ec --- /dev/null +++ b/assetstudio/src/images/clipart/small/5-content-copy.png diff --git a/assetstudio/src/images/clipart/small/5-content-cut.png b/assetstudio/src/images/clipart/small/5-content-cut.png Binary files differnew file mode 100644 index 0000000..4f113d6 --- /dev/null +++ b/assetstudio/src/images/clipart/small/5-content-cut.png diff --git a/assetstudio/src/images/clipart/small/5-content-discard.png b/assetstudio/src/images/clipart/small/5-content-discard.png Binary files differnew file mode 100644 index 0000000..9bbe70c --- /dev/null +++ b/assetstudio/src/images/clipart/small/5-content-discard.png diff --git a/assetstudio/src/images/clipart/small/5-content-edit.png b/assetstudio/src/images/clipart/small/5-content-edit.png Binary files differnew file mode 100644 index 0000000..dfef46d --- /dev/null +++ b/assetstudio/src/images/clipart/small/5-content-edit.png diff --git a/assetstudio/src/images/clipart/small/5-content-email.png b/assetstudio/src/images/clipart/small/5-content-email.png Binary files differnew file mode 100644 index 0000000..0698571 --- /dev/null +++ b/assetstudio/src/images/clipart/small/5-content-email.png diff --git a/assetstudio/src/images/clipart/small/5-content-event.png b/assetstudio/src/images/clipart/small/5-content-event.png Binary files differnew file mode 100644 index 0000000..4fea671 --- /dev/null +++ b/assetstudio/src/images/clipart/small/5-content-event.png diff --git a/assetstudio/src/images/clipart/small/5-content-import-export.png b/assetstudio/src/images/clipart/small/5-content-import-export.png Binary files differnew file mode 100644 index 0000000..1b4ed11 --- /dev/null +++ b/assetstudio/src/images/clipart/small/5-content-import-export.png diff --git a/assetstudio/src/images/clipart/small/5-content-merge.png b/assetstudio/src/images/clipart/small/5-content-merge.png Binary files differnew file mode 100644 index 0000000..4f7451e --- /dev/null +++ b/assetstudio/src/images/clipart/small/5-content-merge.png diff --git a/assetstudio/src/images/clipart/small/5-content-new-attachment.png b/assetstudio/src/images/clipart/small/5-content-new-attachment.png Binary files differnew file mode 100644 index 0000000..8028ea7 --- /dev/null +++ b/assetstudio/src/images/clipart/small/5-content-new-attachment.png diff --git a/assetstudio/src/images/clipart/small/5-content-new-email.png b/assetstudio/src/images/clipart/small/5-content-new-email.png Binary files differnew file mode 100644 index 0000000..699dca9 --- /dev/null +++ b/assetstudio/src/images/clipart/small/5-content-new-email.png diff --git a/assetstudio/src/images/clipart/small/5-content-new-event.png b/assetstudio/src/images/clipart/small/5-content-new-event.png Binary files differnew file mode 100644 index 0000000..4c4f674 --- /dev/null +++ b/assetstudio/src/images/clipart/small/5-content-new-event.png diff --git a/assetstudio/src/images/clipart/small/5-content-new-picture.png b/assetstudio/src/images/clipart/small/5-content-new-picture.png Binary files differnew file mode 100644 index 0000000..6b7b7ea --- /dev/null +++ b/assetstudio/src/images/clipart/small/5-content-new-picture.png diff --git a/assetstudio/src/images/clipart/small/5-content-new.png b/assetstudio/src/images/clipart/small/5-content-new.png Binary files differnew file mode 100644 index 0000000..7ccce5b --- /dev/null +++ b/assetstudio/src/images/clipart/small/5-content-new.png diff --git a/assetstudio/src/images/clipart/small/5-content-paste.png b/assetstudio/src/images/clipart/small/5-content-paste.png Binary files differnew file mode 100644 index 0000000..9c3d906 --- /dev/null +++ b/assetstudio/src/images/clipart/small/5-content-paste.png diff --git a/assetstudio/src/images/clipart/small/5-content-picture.png b/assetstudio/src/images/clipart/small/5-content-picture.png Binary files differnew file mode 100644 index 0000000..0676181 --- /dev/null +++ b/assetstudio/src/images/clipart/small/5-content-picture.png diff --git a/assetstudio/src/images/clipart/small/5-content-read.png b/assetstudio/src/images/clipart/small/5-content-read.png Binary files differnew file mode 100644 index 0000000..7c7186f --- /dev/null +++ b/assetstudio/src/images/clipart/small/5-content-read.png diff --git a/assetstudio/src/images/clipart/small/5-content-remove.png b/assetstudio/src/images/clipart/small/5-content-remove.png Binary files differnew file mode 100644 index 0000000..97f11f7 --- /dev/null +++ b/assetstudio/src/images/clipart/small/5-content-remove.png diff --git a/assetstudio/src/images/clipart/small/5-content-save.png b/assetstudio/src/images/clipart/small/5-content-save.png Binary files differnew file mode 100644 index 0000000..4b38e6c --- /dev/null +++ b/assetstudio/src/images/clipart/small/5-content-save.png diff --git a/assetstudio/src/images/clipart/small/5-content-select-all.png b/assetstudio/src/images/clipart/small/5-content-select-all.png Binary files differnew file mode 100644 index 0000000..cfb2282 --- /dev/null +++ b/assetstudio/src/images/clipart/small/5-content-select-all.png diff --git a/assetstudio/src/images/clipart/small/5-content-split.png b/assetstudio/src/images/clipart/small/5-content-split.png Binary files differnew file mode 100644 index 0000000..779f650 --- /dev/null +++ b/assetstudio/src/images/clipart/small/5-content-split.png diff --git a/assetstudio/src/images/clipart/small/5-content-undo.png b/assetstudio/src/images/clipart/small/5-content-undo.png Binary files differnew file mode 100644 index 0000000..87b0129 --- /dev/null +++ b/assetstudio/src/images/clipart/small/5-content-undo.png diff --git a/assetstudio/src/images/clipart/small/5-content-unread.png b/assetstudio/src/images/clipart/small/5-content-unread.png Binary files differnew file mode 100644 index 0000000..69cb276 --- /dev/null +++ b/assetstudio/src/images/clipart/small/5-content-unread.png diff --git a/assetstudio/src/images/clipart/small/6-social-add-group.png b/assetstudio/src/images/clipart/small/6-social-add-group.png Binary files differnew file mode 100644 index 0000000..cae89bb --- /dev/null +++ b/assetstudio/src/images/clipart/small/6-social-add-group.png diff --git a/assetstudio/src/images/clipart/small/6-social-add-person.png b/assetstudio/src/images/clipart/small/6-social-add-person.png Binary files differnew file mode 100644 index 0000000..ec95691 --- /dev/null +++ b/assetstudio/src/images/clipart/small/6-social-add-person.png diff --git a/assetstudio/src/images/clipart/small/6-social-cc-bcc.png b/assetstudio/src/images/clipart/small/6-social-cc-bcc.png Binary files differnew file mode 100644 index 0000000..92772f7 --- /dev/null +++ b/assetstudio/src/images/clipart/small/6-social-cc-bcc.png diff --git a/assetstudio/src/images/clipart/small/6-social-chat.png b/assetstudio/src/images/clipart/small/6-social-chat.png Binary files differnew file mode 100644 index 0000000..675c7e3 --- /dev/null +++ b/assetstudio/src/images/clipart/small/6-social-chat.png diff --git a/assetstudio/src/images/clipart/small/6-social-forward.png b/assetstudio/src/images/clipart/small/6-social-forward.png Binary files differnew file mode 100644 index 0000000..f533b34 --- /dev/null +++ b/assetstudio/src/images/clipart/small/6-social-forward.png diff --git a/assetstudio/src/images/clipart/small/6-social-group.png b/assetstudio/src/images/clipart/small/6-social-group.png Binary files differnew file mode 100644 index 0000000..ee027a7 --- /dev/null +++ b/assetstudio/src/images/clipart/small/6-social-group.png diff --git a/assetstudio/src/images/clipart/small/6-social-person.png b/assetstudio/src/images/clipart/small/6-social-person.png Binary files differnew file mode 100644 index 0000000..bb685c7 --- /dev/null +++ b/assetstudio/src/images/clipart/small/6-social-person.png diff --git a/assetstudio/src/images/clipart/small/6-social-reply-all.png b/assetstudio/src/images/clipart/small/6-social-reply-all.png Binary files differnew file mode 100644 index 0000000..fc94679 --- /dev/null +++ b/assetstudio/src/images/clipart/small/6-social-reply-all.png diff --git a/assetstudio/src/images/clipart/small/6-social-reply.png b/assetstudio/src/images/clipart/small/6-social-reply.png Binary files differnew file mode 100644 index 0000000..e413c9a --- /dev/null +++ b/assetstudio/src/images/clipart/small/6-social-reply.png diff --git a/assetstudio/src/images/clipart/small/6-social-send-now.png b/assetstudio/src/images/clipart/small/6-social-send-now.png Binary files differnew file mode 100644 index 0000000..6fa79f0 --- /dev/null +++ b/assetstudio/src/images/clipart/small/6-social-send-now.png diff --git a/assetstudio/src/images/clipart/small/6-social-share.png b/assetstudio/src/images/clipart/small/6-social-share.png Binary files differnew file mode 100644 index 0000000..fb74121 --- /dev/null +++ b/assetstudio/src/images/clipart/small/6-social-share.png diff --git a/assetstudio/src/images/clipart/small/7-location-directions.png b/assetstudio/src/images/clipart/small/7-location-directions.png Binary files differnew file mode 100644 index 0000000..c3e821d --- /dev/null +++ b/assetstudio/src/images/clipart/small/7-location-directions.png diff --git a/assetstudio/src/images/clipart/small/7-location-map.png b/assetstudio/src/images/clipart/small/7-location-map.png Binary files differnew file mode 100644 index 0000000..4893657 --- /dev/null +++ b/assetstudio/src/images/clipart/small/7-location-map.png diff --git a/assetstudio/src/images/clipart/small/7-location-place.png b/assetstudio/src/images/clipart/small/7-location-place.png Binary files differnew file mode 100644 index 0000000..2d41b57 --- /dev/null +++ b/assetstudio/src/images/clipart/small/7-location-place.png diff --git a/assetstudio/src/images/clipart/small/7-location-web-site.png b/assetstudio/src/images/clipart/small/7-location-web-site.png Binary files differnew file mode 100644 index 0000000..fe15c10 --- /dev/null +++ b/assetstudio/src/images/clipart/small/7-location-web-site.png diff --git a/assetstudio/src/images/clipart/small/8-images-crop.png b/assetstudio/src/images/clipart/small/8-images-crop.png Binary files differnew file mode 100644 index 0000000..ddca47f --- /dev/null +++ b/assetstudio/src/images/clipart/small/8-images-crop.png diff --git a/assetstudio/src/images/clipart/small/8-images-rotate-left.png b/assetstudio/src/images/clipart/small/8-images-rotate-left.png Binary files differnew file mode 100644 index 0000000..0450f2b --- /dev/null +++ b/assetstudio/src/images/clipart/small/8-images-rotate-left.png diff --git a/assetstudio/src/images/clipart/small/8-images-rotate-right.png b/assetstudio/src/images/clipart/small/8-images-rotate-right.png Binary files differnew file mode 100644 index 0000000..a34d957 --- /dev/null +++ b/assetstudio/src/images/clipart/small/8-images-rotate-right.png diff --git a/assetstudio/src/images/clipart/small/8-images-slideshow.png b/assetstudio/src/images/clipart/small/8-images-slideshow.png Binary files differnew file mode 100644 index 0000000..5317cf7 --- /dev/null +++ b/assetstudio/src/images/clipart/small/8-images-slideshow.png diff --git a/assetstudio/src/images/clipart/small/9-av-add-to-queue.png b/assetstudio/src/images/clipart/small/9-av-add-to-queue.png Binary files differnew file mode 100644 index 0000000..544b8fc --- /dev/null +++ b/assetstudio/src/images/clipart/small/9-av-add-to-queue.png diff --git a/assetstudio/src/images/clipart/small/9-av-download.png b/assetstudio/src/images/clipart/small/9-av-download.png Binary files differnew file mode 100644 index 0000000..bbf910c --- /dev/null +++ b/assetstudio/src/images/clipart/small/9-av-download.png diff --git a/assetstudio/src/images/clipart/small/9-av-fast-forward.png b/assetstudio/src/images/clipart/small/9-av-fast-forward.png Binary files differnew file mode 100644 index 0000000..dc7e11f --- /dev/null +++ b/assetstudio/src/images/clipart/small/9-av-fast-forward.png diff --git a/assetstudio/src/images/clipart/small/9-av-full-screen.png b/assetstudio/src/images/clipart/small/9-av-full-screen.png Binary files differnew file mode 100644 index 0000000..c1dd576 --- /dev/null +++ b/assetstudio/src/images/clipart/small/9-av-full-screen.png diff --git a/assetstudio/src/images/clipart/small/9-av-make-available-offline.png b/assetstudio/src/images/clipart/small/9-av-make-available-offline.png Binary files differnew file mode 100644 index 0000000..8e9459c --- /dev/null +++ b/assetstudio/src/images/clipart/small/9-av-make-available-offline.png diff --git a/assetstudio/src/images/clipart/small/9-av-next.png b/assetstudio/src/images/clipart/small/9-av-next.png Binary files differnew file mode 100644 index 0000000..01e6543 --- /dev/null +++ b/assetstudio/src/images/clipart/small/9-av-next.png diff --git a/assetstudio/src/images/clipart/small/9-av-pause-over-video.png b/assetstudio/src/images/clipart/small/9-av-pause-over-video.png Binary files differnew file mode 100644 index 0000000..bac9ce4 --- /dev/null +++ b/assetstudio/src/images/clipart/small/9-av-pause-over-video.png diff --git a/assetstudio/src/images/clipart/small/9-av-pause.png b/assetstudio/src/images/clipart/small/9-av-pause.png Binary files differnew file mode 100644 index 0000000..6a17d65 --- /dev/null +++ b/assetstudio/src/images/clipart/small/9-av-pause.png diff --git a/assetstudio/src/images/clipart/small/9-av-play-over-video.png b/assetstudio/src/images/clipart/small/9-av-play-over-video.png Binary files differnew file mode 100644 index 0000000..a3a68fc --- /dev/null +++ b/assetstudio/src/images/clipart/small/9-av-play-over-video.png diff --git a/assetstudio/src/images/clipart/small/9-av-play.png b/assetstudio/src/images/clipart/small/9-av-play.png Binary files differnew file mode 100644 index 0000000..2092eca --- /dev/null +++ b/assetstudio/src/images/clipart/small/9-av-play.png diff --git a/assetstudio/src/images/clipart/small/9-av-previous.png b/assetstudio/src/images/clipart/small/9-av-previous.png Binary files differnew file mode 100644 index 0000000..cf10fbf --- /dev/null +++ b/assetstudio/src/images/clipart/small/9-av-previous.png diff --git a/assetstudio/src/images/clipart/small/9-av-repeat.png b/assetstudio/src/images/clipart/small/9-av-repeat.png Binary files differnew file mode 100644 index 0000000..7638bea --- /dev/null +++ b/assetstudio/src/images/clipart/small/9-av-repeat.png diff --git a/assetstudio/src/images/clipart/small/9-av-replay.png b/assetstudio/src/images/clipart/small/9-av-replay.png Binary files differnew file mode 100644 index 0000000..8f1dae0 --- /dev/null +++ b/assetstudio/src/images/clipart/small/9-av-replay.png diff --git a/assetstudio/src/images/clipart/small/9-av-return-from-full-screen.png b/assetstudio/src/images/clipart/small/9-av-return-from-full-screen.png Binary files differnew file mode 100644 index 0000000..96949cb --- /dev/null +++ b/assetstudio/src/images/clipart/small/9-av-return-from-full-screen.png diff --git a/assetstudio/src/images/clipart/small/9-av-rewind.png b/assetstudio/src/images/clipart/small/9-av-rewind.png Binary files differnew file mode 100644 index 0000000..1811cd9 --- /dev/null +++ b/assetstudio/src/images/clipart/small/9-av-rewind.png diff --git a/assetstudio/src/images/clipart/small/9-av-shuffle.png b/assetstudio/src/images/clipart/small/9-av-shuffle.png Binary files differnew file mode 100644 index 0000000..6075afb --- /dev/null +++ b/assetstudio/src/images/clipart/small/9-av-shuffle.png diff --git a/assetstudio/src/images/clipart/small/9-av-stop.png b/assetstudio/src/images/clipart/small/9-av-stop.png Binary files differnew file mode 100644 index 0000000..3c95c99 --- /dev/null +++ b/assetstudio/src/images/clipart/small/9-av-stop.png diff --git a/assetstudio/src/images/clipart/small/9-av-upload.png b/assetstudio/src/images/clipart/small/9-av-upload.png Binary files differnew file mode 100644 index 0000000..af9b895 --- /dev/null +++ b/assetstudio/src/images/clipart/small/9-av-upload.png diff --git a/assetstudio/src/images/clipart/small/attach.png b/assetstudio/src/images/clipart/small/attach.png Binary files differdeleted file mode 100644 index 6bfc535..0000000 --- a/assetstudio/src/images/clipart/small/attach.png +++ /dev/null diff --git a/assetstudio/src/images/clipart/small/call.png b/assetstudio/src/images/clipart/small/call.png Binary files differdeleted file mode 100644 index 9ea8e0f..0000000 --- a/assetstudio/src/images/clipart/small/call.png +++ /dev/null diff --git a/assetstudio/src/images/clipart/small/copy.png b/assetstudio/src/images/clipart/small/copy.png Binary files differdeleted file mode 100644 index 68d31d8..0000000 --- a/assetstudio/src/images/clipart/small/copy.png +++ /dev/null diff --git a/assetstudio/src/images/clipart/small/cut.png b/assetstudio/src/images/clipart/small/cut.png Binary files differdeleted file mode 100644 index b94e50b..0000000 --- a/assetstudio/src/images/clipart/small/cut.png +++ /dev/null diff --git a/assetstudio/src/images/clipart/small/delete.png b/assetstudio/src/images/clipart/small/delete.png Binary files differdeleted file mode 100644 index 638c9c8..0000000 --- a/assetstudio/src/images/clipart/small/delete.png +++ /dev/null diff --git a/assetstudio/src/images/clipart/small/done.png b/assetstudio/src/images/clipart/small/done.png Binary files differdeleted file mode 100644 index aed3f0c..0000000 --- a/assetstudio/src/images/clipart/small/done.png +++ /dev/null diff --git a/assetstudio/src/images/clipart/small/edit.png b/assetstudio/src/images/clipart/small/edit.png Binary files differdeleted file mode 100644 index b677a6a..0000000 --- a/assetstudio/src/images/clipart/small/edit.png +++ /dev/null diff --git a/assetstudio/src/images/clipart/small/locate.png b/assetstudio/src/images/clipart/small/locate.png Binary files differdeleted file mode 100644 index cd16ada..0000000 --- a/assetstudio/src/images/clipart/small/locate.png +++ /dev/null diff --git a/assetstudio/src/images/clipart/small/mail.png b/assetstudio/src/images/clipart/small/mail.png Binary files differdeleted file mode 100644 index 8ae1cde..0000000 --- a/assetstudio/src/images/clipart/small/mail.png +++ /dev/null diff --git a/assetstudio/src/images/clipart/small/microphone.png b/assetstudio/src/images/clipart/small/microphone.png Binary files differdeleted file mode 100644 index bd58fb3..0000000 --- a/assetstudio/src/images/clipart/small/microphone.png +++ /dev/null diff --git a/assetstudio/src/images/clipart/small/overflow.png b/assetstudio/src/images/clipart/small/overflow.png Binary files differdeleted file mode 100644 index d3cd16c..0000000 --- a/assetstudio/src/images/clipart/small/overflow.png +++ /dev/null diff --git a/assetstudio/src/images/clipart/small/paste.png b/assetstudio/src/images/clipart/small/paste.png Binary files differdeleted file mode 100644 index b022176..0000000 --- a/assetstudio/src/images/clipart/small/paste.png +++ /dev/null diff --git a/assetstudio/src/images/clipart/small/photo.png b/assetstudio/src/images/clipart/small/photo.png Binary files differdeleted file mode 100644 index 906db99..0000000 --- a/assetstudio/src/images/clipart/small/photo.png +++ /dev/null diff --git a/assetstudio/src/images/clipart/small/refresh.png b/assetstudio/src/images/clipart/small/refresh.png Binary files differdeleted file mode 100644 index 6482017..0000000 --- a/assetstudio/src/images/clipart/small/refresh.png +++ /dev/null diff --git a/assetstudio/src/images/clipart/small/search.png b/assetstudio/src/images/clipart/small/search.png Binary files differdeleted file mode 100644 index fef5270..0000000 --- a/assetstudio/src/images/clipart/small/search.png +++ /dev/null diff --git a/assetstudio/src/images/clipart/small/select_all.png b/assetstudio/src/images/clipart/small/select_all.png Binary files differdeleted file mode 100644 index b32de7d..0000000 --- a/assetstudio/src/images/clipart/small/select_all.png +++ /dev/null diff --git a/assetstudio/src/images/clipart/small/send.png b/assetstudio/src/images/clipart/small/send.png Binary files differdeleted file mode 100644 index b2c768b..0000000 --- a/assetstudio/src/images/clipart/small/send.png +++ /dev/null diff --git a/assetstudio/src/images/clipart/small/share.png b/assetstudio/src/images/clipart/small/share.png Binary files differdeleted file mode 100644 index 11da57d..0000000 --- a/assetstudio/src/images/clipart/small/share.png +++ /dev/null diff --git a/assetstudio/src/images/clipart/small/star.png b/assetstudio/src/images/clipart/small/star.png Binary files differdeleted file mode 100644 index 847937e..0000000 --- a/assetstudio/src/images/clipart/small/star.png +++ /dev/null diff --git a/assetstudio/src/images/clipart/small/user.png b/assetstudio/src/images/clipart/small/user.png Binary files differdeleted file mode 100644 index 9c7a585..0000000 --- a/assetstudio/src/images/clipart/small/user.png +++ /dev/null diff --git a/assetstudio/src/images/clipart/small/video.png b/assetstudio/src/images/clipart/small/video.png Binary files differdeleted file mode 100644 index 9766009..0000000 --- a/assetstudio/src/images/clipart/small/video.png +++ /dev/null diff --git a/device_validator/app/src/com/android/validator/DeviceValidator.java b/device_validator/app/src/com/android/validator/DeviceValidator.java index e4038bc..8ca6afe 100644 --- a/device_validator/app/src/com/android/validator/DeviceValidator.java +++ b/device_validator/app/src/com/android/validator/DeviceValidator.java @@ -16,12 +16,12 @@ package com.android.validator; +import com.android.dvlib.DeviceSchema; + import java.io.File; import java.io.FileInputStream; import java.io.FileNotFoundException; -import com.android.dvlib.DeviceSchema; - public class DeviceValidator { public static void main(String[] args) { diff --git a/device_validator/dvlib/src/com/android/dvlib/DeviceSchema.java b/device_validator/dvlib/src/com/android/dvlib/DeviceSchema.java index 6c45401..b02471b 100644 --- a/device_validator/dvlib/src/com/android/dvlib/DeviceSchema.java +++ b/device_validator/dvlib/src/com/android/dvlib/DeviceSchema.java @@ -90,6 +90,8 @@ public class DeviceSchema { public static final String NODE_LIVE_WALLPAPER_SUPPORT = "live-wallpaper-support"; + public static final String NODE_STATUS_BAR = "status-bar"; + public static final String NODE_BUTTONS = "buttons"; public static final String NODE_CAMERA = "camera"; diff --git a/device_validator/dvlib/src/com/android/dvlib/devices.xsd b/device_validator/dvlib/src/com/android/dvlib/devices.xsd index 0cc9411..d4678da 100644 --- a/device_validator/dvlib/src/com/android/dvlib/devices.xsd +++ b/device_validator/dvlib/src/com/android/dvlib/devices.xsd @@ -206,6 +206,14 @@ <xsd:list itemType="xsd:NMTOKEN" /> </xsd:simpleType> </xsd:element> + <xsd:element name="status-bar" type="xsd:boolean"> + <xsd:annotation> + <xsd:documentation xml:lang="en"> + Specifies whether the device has a status bar in this + software configuration. + </xsd:documentation> + </xsd:annotation> + </xsd:element> </xsd:sequence> </xsd:complexType> diff --git a/device_validator/dvlib/tests/src/com/android/dvlib/devices.xml b/device_validator/dvlib/tests/src/com/android/dvlib/devices.xml index b626012..6662099 100644 --- a/device_validator/dvlib/tests/src/com/android/dvlib/devices.xml +++ b/device_validator/dvlib/tests/src/com/android/dvlib/devices.xml @@ -123,6 +123,7 @@ GL_OES_vertex_array_object GL_OES_vertex_half_float </d:gl-extensions> + <d:status-bar>true</d:status-bar> </d:software> <d:state name="Portrait" default="true"> <d:description>The phone in portrait view</d:description> @@ -248,6 +249,7 @@ GL_IMG_texture_stream GL_IMG_vertex_program </d:gl-extensions> + <d:status-bar>true</d:status-bar> </d:software> <d:state name="Portrait" default="true"> <d:description>The phone in portrait view</d:description> diff --git a/device_validator/dvlib/tests/src/com/android/dvlib/devices_minimal.xml b/device_validator/dvlib/tests/src/com/android/dvlib/devices_minimal.xml index 20d501f..e063fd1 100644 --- a/device_validator/dvlib/tests/src/com/android/dvlib/devices_minimal.xml +++ b/device_validator/dvlib/tests/src/com/android/dvlib/devices_minimal.xml @@ -117,6 +117,7 @@ GL_OES_vertex_array_object GL_OES_vertex_half_float </d:gl-extensions> + <d:status-bar>true</d:status-bar> </d:software> <d:state name="Portrait" default="true"> <d:description>The phone in portrait view</d:description> diff --git a/device_validator/dvlib/tests/src/com/android/dvlib/devices_no_default.xml b/device_validator/dvlib/tests/src/com/android/dvlib/devices_no_default.xml index 1247a45..605a6c1 100644 --- a/device_validator/dvlib/tests/src/com/android/dvlib/devices_no_default.xml +++ b/device_validator/dvlib/tests/src/com/android/dvlib/devices_no_default.xml @@ -122,6 +122,7 @@ GL_OES_vertex_array_object GL_OES_vertex_half_float </d:gl-extensions> + <d:status-bar>true</d:status-bar> </d:software> <d:state name="Portrait"> <d:description>The phone in portrait view</d:description> diff --git a/device_validator/dvlib/tests/src/com/android/dvlib/devices_no_hardware.xml b/device_validator/dvlib/tests/src/com/android/dvlib/devices_no_hardware.xml index 8f189a4..fb133ad 100644 --- a/device_validator/dvlib/tests/src/com/android/dvlib/devices_no_hardware.xml +++ b/device_validator/dvlib/tests/src/com/android/dvlib/devices_no_hardware.xml @@ -63,6 +63,7 @@ GL_OES_vertex_array_object GL_OES_vertex_half_float </d:gl-extensions> + <d:status-bar>true</d:status-bar> </d:software> <d:state name="Portrait" default="true"> <d:description>The phone in portrait view</d:description> diff --git a/device_validator/dvlib/tests/src/com/android/dvlib/devices_no_states.xml b/device_validator/dvlib/tests/src/com/android/dvlib/devices_no_states.xml index 89519cf..8685e3b 100644 --- a/device_validator/dvlib/tests/src/com/android/dvlib/devices_no_states.xml +++ b/device_validator/dvlib/tests/src/com/android/dvlib/devices_no_states.xml @@ -123,6 +123,7 @@ GL_OES_vertex_array_object GL_OES_vertex_half_float </d:gl-extensions> + <d:status-bar>true</d:status-bar> </d:software> </d:device> </d:devices> diff --git a/device_validator/dvlib/tests/src/com/android/dvlib/devices_too_many_defaults.xml b/device_validator/dvlib/tests/src/com/android/dvlib/devices_too_many_defaults.xml index 5409d32..c720a7a 100644 --- a/device_validator/dvlib/tests/src/com/android/dvlib/devices_too_many_defaults.xml +++ b/device_validator/dvlib/tests/src/com/android/dvlib/devices_too_many_defaults.xml @@ -123,6 +123,7 @@ GL_OES_vertex_array_object GL_OES_vertex_half_float </d:gl-extensions> + <d:status-bar>true</d:status-bar> </d:software> <d:state name="Portrait" default="true"> <d:description>The phone in portrait view</d:description> diff --git a/eclipse/plugins/com.android.ide.eclipse.ndk/src/com/android/ide/eclipse/ndk/internal/launch/NdkGdbLaunchDelegate.java b/eclipse/plugins/com.android.ide.eclipse.ndk/src/com/android/ide/eclipse/ndk/internal/launch/NdkGdbLaunchDelegate.java index 57d96d7..818a5c1 100644 --- a/eclipse/plugins/com.android.ide.eclipse.ndk/src/com/android/ide/eclipse/ndk/internal/launch/NdkGdbLaunchDelegate.java +++ b/eclipse/plugins/com.android.ide.eclipse.ndk/src/com/android/ide/eclipse/ndk/internal/launch/NdkGdbLaunchDelegate.java @@ -19,9 +19,9 @@ package com.android.ide.eclipse.ndk.internal.launch; import com.android.ddmlib.AdbCommandRejectedException; import com.android.ddmlib.AndroidDebugBridge; import com.android.ddmlib.Client; +import com.android.ddmlib.CollectingOutputReceiver; import com.android.ddmlib.IDevice; import com.android.ddmlib.IDevice.DeviceUnixSocketNamespace; -import com.android.ddmlib.IShellOutputReceiver; import com.android.ddmlib.InstallException; import com.android.ddmlib.ShellCommandUnresponsiveException; import com.android.ddmlib.SyncException; @@ -233,7 +233,7 @@ public class NdkGdbLaunchDelegate extends GdbLaunchDelegate { activityName); try { CountDownLatch launchedLatch = new CountDownLatch(1); - ShellOutputReceiver receiver = new ShellOutputReceiver(launchedLatch); + CollectingOutputReceiver receiver = new CollectingOutputReceiver(launchedLatch); device.executeShellCommand(command, receiver); launchedLatch.await(5, TimeUnit.SECONDS); String shellOutput = receiver.getOutput(); @@ -479,39 +479,9 @@ public class NdkGdbLaunchDelegate extends GdbLaunchDelegate { String command = String.format("run-as %s /system/bin/sh -c pwd", app); //$NON-NLS-1$ CountDownLatch commandCompleteLatch = new CountDownLatch(1); - ShellOutputReceiver receiver = new ShellOutputReceiver(commandCompleteLatch); + CollectingOutputReceiver receiver = new CollectingOutputReceiver(commandCompleteLatch); device.executeShellCommand(command, receiver); commandCompleteLatch.await(timeout, timeoutUnit); return receiver.getOutput().trim(); } - - private static class ShellOutputReceiver implements IShellOutputReceiver { - private StringBuffer sb = new StringBuffer(); - private CountDownLatch mCompleteLatch; - - public ShellOutputReceiver(CountDownLatch commandCompleteLatch) { - mCompleteLatch = commandCompleteLatch; - } - - @Override - public void addOutput(byte[] data, int offset, int length) { - sb.append(new String(data, offset, length)); - } - - @Override - public void flush() { - if (mCompleteLatch != null) { - mCompleteLatch.countDown(); - } - } - - @Override - public boolean isCancelled() { - return false; - } - - public String getOutput() { - return sb.toString(); - } - } } diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/devices/DeviceManager.java b/sdkmanager/libs/sdklib/src/com/android/sdklib/devices/DeviceManager.java index c203231..d46ca5f 100644 --- a/sdkmanager/libs/sdklib/src/com/android/sdklib/devices/DeviceManager.java +++ b/sdkmanager/libs/sdklib/src/com/android/sdklib/devices/DeviceManager.java @@ -198,7 +198,7 @@ public class DeviceManager { File renamedConfig = new File(base); int i = 0; while (renamedConfig.exists()) { - renamedConfig = new File(base+"."+i); + renamedConfig = new File(base + "." + (i++)); } mLog.error(null, "Error parsing %1$s, backing up to %2$s", userDevicesFile.getAbsolutePath(), renamedConfig.getAbsolutePath()); diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/devices/DeviceParser.java b/sdkmanager/libs/sdklib/src/com/android/sdklib/devices/DeviceParser.java index 43b63cb..dd63af2 100644 --- a/sdkmanager/libs/sdklib/src/com/android/sdklib/devices/DeviceParser.java +++ b/sdkmanager/libs/sdklib/src/com/android/sdklib/devices/DeviceParser.java @@ -304,6 +304,8 @@ public class DeviceParser { } else { mState.setNavState(NavigationState.getEnum(getString(mStringAccumulator))); } + } else if (DeviceSchema.NODE_STATUS_BAR.equals(localName)) { + mSoftware.setStatusBar(getBool(mStringAccumulator)); } } diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/devices/Software.java b/sdkmanager/libs/sdklib/src/com/android/sdklib/devices/Software.java index b89860f..a452b6e 100644 --- a/sdkmanager/libs/sdklib/src/com/android/sdklib/devices/Software.java +++ b/sdkmanager/libs/sdklib/src/com/android/sdklib/devices/Software.java @@ -27,6 +27,7 @@ public class Software { private Set<BluetoothProfile> mBluetoothProfiles = new HashSet<BluetoothProfile>(); private String mGlVersion; private Set<String> mGlExtensions = new HashSet<String>(); + private boolean mStatusBar; public int getMinSdkLevel() { return mMinSdkLevel; @@ -84,6 +85,14 @@ public class Software { mGlExtensions.addAll(extensions); } + public void setStatusBar(boolean hasBar) { + mStatusBar = hasBar; + } + + public boolean hasStatusBar() { + return mStatusBar; + } + public Software deepCopy() { Software s = new Software(); s.setMinSdkLevel(getMinSdkLevel()); @@ -92,6 +101,7 @@ public class Software { s.addAllBluetoothProfiles(getBluetoothProfiles()); s.setGlVersion(getGlVersion()); s.addAllGlExtensions(getGlExtensions()); + s.setStatusBar(hasStatusBar()); return s; } @@ -110,7 +120,8 @@ public class Software { && mLiveWallpaperSupport == sw.hasLiveWallpaperSupport() && mBluetoothProfiles.equals(sw.getBluetoothProfiles()) && mGlVersion.equals(sw.getGlVersion()) - && mGlExtensions.equals(sw.getGlExtensions()); + && mGlExtensions.equals(sw.getGlExtensions()) + && mStatusBar == sw.hasStatusBar(); } @Override @@ -122,6 +133,7 @@ public class Software { hash = 31 * hash + mBluetoothProfiles.hashCode(); hash = 31 * hash + mGlVersion.hashCode(); hash = 31 * hash + mGlExtensions.hashCode(); + hash = 31 * hash + (mStatusBar ? 1 : 0); return hash; } } diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/devices/devices.xml b/sdkmanager/libs/sdklib/src/com/android/sdklib/devices/devices.xml index bc9ec91..e18280d 100644 --- a/sdkmanager/libs/sdklib/src/com/android/sdklib/devices/devices.xml +++ b/sdkmanager/libs/sdklib/src/com/android/sdklib/devices/devices.xml @@ -75,6 +75,7 @@ <d:bluetooth-profiles /> <d:gl-version>2.1</d:gl-version> <d:gl-extensions /> + <d:status-bar>true</d:status-bar> </d:software> <d:state name="Portrait" default="true"> @@ -163,6 +164,7 @@ <d:bluetooth-profiles /> <d:gl-version>2.1</d:gl-version> <d:gl-extensions /> + <d:status-bar>true</d:status-bar> </d:software> <d:state name="Portrait" default="true"> @@ -257,6 +259,7 @@ <d:bluetooth-profiles /> <d:gl-version>2.1</d:gl-version> <d:gl-extensions /> + <d:status-bar>true</d:status-bar> </d:software> <d:state name="Portrait" default="true"> @@ -351,6 +354,7 @@ <d:bluetooth-profiles /> <d:gl-version>2.1</d:gl-version> <d:gl-extensions /> + <d:status-bar>true</d:status-bar> </d:software> <d:state name="Portrait" default="true"> @@ -439,6 +443,7 @@ <d:bluetooth-profiles /> <d:gl-version>2.1</d:gl-version> <d:gl-extensions /> + <d:status-bar>true</d:status-bar> </d:software> <d:state name="Portrait" default="true"> @@ -526,6 +531,7 @@ <d:bluetooth-profiles /> <d:gl-version>2.1</d:gl-version> <d:gl-extensions /> + <d:status-bar>true</d:status-bar> </d:software> <d:state name="Portrait" default="true"> @@ -614,6 +620,7 @@ <d:bluetooth-profiles /> <d:gl-version>2.1</d:gl-version> <d:gl-extensions /> + <d:status-bar>true</d:status-bar> </d:software> <d:state name="Portrait" default="true"> @@ -702,6 +709,7 @@ <d:bluetooth-profiles /> <d:gl-version>2.1</d:gl-version> <d:gl-extensions /> + <d:status-bar>true</d:status-bar> </d:software> <d:state name="Portrait" default="true"> @@ -796,6 +804,7 @@ <d:bluetooth-profiles /> <d:gl-version>2.1</d:gl-version> <d:gl-extensions /> + <d:status-bar>true</d:status-bar> </d:software> <d:state name="Portrait" default="true"> @@ -934,6 +943,7 @@ GL_OES_vertex_array_object GL_OES_vertex_half_float </d:gl-extensions> + <d:status-bar>true</d:status-bar> </d:software> <d:state name="Portrait" default="true"> <d:description>The phone in portrait view</d:description> @@ -1021,6 +1031,7 @@ <d:bluetooth-profiles /> <d:gl-version>2.1</d:gl-version> <d:gl-extensions /> + <d:status-bar>true</d:status-bar> </d:software> <d:state name="Portrait" default="true"> @@ -1109,6 +1120,7 @@ <d:bluetooth-profiles /> <d:gl-version>2.1</d:gl-version> <d:gl-extensions /> + <d:status-bar>true</d:status-bar> </d:software> <d:state name="Portrait" default="true"> @@ -1197,6 +1209,7 @@ <d:bluetooth-profiles /> <d:gl-version>2.1</d:gl-version> <d:gl-extensions /> + <d:status-bar>true</d:status-bar> </d:software> <d:state name="Portrait" default="true"> @@ -1285,6 +1298,7 @@ <d:bluetooth-profiles /> <d:gl-version>2.1</d:gl-version> <d:gl-extensions /> + <d:status-bar>true</d:status-bar> </d:software> <d:state name="Portrait" default="true"> @@ -1379,6 +1393,7 @@ <d:bluetooth-profiles /> <d:gl-version>2.1</d:gl-version> <d:gl-extensions /> + <d:status-bar>true</d:status-bar> </d:software> <d:state name="Portrait" default="true"> diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/sources/SdkSources.java b/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/sources/SdkSources.java index b1354c3..619d7b2 100755 --- a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/sources/SdkSources.java +++ b/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/sources/SdkSources.java @@ -287,7 +287,21 @@ public class SdkSources { for (int i = 0; i < count; i++) {
String url = props.getProperty(String.format("%s%02d", KEY_SRC, i)); //$NON-NLS-1$
if (url != null) {
- SdkSource s = new SdkAddonSource(url, null/*uiName*/);
+ // FIXME: this code originally only dealt with add-on XML sources.
+ // Now we'd like it to deal with system-image sources too, but we
+ // don't know which kind of object it is (at least not without
+ // trying to fetch it.) As a temporary workaround, just take a
+ // guess based on the leaf URI name. However ideally what we can
+ // simply do is add a checkbox "is system-image XML" in the user
+ // dialog and pass this info down here. Another alternative is to
+ // make a "dynamic" source object that tries to guess its type once
+ // the URI has been fetched.
+ SdkSource s;
+ if (url.endsWith("sys-img.xml")) {
+ s = new SdkSysImgSource(url, null/*uiName*/);
+ } else {
+ s = new SdkAddonSource(url, null/*uiName*/);
+ }
if (!hasSourceUrl(s)) {
add(SdkSourceCategory.USER_ADDONS, s);
}
diff --git a/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/util/BSPatchTest.java b/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/util/BSPatchTest.java new file mode 100755 index 0000000..6c6c405 --- /dev/null +++ b/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/util/BSPatchTest.java @@ -0,0 +1,533 @@ +/* + * Copyright (C) 2012 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.sdklib.util; + +import org.apache.commons.compress.compressors.bzip2.BZip2CompressorInputStream; + +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.util.Arrays; + +import junit.framework.TestCase; + + +public class BSPatchTest extends TestCase { + + // $ bsdiff file1 file2 diff-1-2.patch + // $ hexdump -v -e '1/1 "0x%02x, "' diff-1-2.patch + + public void testBSPatch1() throws Exception { + byte[] file1 = toSignedBytes(new short[] { + 0x62, 0x73, 0x64, 0x69, 0x66, 0x66, 0x20, 0x69, 0x73, 0x20, + 0x61, 0x20, 0x74, 0x6f, 0x6f, 0x6c, 0x20, 0x66, 0x6f, 0x72, + 0x20, 0x62, 0x75, 0x69, 0x6c, 0x64, 0x69, 0x6e, 0x67, 0x20, + 0x61, 0x6e, 0x64, 0x20, 0x61, 0x70, 0x70, 0x6c, 0x79, 0x69, + 0x6e, 0x67, 0x20, 0x70, 0x61, 0x74, 0x63, 0x68, 0x65, 0x73, + 0x20, 0x74, 0x6f, 0x20, 0x62, 0x69, 0x6e, 0x61, 0x72, 0x79, + 0x20, 0x66, 0x69, 0x6c, 0x65, 0x73, 0x2e, 0x0a + }); + + byte[] file2 = toSignedBytes(new short[] { + 0x62, 0x73, 0x64, 0x69, 0x66, 0x66, 0x20, 0x61, 0x6e, 0x64, + 0x20, 0x62, 0x73, 0x70, 0x61, 0x74, 0x63, 0x68, 0x20, 0x61, + 0x72, 0x65, 0x20, 0x74, 0x6f, 0x6f, 0x6c, 0x73, 0x20, 0x66, + 0x6f, 0x72, 0x20, 0x62, 0x75, 0x69, 0x6c, 0x64, 0x69, 0x6e, + 0x67, 0x20, 0x61, 0x6e, 0x64, 0x20, 0x61, 0x70, 0x70, 0x6c, + 0x79, 0x69, 0x6e, 0x67, 0x20, 0x70, 0x61, 0x74, 0x63, 0x68, + 0x65, 0x73, 0x20, 0x74, 0x6f, 0x20, 0x62, 0x69, 0x6e, 0x61, + 0x72, 0x79, 0x20, 0x66, 0x69, 0x6c, 0x65, 0x73, 0x2e, 0x0a, + }); + + byte[] patch = toSignedBytes(new short[] { + 0x42, 0x53, 0x44, 0x49, 0x46, 0x46, 0x34, 0x30, 0x35, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x27, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x50, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x42, 0x5a, 0x68, 0x39, 0x31, 0x41, 0x59, 0x26, + 0x53, 0x59, 0x93, 0x0d, 0x6a, 0xae, 0x00, 0x00, 0x0c, 0x68, + 0x40, 0x58, 0xa8, 0x02, 0x00, 0x04, 0x00, 0x40, 0x00, 0x20, + 0x00, 0x21, 0x88, 0x19, 0x08, 0x32, 0x62, 0x1b, 0xde, 0xbc, + 0x24, 0x08, 0xe9, 0x45, 0x3c, 0x5d, 0xc9, 0x14, 0xe1, 0x42, + 0x42, 0x4c, 0x35, 0xaa, 0xb8, 0x42, 0x5a, 0x68, 0x39, 0x31, + 0x41, 0x59, 0x26, 0x53, 0x59, 0x05, 0xb6, 0xa3, 0x63, 0x00, + 0x00, 0x00, 0x48, 0x00, 0x40, 0x00, 0x00, 0x80, 0x20, 0x00, + 0x21, 0x00, 0x82, 0x83, 0x17, 0x72, 0x45, 0x38, 0x50, 0x90, + 0x05, 0xb6, 0xa3, 0x63, 0x42, 0x5a, 0x68, 0x39, 0x31, 0x41, + 0x59, 0x26, 0x53, 0x59, 0xdb, 0x41, 0x22, 0x6f, 0x00, 0x00, + 0x01, 0x91, 0x80, 0x40, 0x00, 0x3e, 0x45, 0xdc, 0x00, 0x20, + 0x00, 0x22, 0x9a, 0x19, 0x32, 0x7a, 0x7a, 0xa1, 0x00, 0x00, + 0x21, 0xe2, 0xf8, 0x98, 0x42, 0x13, 0x3c, 0xec, 0x35, 0x5f, + 0x17, 0x72, 0x45, 0x38, 0x50, 0x90, 0xdb, 0x41, 0x22, 0x6f + }); + + byte[] expected = file2; + byte[] actual = patchFile(file1, patch); + + assertEquals(toDiffString(expected, actual), + Arrays.toString(expected), Arrays.toString(actual)); + } + + public void testBSPatch2() throws Exception { + byte[] file1 = toSignedBytes(new short[] { + 0x62, 0x73, 0x64, 0x69, 0x66, 0x66, 0x20, 0x61, 0x6e, 0x64, + 0x20, 0x62, 0x73, 0x70, 0x61, 0x74, 0x63, 0x68, 0x20, 0x61, + 0x72, 0x65, 0x20, 0x74, 0x6f, 0x6f, 0x6c, 0x73, 0x20, 0x66, + 0x6f, 0x72, 0x20, 0x62, 0x75, 0x69, 0x6c, 0x64, 0x69, 0x6e, + 0x67, 0x20, 0x61, 0x6e, 0x64, 0x20, 0x61, 0x70, 0x70, 0x6c, + 0x79, 0x69, 0x6e, 0x67, 0x20, 0x70, 0x61, 0x74, 0x63, 0x68, + 0x65, 0x73, 0x20, 0x74, 0x6f, 0x20, 0x62, 0x69, 0x6e, 0x61, + 0x72, 0x79, 0x20, 0x66, 0x69, 0x6c, 0x65, 0x73, 0x2e, 0x0a, + 0x68, 0x74, 0x74, 0x70, 0x3a, 0x2f, 0x2f, 0x77, 0x77, 0x77, + 0x2e, 0x64, 0x61, 0x65, 0x6d, 0x6f, 0x6e, 0x6f, 0x6c, 0x6f, + 0x67, 0x79, 0x2e, 0x6e, 0x65, 0x74, 0x2f, 0x62, 0x73, 0x64, + 0x69, 0x66, 0x66, 0x2f, 0x0a, 0x44, 0x65, 0x73, 0x63, 0x72, + 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x3a, 0x20, 0x67, 0x65, + 0x6e, 0x65, 0x72, 0x61, 0x74, 0x65, 0x2f, 0x61, 0x70, 0x70, + 0x6c, 0x79, 0x20, 0x61, 0x20, 0x70, 0x61, 0x74, 0x63, 0x68, + 0x20, 0x62, 0x65, 0x74, 0x77, 0x65, 0x65, 0x6e, 0x20, 0x74, + 0x77, 0x6f, 0x20, 0x62, 0x69, 0x6e, 0x61, 0x72, 0x79, 0x20, + 0x66, 0x69, 0x6c, 0x65, 0x73, 0x2e, 0x0a + }); + + byte[] file2 = toSignedBytes(new short[] { + 0x62, 0x73, 0x64, 0x69, 0x66, 0x66, 0x20, 0x61, 0x6e, 0x64, + 0x20, 0x62, 0x73, 0x70, 0x61, 0x74, 0x63, 0x68, 0x20, 0x61, + 0x72, 0x65, 0x20, 0x74, 0x6f, 0x6f, 0x6c, 0x73, 0x20, 0x66, + 0x6f, 0x72, 0x20, 0x62, 0x75, 0x69, 0x6c, 0x64, 0x69, 0x6e, + 0x67, 0x20, 0x61, 0x6e, 0x64, 0x20, 0x61, 0x70, 0x70, 0x6c, + 0x79, 0x69, 0x6e, 0x67, 0x20, 0x70, 0x61, 0x74, 0x63, 0x68, + 0x65, 0x73, 0x20, 0x74, 0x6f, 0x20, 0x62, 0x69, 0x6e, 0x61, + 0x72, 0x79, 0x20, 0x66, 0x69, 0x6c, 0x65, 0x73, 0x2e, 0x0a, + 0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, + 0x6e, 0x3a, 0x20, 0x67, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x74, + 0x65, 0x2f, 0x61, 0x70, 0x70, 0x6c, 0x79, 0x20, 0x61, 0x20, + 0x70, 0x61, 0x74, 0x63, 0x68, 0x20, 0x62, 0x65, 0x74, 0x77, + 0x65, 0x65, 0x6e, 0x20, 0x74, 0x77, 0x6f, 0x20, 0x62, 0x69, + 0x6e, 0x61, 0x72, 0x79, 0x20, 0x66, 0x69, 0x6c, 0x65, 0x73, + 0x2e, 0x0a, 0x68, 0x74, 0x74, 0x70, 0x3a, 0x2f, 0x2f, 0x77, + 0x77, 0x77, 0x2e, 0x64, 0x61, 0x65, 0x6d, 0x6f, 0x6e, 0x6f, + 0x6c, 0x6f, 0x67, 0x79, 0x2e, 0x6e, 0x65, 0x74, 0x2f, 0x62, + 0x73, 0x64, 0x69, 0x66, 0x66, 0x2f, 0x0a, 0x42, 0x53, 0x44, + 0x20, 0x6c, 0x69, 0x63, 0x65, 0x6e, 0x73, 0x65, 0x2c, 0x20, + 0x43, 0x6f, 0x70, 0x79, 0x72, 0x69, 0x67, 0x68, 0x74, 0x20, + 0x32, 0x30, 0x30, 0x33, 0x2d, 0x32, 0x30, 0x30, 0x35, 0x20, + 0x43, 0x6f, 0x6c, 0x69, 0x6e, 0x20, 0x50, 0x65, 0x72, 0x63, + 0x69, 0x76, 0x61, 0x6c, 0x0a, + }); + + byte[] patch = toSignedBytes(new short[] { + 0x42, 0x53, 0x44, 0x49, 0x46, 0x46, 0x34, 0x30, 0x3e, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x27, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0xe1, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x42, 0x5a, 0x68, 0x39, 0x31, 0x41, 0x59, 0x26, + 0x53, 0x59, 0x3f, 0xa6, 0x07, 0x42, 0x00, 0x00, 0x14, 0x5d, + 0x40, 0x58, 0x08, 0x08, 0x00, 0xc8, 0x02, 0x00, 0x00, 0xa0, + 0x00, 0x40, 0x00, 0x20, 0x00, 0x21, 0xa4, 0x69, 0x84, 0xfd, + 0x41, 0x03, 0x40, 0xd0, 0x22, 0xef, 0xe1, 0x49, 0x33, 0x02, + 0xce, 0x2e, 0xe6, 0x8b, 0xb9, 0x22, 0x9c, 0x28, 0x48, 0x1f, + 0xd3, 0x03, 0xa1, 0x00, 0x42, 0x5a, 0x68, 0x39, 0x31, 0x41, + 0x59, 0x26, 0x53, 0x59, 0x58, 0xc3, 0x04, 0xf0, 0x00, 0x00, + 0x00, 0x40, 0x10, 0x40, 0x00, 0x00, 0x02, 0x20, 0x00, 0x21, + 0x00, 0x82, 0x83, 0x17, 0x72, 0x45, 0x38, 0x50, 0x90, 0x58, + 0xc3, 0x04, 0xf0, 0x42, 0x5a, 0x68, 0x39, 0x31, 0x41, 0x59, + 0x26, 0x53, 0x59, 0x26, 0xc7, 0xbc, 0x09, 0x00, 0x00, 0x08, + 0x5f, 0x80, 0x00, 0x10, 0x40, 0x06, 0x5a, 0x00, 0x1c, 0x00, + 0x48, 0x00, 0x2a, 0xe5, 0xdd, 0x20, 0x20, 0x00, 0x31, 0x46, + 0x86, 0x80, 0x00, 0x00, 0x1a, 0xa6, 0x26, 0x40, 0xfd, 0x50, + 0x34, 0x79, 0x27, 0x92, 0x78, 0xda, 0x4d, 0x37, 0xa9, 0x20, + 0x8d, 0x8c, 0x41, 0x90, 0xea, 0x1c, 0x3a, 0xb3, 0xaa, 0x63, + 0x64, 0xa4, 0x27, 0x6d, 0x5b, 0x2a, 0xfc, 0x25, 0x1b, 0xab, + 0xd2, 0xff, 0x8b, 0xb9, 0x22, 0x9c, 0x28, 0x48, 0x13, 0x63, + 0xde, 0x04, 0x80 + }); + + byte[] expected = file2; + byte[] actual = patchFile(file1, patch); + + assertEquals(toDiffString(expected, actual), + Arrays.toString(expected), Arrays.toString(actual)); + } + + public void testBSPatch3() throws Exception { + byte[] file1 = toSignedBytes(new short[] { + 0x68, 0x74, 0x74, 0x70, 0x3a, 0x2f, 0x2f, 0x77, 0x77, 0x77, + 0x2e, 0x64, 0x61, 0x65, 0x6d, 0x6f, 0x6e, 0x6f, 0x6c, 0x6f, + 0x67, 0x79, 0x2e, 0x6e, 0x65, 0x74, 0x2f, 0x62, 0x73, 0x64, + 0x69, 0x66, 0x66, 0x2f, 0x0a, 0x42, 0x69, 0x6e, 0x61, 0x72, + 0x79, 0x20, 0x64, 0x69, 0x66, 0x66, 0x2f, 0x70, 0x61, 0x74, + 0x63, 0x68, 0x20, 0x75, 0x74, 0x69, 0x6c, 0x69, 0x74, 0x79, + 0x0a, 0x53, 0x48, 0x41, 0x31, 0x3a, 0x20, 0x37, 0x32, 0x63, + 0x35, 0x37, 0x34, 0x33, 0x34, 0x62, 0x64, 0x64, 0x34, 0x63, + 0x33, 0x38, 0x33, 0x63, 0x36, 0x39, 0x62, 0x62, 0x30, 0x66, + 0x61, 0x64, 0x34, 0x32, 0x33, 0x35, 0x37, 0x38, 0x35, 0x32, + 0x32, 0x63, 0x64, 0x30, 0x64, 0x33, 0x61, 0x0a, 0x53, 0x48, + 0x41, 0x32, 0x35, 0x36, 0x3a, 0x20, 0x61, 0x62, 0x62, 0x64, + 0x32, 0x32, 0x30, 0x39, 0x33, 0x38, 0x35, 0x65, 0x38, 0x65, + 0x38, 0x38, 0x30, 0x61, 0x64, 0x64, 0x30, 0x62, 0x37, 0x38, + 0x31, 0x37, 0x37, 0x38, 0x64, 0x65, 0x64, 0x34, 0x39, 0x65, + 0x31, 0x30, 0x61, 0x36, 0x66, 0x30, 0x63, 0x37, 0x39, 0x39, + 0x64, 0x33, 0x32, 0x36, 0x61, 0x36, 0x61, 0x65, 0x36, 0x37, + 0x30, 0x33, 0x36, 0x39, 0x36, 0x38, 0x66, 0x62, 0x31, 0x64, + 0x0a, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, + 0x6f, 0x6e, 0x3a, 0x20, 0x67, 0x65, 0x6e, 0x65, 0x72, 0x61, + 0x74, 0x65, 0x2f, 0x61, 0x70, 0x70, 0x6c, 0x79, 0x20, 0x61, + 0x20, 0x70, 0x61, 0x74, 0x63, 0x68, 0x20, 0x62, 0x65, 0x74, + 0x77, 0x65, 0x65, 0x6e, 0x20, 0x74, 0x77, 0x6f, 0x20, 0x62, + 0x69, 0x6e, 0x61, 0x72, 0x79, 0x20, 0x66, 0x69, 0x6c, 0x65, + 0x73, 0x0a, 0x20, 0x62, 0x73, 0x64, 0x69, 0x66, 0x66, 0x20, + 0x61, 0x6e, 0x64, 0x20, 0x62, 0x73, 0x70, 0x61, 0x74, 0x63, + 0x68, 0x20, 0x61, 0x72, 0x65, 0x20, 0x74, 0x6f, 0x6f, 0x6c, + 0x73, 0x20, 0x66, 0x6f, 0x72, 0x20, 0x62, 0x75, 0x69, 0x6c, + 0x64, 0x69, 0x6e, 0x67, 0x20, 0x61, 0x6e, 0x64, 0x20, 0x61, + 0x70, 0x70, 0x6c, 0x79, 0x69, 0x6e, 0x67, 0x20, 0x70, 0x61, + 0x74, 0x63, 0x68, 0x65, 0x73, 0x20, 0x74, 0x6f, 0x20, 0x62, + 0x69, 0x6e, 0x61, 0x72, 0x79, 0x20, 0x66, 0x69, 0x6c, 0x65, + 0x73, 0x2e, 0x0a + }); + + byte[] file2 = toSignedBytes(new short[] { + 0x42, 0x69, 0x6e, 0x61, 0x72, 0x79, 0x20, 0x64, 0x69, 0x66, + 0x66, 0x2f, 0x70, 0x61, 0x74, 0x63, 0x68, 0x20, 0x75, 0x74, + 0x69, 0x6c, 0x69, 0x74, 0x79, 0x0a, 0x48, 0x6f, 0x6d, 0x65, + 0x70, 0x61, 0x67, 0x65, 0x3a, 0x20, 0x20, 0x20, 0x20, 0x68, + 0x74, 0x74, 0x70, 0x3a, 0x2f, 0x2f, 0x77, 0x77, 0x77, 0x2e, + 0x64, 0x61, 0x65, 0x6d, 0x6f, 0x6e, 0x6f, 0x6c, 0x6f, 0x67, + 0x79, 0x2e, 0x6e, 0x65, 0x74, 0x2f, 0x62, 0x73, 0x64, 0x69, + 0x66, 0x66, 0x2f, 0x0a, 0x53, 0x48, 0x41, 0x31, 0x3a, 0x20, + 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x37, 0x32, 0x63, + 0x35, 0x37, 0x34, 0x33, 0x34, 0x62, 0x64, 0x64, 0x34, 0x63, + 0x33, 0x38, 0x33, 0x63, 0x36, 0x39, 0x62, 0x62, 0x30, 0x66, + 0x61, 0x64, 0x34, 0x32, 0x33, 0x35, 0x37, 0x38, 0x35, 0x32, + 0x32, 0x63, 0x64, 0x30, 0x64, 0x33, 0x61, 0x0a, 0x53, 0x48, + 0x41, 0x32, 0x35, 0x36, 0x3a, 0x20, 0x20, 0x20, 0x20, 0x20, + 0x20, 0x61, 0x62, 0x62, 0x64, 0x32, 0x32, 0x30, 0x39, 0x33, + 0x38, 0x35, 0x65, 0x38, 0x65, 0x38, 0x38, 0x30, 0x61, 0x64, + 0x64, 0x30, 0x62, 0x37, 0x38, 0x31, 0x37, 0x37, 0x38, 0x64, + 0x65, 0x64, 0x34, 0x39, 0x65, 0x31, 0x30, 0x61, 0x36, 0x66, + 0x30, 0x63, 0x37, 0x39, 0x39, 0x64, 0x33, 0x32, 0x36, 0x61, + 0x36, 0x61, 0x65, 0x36, 0x37, 0x30, 0x33, 0x36, 0x39, 0x36, + 0x38, 0x66, 0x62, 0x31, 0x64, 0x0a, 0x44, 0x65, 0x73, 0x63, + 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x3a, 0x20, 0x67, + 0x65, 0x6e, 0x65, 0x72, 0x61, 0x74, 0x65, 0x2f, 0x61, 0x70, + 0x70, 0x6c, 0x79, 0x20, 0x61, 0x20, 0x70, 0x61, 0x74, 0x63, + 0x68, 0x20, 0x62, 0x65, 0x74, 0x77, 0x65, 0x65, 0x6e, 0x20, + 0x74, 0x77, 0x6f, 0x20, 0x62, 0x69, 0x6e, 0x61, 0x72, 0x79, + 0x20, 0x66, 0x69, 0x6c, 0x65, 0x73, 0x0a, 0x20, 0x20, 0x20, + 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, + 0x62, 0x73, 0x64, 0x69, 0x66, 0x66, 0x20, 0x61, 0x6e, 0x64, + 0x20, 0x62, 0x73, 0x70, 0x61, 0x74, 0x63, 0x68, 0x20, 0x61, + 0x72, 0x65, 0x20, 0x74, 0x6f, 0x6f, 0x6c, 0x73, 0x20, 0x66, + 0x6f, 0x72, 0x20, 0x62, 0x75, 0x69, 0x6c, 0x64, 0x69, 0x6e, + 0x67, 0x20, 0x61, 0x6e, 0x64, 0x20, 0x61, 0x70, 0x70, 0x6c, + 0x79, 0x69, 0x6e, 0x67, 0x20, 0x70, 0x61, 0x74, 0x63, 0x68, + 0x65, 0x73, 0x20, 0x74, 0x6f, 0x20, 0x62, 0x69, 0x6e, 0x61, + 0x72, 0x79, 0x20, 0x66, 0x69, 0x6c, 0x65, 0x73, 0x2e, 0x0a, + }); + + byte[] patch = toSignedBytes(new short[] { + 0x42, 0x53, 0x44, 0x49, 0x46, 0x46, 0x34, 0x30, 0x48, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x2b, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x68, 0x01, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x42, 0x5a, 0x68, 0x39, 0x31, 0x41, 0x59, 0x26, + 0x53, 0x59, 0xea, 0x1c, 0x55, 0x4e, 0x00, 0x00, 0x07, 0xfa, + 0x40, 0x7c, 0x0e, 0x00, 0x10, 0x88, 0x00, 0x10, 0x02, 0x20, + 0x00, 0x40, 0x00, 0x20, 0x00, 0x21, 0x29, 0xa8, 0x00, 0x6d, + 0x42, 0x98, 0x00, 0x09, 0x9a, 0x99, 0xcc, 0xb7, 0x2b, 0xcd, + 0xf7, 0x1e, 0x00, 0x86, 0x22, 0x21, 0x09, 0x25, 0x14, 0xc5, + 0x0e, 0xd4, 0x61, 0xf1, 0x77, 0x24, 0x53, 0x85, 0x09, 0x0e, + 0xa1, 0xc5, 0x54, 0xe0, 0x42, 0x5a, 0x68, 0x39, 0x31, 0x41, + 0x59, 0x26, 0x53, 0x59, 0xb2, 0xea, 0xe3, 0xb5, 0x00, 0x00, + 0x00, 0xc8, 0x00, 0xc0, 0x00, 0x00, 0x02, 0x00, 0x08, 0x20, + 0x00, 0x21, 0x26, 0x41, 0x98, 0xa8, 0x0e, 0x2e, 0xe4, 0x8a, + 0x70, 0xa1, 0x21, 0x65, 0xd5, 0xc7, 0x6a, 0x42, 0x5a, 0x68, + 0x39, 0x31, 0x41, 0x59, 0x26, 0x53, 0x59, 0x99, 0x1b, 0x67, + 0xdb, 0x00, 0x00, 0x07, 0xff, 0x80, 0x40, 0x00, 0x10, 0x00, + 0x40, 0x00, 0x20, 0x10, 0x20, 0x40, 0x08, 0x00, 0x22, 0x82, + 0xc0, 0x00, 0x20, 0x00, 0x31, 0x00, 0x00, 0x06, 0x81, 0x33, + 0x50, 0xc3, 0x00, 0x20, 0x73, 0xb3, 0x44, 0x9c, 0xfd, 0xde, + 0x1f, 0x68, 0xbb, 0x92, 0x29, 0xc2, 0x84, 0x84, 0xc8, 0xdb, + 0x3e, 0xd8 + }); + + byte[] expected = file2; + byte[] actual = patchFile(file1, patch); + + assertEquals(toDiffString(expected, actual), + Arrays.toString(expected), Arrays.toString(actual)); + } + + private String toDiffString(byte[] a1, byte[] a2) { + StringBuilder sb = new StringBuilder(); + int n1 = a1.length; + int n2 = a2.length; + boolean was_same = false; + + for (int i = 0; i < n1; i++) { + boolean same = i > 1 && + i+2 < n1 && + i+2 < n2 && + a1[i+0] == a2[i+0] && + a1[i+1] == a2[i+1] && + a1[i+2] == a2[i+2]; + if (!same) { + if (i >= n2) { + sb.append(String.format("[%1$3d] %2$02x %2$c | -- -\n", i, a1[i])); + } else { + sb.append(String.format("[%1$3d] %2$02x %2$c | %3$02x %3$c\n", i, a1[i], a2[i])); + } + } else if (!was_same) { + sb.append(String.format("[%1$3d] ...\n", i)); + } + was_same = same; + } + for (int i = n1; i < n2; i++) { + sb.append(String.format("[%1$3d] -- - | %2$02x %2$c\n", i, a2[i])); + } + + return sb.toString(); + } + + /** + * Work around the lack of unsigned bytes in java by providing an initialization + * array where each short is in the range 0..0xFF and converting it to signed bytes. + * + * unsigned byte: 0..127 => signed java byte: 0..127 + * unsigned byte: 128..255 => signed java byte: -128..-1 + * + * unsigned to signed java: (unsigned - 256) if unsigned > 127 + * signed java to unsigned: (256 + signed) if signed < 0 + */ + private byte[] toSignedBytes(short[] s) { + int n = s.length; + byte[] b = new byte[n]; + for (int i = 0; i < n; i++) { + short v = s[i]; + b[i] = v < 128 ? (byte)v : (byte)(v - 256); + } + return b; + } + + @SuppressWarnings("unused") + private byte toSigned(int unsigned) { + return unsigned < 128 ? (byte)unsigned : (byte)(unsigned - 256); + } + + private short toUnsigned(byte signed) { + if (signed >= 0) { + return signed; + } else { + return (short) ((short) 256 + signed); + } + } + + /** + * Patches the binary "file1" using the bsdiff/bspatch "patch" data. + * This implements bspatch.c in Java. + * + * Reference: http://www.daemonology.net/bsdiff/ <br/> + * Based on bspatch.c as identified by <br/> + * {@code $FreeBSD: src/usr.bin/bsdiff/bspatch/bspatch.c,v 1.1 2005/08/06 01:59:06 cperciva Exp $} + * (BSD license, Copyright 2003-2005 Colin Percival) + * + * @param file1 The base file to be patched. + * @param patch The binary patch to apply to base file. + * @return A new byte array representing the patched file. + * @throws PatchException when the patch header is invalid. + * @throws IOException if the BZIP2 decoder fails. + */ + private byte[] patchFile(byte[] file1, byte[] patch) throws PatchException, IOException { + /* + File format: + 0 8 "BSDIFF40" + 8 8 X + 16 8 Y + 24 8 sizeof(newfile) + 32 X bzip2(control block) + 32+X Y bzip2(diff block) + 32+X+Y ??? bzip2(extra block) + with control block a set of triples (x,y,z) meaning "add x bytes + from oldfile to x bytes from the diff block; copy y bytes from the + extra block; seek forwards in oldfile by z bytes". + */ + + /* Read header */ + if (patch.length < 32) { + throw new PatchException("Header.len < 32"); + } + byte[] header = patch; + + /* Check for appropriate magic */ + if (header[0] != 'B' || header[1] != 'S' || header[2] != 'D' || header[3] != 'I' || + header[4] != 'F' || header[5] != 'F' || header[6] != '4' || header[7] != '0') { + throw new PatchException("Invalid header signature"); + } + + /* Read lengths from header */ + long bzctrllen = offtin(header, 8); + long bzdatalen = offtin(header, 16); + long newsize = offtin(header, 24); + if (bzctrllen < 0 || bzdatalen < 0 || newsize < 0) { + throw new PatchException("Invalid header lengths"); + } + + // Note: bspatch uses long lengths everywhere; + // however new byte[] doesn't support that and we don't expect to + // have 2GB+ file sizes to diff any time soon so let's + // do a first implementation that only supports 2^32 sizes. + + /* Read embedded files using Apache Common Compress' BZIP2 */ + InputStream cpfbz2 = readBzip2Data(patch, 32, bzctrllen); + InputStream dpfbz2 = readBzip2Data(patch, 32 + bzctrllen, bzdatalen); + InputStream epfbz2 = readBzip2Data(patch, 32 + bzctrllen + bzdatalen, -1); + + int oldsize = file1.length; + byte[] old = file1; + + byte[] _new = new byte[(int) newsize]; + + long ctrl[] = new long[3]; + byte buf[] = new byte[8]; + long oldpos = 0; + long newpos = 0; + while (newpos < newsize) { + long lenread; + + /* Read control data */ + for(int i = 0; i <= 2; i++) { + lenread = BZ2_bzRead(cpfbz2, buf, 0, 8); + if (lenread < 8) { + throw new PatchException("Failed to read control data") ; + } + ctrl[i] = offtin(buf, 0); + }; + + /* Sanity-check */ + if (newpos + ctrl[0] > newsize) { + throw new PatchException("Sanity check failed") ; + } + + /* Read diff string */ + lenread = BZ2_bzRead(dpfbz2, _new, newpos, ctrl[0]); + if (lenread < ctrl[0]) { + throw new PatchException("Failed to read diff data") ; + } + + /* Add old data to diff string */ + for (int i = 0; i < ctrl[0]; i++) { + if (oldpos + i >= 0 && oldpos + i < oldsize) { + _new[(int) (newpos + i)] += old[(int) (oldpos + i)]; + } + } + + /* Adjust pointers */ + newpos += ctrl[0]; + oldpos += ctrl[0]; + + /* Sanity-check */ + if (newpos + ctrl[1] > newsize) { + throw new PatchException("Sanity check failed") ; + } + + /* Read extra string */ + lenread = BZ2_bzRead(epfbz2, _new, newpos, ctrl[1]); + if (lenread < ctrl[1]) { + throw new PatchException("Failed to read extra data") ; + } + + /* Adjust pointers */ + newpos += ctrl[1]; + oldpos += ctrl[2]; + } + + /* Clean up the bzip2 reads */ + cpfbz2.close(); + dpfbz2.close(); + epfbz2.close(); + + /* Write the new file */ + // nop + + return _new; + } + + private long offtin(byte[] header, int offset) { + long y = 0; + + offset += 7; + y = header[offset] & 0x7F; + boolean sign = (header[offset] & 0x80) != 0; + for (int i = 6; i >= 0; i--) { + y = y * 256 + toUnsigned(header[--offset]); + } + + if (sign) { + y = -y; + } + + return y; + } + + /** + * Decode a BZIP2 data block starting at the given offset. + * + * @param data The binary data of the file. + * @param offset The index where the file begins + * @param length The length to read. Use -1 to mean "up to the end". + * @return A new decoded byte array. + * @throws IOException when the BZIP2 decompression fails. + */ + private InputStream readBzip2Data(byte[] data, long offset, long length) throws IOException { + if (length == -1) { + length = data.length - offset; + } + ByteArrayInputStream is = new ByteArrayInputStream(data, (int) offset, (int) length); + BZip2CompressorInputStream bis = new BZip2CompressorInputStream(is); + return bis; + } + + /** + * Reads the {@code length} next bytes from the bzip2 input stream. + * + * @param bzip2is The input stream to read from. + * @param dest The destination buffer to fill. + * @param length The length to read in bytes. + * @return The number of bytes read. + * @throws IOException If there's not enough data to read. + */ + private long BZ2_bzRead(InputStream bzip2is, byte[] dest, long offset, long length) + throws IOException { + for (long i = 0; i < length; ) { + int len = bzip2is.read(dest, (int) (offset + i), (int) (length - i)); + if (len == -1) { + throw new IOException("Bzip2 EOF"); + } + i += len; + } + return length; + } + + + @SuppressWarnings("serial") + static class PatchException extends Exception { + public PatchException() { + super("Corrupt patch"); + } + public PatchException(String msg) { + super("Corrupt patch: " + msg); + } + } +} diff --git a/uiautomatorviewer/etc/manifest.txt b/uiautomatorviewer/etc/manifest.txt index a606962..1ca57cc 100644 --- a/uiautomatorviewer/etc/manifest.txt +++ b/uiautomatorviewer/etc/manifest.txt @@ -1,2 +1,2 @@ -Main-Class: com.android.uiautomatorviewer.UiAutomatorViewer +Main-Class: com.android.uiautomator.UiAutomatorViewer Class-Path: org.eclipse.jface_3.6.2.M20110210-1200.jar org.eclipse.core.commands_3.6.0.I20100512-1500.jar org.eclipse.equinox.common_3.6.0.v20100503.jar diff --git a/uiautomatorviewer/etc/uiautomatorviewer b/uiautomatorviewer/etc/uiautomatorviewer index 605b81c..79faf5a 100755 --- a/uiautomatorviewer/etc/uiautomatorviewer +++ b/uiautomatorviewer/etc/uiautomatorviewer @@ -1,4 +1,5 @@ -#!/bin/sh +#!/bin/bash +# # Copyright 2012, The Android Open Source Project # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,7 +16,6 @@ # Set up prog to be the path of this script, including following symlinks, # and set up progdir to be the fully-qualified pathname of its directory. - prog="$0" while [ -h "${prog}" ]; do newProg=`/bin/ls -ld "${prog}"` @@ -29,15 +29,15 @@ while [ -h "${prog}" ]; do done oldwd=`pwd` progdir=`dirname "${prog}"` +progname=`basename "${prog}"` cd "${progdir}" progdir=`pwd` -prog="${progdir}"/`basename "${prog}"` +prog="${progdir}"/"${progname}" cd "${oldwd}" jarfile=uiautomatorviewer.jar frameworkdir="$progdir" libdir="$progdir" - if [ ! -r "$frameworkdir/$jarfile" ] then frameworkdir=`dirname "$progdir"`/tools/lib @@ -50,23 +50,29 @@ then fi if [ ! -r "$frameworkdir/$jarfile" ] then - echo `basename "$prog"`": can't find $jarfile" + echo "${progname}: can't find $jarfile" exit 1 fi javaCmd="java" -# Mac OS X needs an additional arg, or you get an "illegal thread" complaint. -if [ `uname` = "Darwin" ]; then - os_opts="-XstartOnFirstThread" +os=`uname` +if [ $os == 'Darwin' ]; then + javaOpts="-Xmx1600M -XstartOnFirstThread" else - os_opts= + javaOpts="-Xmx1600M" fi if [ `uname` = "Linux" ]; then export GDK_NATIVE_WINDOWS=true fi +while expr "x$1" : 'x-J' >/dev/null; do + opt=`expr "x$1" : 'x-J\(.*\)'` + javaOpts="${javaOpts} -${opt}" + shift +done + jarpath="$frameworkdir/$jarfile" # Figure out the path to the swt.jar for the current architecture. @@ -86,15 +92,13 @@ else fi fi -if [ ! -d "$swtpath" ]; then +# Combine the swtpath and the framework dir path. +if [ -d "$swtpath" ]; then + frameworkdir="${swtpath}:${frameworkdir}" +else echo "SWT folder '${swtpath}' does not exist." echo "Please export ANDROID_SWT to point to the folder containing swt.jar for your platform." exit 1 fi -# need to use "java.ext.dirs" because "-jar" causes classpath to be ignored -# might need more memory, e.g. -Xmx128M -exec "$javaCmd" \ - -Xmx512M $os_opts $java_debug \ - -classpath "$jarpath:$swtpath/swt.jar" \ - com.android.uiautomator.UiAutomatorViewer "$@" +exec "${javaCmd}" $javaOpts -Djava.ext.dirs="$frameworkdir" -Dcom.android.uiautomator.bindir="$progdir" -jar "$jarpath" "$@" diff --git a/uiautomatorviewer/src/com/android/uiautomator/DebugBridge.java b/uiautomatorviewer/src/com/android/uiautomator/DebugBridge.java index 09272bc..986c5e4 100644 --- a/uiautomatorviewer/src/com/android/uiautomator/DebugBridge.java +++ b/uiautomatorviewer/src/com/android/uiautomator/DebugBridge.java @@ -43,7 +43,7 @@ public class DebugBridge { } // check if adb is present in the tools directory - adb = new File(sdk, SdkConstants.FN_ADB); + adb = new File(toolsDir, SdkConstants.FN_ADB); if (adb.exists()) { return adb.getAbsolutePath(); } |
