diff options
author | Mohammad Saboorian <msab@google.com> | 2021-11-02 15:26:40 +0000 |
---|---|---|
committer | Mohammad Saboorian <msab@google.com> | 2021-11-12 10:05:46 +0000 |
commit | 06e136a64fce5ce3d9e78cffbdb21e24166502be (patch) | |
tree | 6b9218e5afde08b141ac47907c9bc5de0c6af81f /artwork | |
parent | 7642d4c32dfbcf589d87e5b6b2afd90595452ef3 (diff) | |
download | idea-06e136a64fce5ce3d9e78cffbdb21e24166502be.tar.gz |
Update default wear device profiles
Bug: 193164022
Bug: 204758821
Change-Id: I3f76262175aa08d74adedf765861c8f62ec237c7
Diffstat (limited to 'artwork')
32 files changed, 103 insertions, 138 deletions
diff --git a/artwork/resources/device-art-resources/device-art.xml b/artwork/resources/device-art-resources/device-art.xml index 703c27effc0..e9b0e57b723 100644 --- a/artwork/resources/device-art-resources/device-art.xml +++ b/artwork/resources/device-art-resources/device-art.xml @@ -60,12 +60,12 @@ <orientation name="land" size="3427,1620" screenPos="442,71" screenSize="2560,1440" shadow="land_shadow.webp" back="land_back.webp" lights="land_fore.webp"/> </device> - <device id="wear_square" name="Wear OS Square"> + <device id="wearos_square" name="Wear OS Square"> <orientation name="port" size="474,403" screenPos="100,38" screenSize="280,280" shadow="shadow.png" back="back.png" lights="fore.png" mask="mask.png"/> <orientation name="land" size="474,403" screenPos="100,38" screenSize="280,280" shadow="shadow.png" back="back.png" lights="fore.png" mask="mask.png"/> </device> - <device id="wear_round" name="Wear OS Round"> + <device id="wearos_small_round" name="Wear OS Round"> <orientation name="port" size="370,424" screenPos="25,26" screenSize="320,320" shadow="shadow.png" back="back.png" lights="fore.png" mask="mask.png"/> <orientation name="land" size="370,424" screenPos="25,26" screenSize="320,320" shadow="shadow.png" back="back.png" lights="fore.png" mask="mask.png"/> </device> diff --git a/artwork/resources/device-art-resources/wear_round/arrow_down.png b/artwork/resources/device-art-resources/wear_round/arrow_down.png Binary files differdeleted file mode 100644 index 2516ebc8fff..00000000000 --- a/artwork/resources/device-art-resources/wear_round/arrow_down.png +++ /dev/null diff --git a/artwork/resources/device-art-resources/wear_round/arrow_left.png b/artwork/resources/device-art-resources/wear_round/arrow_left.png Binary files differdeleted file mode 100644 index 954c8643f37..00000000000 --- a/artwork/resources/device-art-resources/wear_round/arrow_left.png +++ /dev/null diff --git a/artwork/resources/device-art-resources/wear_round/arrow_right.png b/artwork/resources/device-art-resources/wear_round/arrow_right.png Binary files differdeleted file mode 100644 index 34aacfff2b3..00000000000 --- a/artwork/resources/device-art-resources/wear_round/arrow_right.png +++ /dev/null diff --git a/artwork/resources/device-art-resources/wear_round/arrow_up.png b/artwork/resources/device-art-resources/wear_round/arrow_up.png Binary files differdeleted file mode 100644 index a6980a1a8aa..00000000000 --- a/artwork/resources/device-art-resources/wear_round/arrow_up.png +++ /dev/null diff --git a/artwork/resources/device-art-resources/wear_round/button.png b/artwork/resources/device-art-resources/wear_round/button.png Binary files differdeleted file mode 100644 index 2fd728be84c..00000000000 --- a/artwork/resources/device-art-resources/wear_round/button.png +++ /dev/null diff --git a/artwork/resources/device-art-resources/wear_round/circle_mask_320px.png b/artwork/resources/device-art-resources/wear_round/circle_mask_320px.png Binary files differdeleted file mode 100644 index cdc813eedb5..00000000000 --- a/artwork/resources/device-art-resources/wear_round/circle_mask_320px.png +++ /dev/null diff --git a/artwork/resources/device-art-resources/wear_round/circle_mask_380px.png b/artwork/resources/device-art-resources/wear_round/circle_mask_380px.png Binary files differdeleted file mode 100644 index 6e00b321492..00000000000 --- a/artwork/resources/device-art-resources/wear_round/circle_mask_380px.png +++ /dev/null diff --git a/artwork/resources/device-art-resources/wear_round/circle_mask_380px_onion.png b/artwork/resources/device-art-resources/wear_round/circle_mask_380px_onion.png Binary files differdeleted file mode 100644 index c7503fdb173..00000000000 --- a/artwork/resources/device-art-resources/wear_round/circle_mask_380px_onion.png +++ /dev/null diff --git a/artwork/resources/device-art-resources/wear_round/controls.png b/artwork/resources/device-art-resources/wear_round/controls.png Binary files differdeleted file mode 100644 index b34e4c099f6..00000000000 --- a/artwork/resources/device-art-resources/wear_round/controls.png +++ /dev/null diff --git a/artwork/resources/device-art-resources/wear_round/key.png b/artwork/resources/device-art-resources/wear_round/key.png Binary files differdeleted file mode 100644 index cddc5b6c338..00000000000 --- a/artwork/resources/device-art-resources/wear_round/key.png +++ /dev/null diff --git a/artwork/resources/device-art-resources/wear_round/layout b/artwork/resources/device-art-resources/wear_round/layout deleted file mode 100644 index 61768d0529d..00000000000 --- a/artwork/resources/device-art-resources/wear_round/layout +++ /dev/null @@ -1,71 +0,0 @@ -parts { - portrait { - background { - image circle_mask_380px.png - } - } - - device { - display { - width 320 - height 320 - x 0 - y 0 - } - } - - controls { - background { - image controls.png - } - buttons { - home { - image button.png - x 1 - y 1 - } - } - } -} - -layouts { - portrait { - width 380 - height 380 - color 0x1f1f1f - event EV_SW:0:1 - - onion { - image circle_mask_380px_onion.png - alpha 100 - rotation 0 - } - - part1 { - name portrait - x 0 - y 0 - } - - part2 { - name device - x 30 - y 30 - } - - part3 { - name controls - x 0 - y 0 - } - } -} - -keyboard { - charmap qwerty2 -} - -network { - speed full - delay none -} diff --git a/artwork/resources/device-art-resources/wear_round/select.png b/artwork/resources/device-art-resources/wear_round/select.png Binary files differdeleted file mode 100644 index 1fb8b8987c9..00000000000 --- a/artwork/resources/device-art-resources/wear_round/select.png +++ /dev/null diff --git a/artwork/resources/device-art-resources/wear_round_chin_320_290/device_bezel.png b/artwork/resources/device-art-resources/wear_round_chin_320_290/device_bezel.png Binary files differdeleted file mode 100644 index c37b676b304..00000000000 --- a/artwork/resources/device-art-resources/wear_round_chin_320_290/device_bezel.png +++ /dev/null diff --git a/artwork/resources/device-art-resources/wear_square/layout b/artwork/resources/device-art-resources/wear_square/layout deleted file mode 100644 index b29016a3a52..00000000000 --- a/artwork/resources/device-art-resources/wear_square/layout +++ /dev/null @@ -1,59 +0,0 @@ -parts { - device { - display { - width 280 - height 280 - x 0 - y 0 - } - } - portrait { - background { - image back.png - } - onion { - image fore.png - } - } - landscape { - background { - image back.png - } - onion { - image fore.png - } - } -} -layouts { - portrait { - width 474 - height 403 - event EV_SW:0:1 - part1 { - name portrait - x 0 - y 0 - } - part2 { - name device - x 100 - y 38 - } - } - landscape { - width 474 - height 403 - event EV_SW:0:0 - part1 { - name landscape - x 0 - y 0 - } - part2 { - name device - x 100 - y 318 - rotation 3 - } - } -} diff --git a/artwork/resources/device-art-resources/wearos_large_round/device_bezel.png b/artwork/resources/device-art-resources/wearos_large_round/device_bezel.png Binary files differnew file mode 100644 index 00000000000..988b1c27f0e --- /dev/null +++ b/artwork/resources/device-art-resources/wearos_large_round/device_bezel.png diff --git a/artwork/resources/device-art-resources/wear_round/hardware.ini b/artwork/resources/device-art-resources/wearos_large_round/hardware.ini index 3f72bc6e5ca..3f8ab78b83a 100644 --- a/artwork/resources/device-art-resources/wear_round/hardware.ini +++ b/artwork/resources/device-art-resources/wearos_large_round/hardware.ini @@ -1,2 +1,3 @@ # skin-specific hardware values hw.rotaryInput=yes +hw.sensors.heart_rate=yes diff --git a/artwork/resources/device-art-resources/wear_round_chin_320_290/layout b/artwork/resources/device-art-resources/wearos_large_round/layout index 8e2a6715686..332669e3ef0 100644 --- a/artwork/resources/device-art-resources/wear_round_chin_320_290/layout +++ b/artwork/resources/device-art-resources/wearos_large_round/layout @@ -7,8 +7,8 @@ parts { device { display { - width 320 - height 290 + width 454 + height 454 x 0 y 0 } @@ -17,8 +17,8 @@ parts { layouts { portrait { - width 380 - height 380 + width 539 + height 539 color 0x1f1f1f event EV_SW:0:1 @@ -30,8 +30,8 @@ layouts { part2 { name device - x 30 - y 30 + x 42 + y 42 } } } diff --git a/artwork/resources/device-art-resources/wear_round/back.png b/artwork/resources/device-art-resources/wearos_small_round/back.png Binary files differindex 69de2c0adc9..69de2c0adc9 100644 --- a/artwork/resources/device-art-resources/wear_round/back.png +++ b/artwork/resources/device-art-resources/wearos_small_round/back.png diff --git a/artwork/resources/device-art-resources/wearos_small_round/device_bezel.png b/artwork/resources/device-art-resources/wearos_small_round/device_bezel.png Binary files differnew file mode 100644 index 00000000000..5eccf08ceec --- /dev/null +++ b/artwork/resources/device-art-resources/wearos_small_round/device_bezel.png diff --git a/artwork/resources/device-art-resources/wear_round/fore.png b/artwork/resources/device-art-resources/wearos_small_round/fore.png Binary files differindex 7066cf55ebc..7066cf55ebc 100644 --- a/artwork/resources/device-art-resources/wear_round/fore.png +++ b/artwork/resources/device-art-resources/wearos_small_round/fore.png diff --git a/artwork/resources/device-art-resources/wear_round_chin_320_290/hardware.ini b/artwork/resources/device-art-resources/wearos_small_round/hardware.ini index 3f72bc6e5ca..3f8ab78b83a 100644 --- a/artwork/resources/device-art-resources/wear_round_chin_320_290/hardware.ini +++ b/artwork/resources/device-art-resources/wearos_small_round/hardware.ini @@ -1,2 +1,3 @@ # skin-specific hardware values hw.rotaryInput=yes +hw.sensors.heart_rate=yes diff --git a/artwork/resources/device-art-resources/wearos_small_round/layout b/artwork/resources/device-art-resources/wearos_small_round/layout new file mode 100644 index 00000000000..6c45bac2966 --- /dev/null +++ b/artwork/resources/device-art-resources/wearos_small_round/layout @@ -0,0 +1,46 @@ +parts { + portrait { + background { + image device_bezel.png + } + } + + device { + display { + width 384 + height 384 + x 0 + y 0 + } + } +} + +layouts { + portrait { + width 456 + height 456 + color 0x1f1f1f + event EV_SW:0:1 + + part1 { + name portrait + x 0 + y 0 + } + + part2 { + name device + x 36 + y 36 + } + } +} + +keyboard { + charmap qwerty2 +} + +network { + speed full + delay none +} diff --git a/artwork/resources/device-art-resources/wear_round/mask.png b/artwork/resources/device-art-resources/wearos_small_round/mask.png Binary files differindex d5e8e59d487..d5e8e59d487 100644 --- a/artwork/resources/device-art-resources/wear_round/mask.png +++ b/artwork/resources/device-art-resources/wearos_small_round/mask.png diff --git a/artwork/resources/device-art-resources/wear_round/shadow.png b/artwork/resources/device-art-resources/wearos_small_round/shadow.png Binary files differindex 28e9f17e8f6..28e9f17e8f6 100644 --- a/artwork/resources/device-art-resources/wear_round/shadow.png +++ b/artwork/resources/device-art-resources/wearos_small_round/shadow.png diff --git a/artwork/resources/device-art-resources/wear_square/back.png b/artwork/resources/device-art-resources/wearos_square/back.png Binary files differindex 7f648e53ba4..7f648e53ba4 100644 --- a/artwork/resources/device-art-resources/wear_square/back.png +++ b/artwork/resources/device-art-resources/wearos_square/back.png diff --git a/artwork/resources/device-art-resources/wearos_square/device_bezel.png b/artwork/resources/device-art-resources/wearos_square/device_bezel.png Binary files differnew file mode 100644 index 00000000000..01c5cc14665 --- /dev/null +++ b/artwork/resources/device-art-resources/wearos_square/device_bezel.png diff --git a/artwork/resources/device-art-resources/wear_square/fore.png b/artwork/resources/device-art-resources/wearos_square/fore.png Binary files differindex 58a4d72f1f3..58a4d72f1f3 100644 --- a/artwork/resources/device-art-resources/wear_square/fore.png +++ b/artwork/resources/device-art-resources/wearos_square/fore.png diff --git a/artwork/resources/device-art-resources/wear_square/hardware.ini b/artwork/resources/device-art-resources/wearos_square/hardware.ini index 3f72bc6e5ca..3f8ab78b83a 100644 --- a/artwork/resources/device-art-resources/wear_square/hardware.ini +++ b/artwork/resources/device-art-resources/wearos_square/hardware.ini @@ -1,2 +1,3 @@ # skin-specific hardware values hw.rotaryInput=yes +hw.sensors.heart_rate=yes diff --git a/artwork/resources/device-art-resources/wearos_square/layout b/artwork/resources/device-art-resources/wearos_square/layout new file mode 100644 index 00000000000..d1f9278d1fe --- /dev/null +++ b/artwork/resources/device-art-resources/wearos_square/layout @@ -0,0 +1,46 @@ +parts { + portrait { + background { + image device_bezel.png + } + } + + device { + display { + width 360 + height 360 + x 0 + y 0 + } + } +} + +layouts { + portrait { + width 432 + height 432 + color 0x1f1f1f + event EV_SW:0:1 + + part1 { + name portrait + x 18 + y 18 + } + + part2 { + name device + x 36 + y 36 + } + } +} + +keyboard { + charmap qwerty2 +} + +network { + speed full + delay none +} diff --git a/artwork/resources/device-art-resources/wear_square/mask.png b/artwork/resources/device-art-resources/wearos_square/mask.png Binary files differindex a1f76324f8a..a1f76324f8a 100644 --- a/artwork/resources/device-art-resources/wear_square/mask.png +++ b/artwork/resources/device-art-resources/wearos_square/mask.png diff --git a/artwork/resources/device-art-resources/wear_square/shadow.png b/artwork/resources/device-art-resources/wearos_square/shadow.png Binary files differindex bf4d058c257..bf4d058c257 100644 --- a/artwork/resources/device-art-resources/wear_square/shadow.png +++ b/artwork/resources/device-art-resources/wearos_square/shadow.png |