Skip to content

Commit

Permalink
Scale the GUI to fit the screen
Browse files Browse the repository at this point in the history 
With this patch set, if needed, we scale the images during early
boot. TTF support is needed to properly scale the font. No font
scaling is done on the old style fixed width font used in the
console.

Special thanks to _that for figuring out the scaling and blending
function calls to make this possible.

Change-Id: If2f79bef16d6db2e1298bfc3d00c9bcca2bee37a
  • Loading branch information
@Dees-Troy
Dees-Troy committed Feb 10, 2015
1 parent 1b6199f commit 63e414f
Show file tree
Hide file tree
Showing 34 changed files with 399 additions and 150 deletions.
3 changes: 3 additions & 0 deletions gui/Android.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,9 @@ endif
ifneq ($(TW_Y_OFFSET),)
LOCAL_CFLAGS += -DTW_Y_OFFSET=$(TW_Y_OFFSET)
endif
ifeq ($(TW_ROUND_SCREEN), true)
LOCAL_CFLAGS += -DTW_ROUND_SCREEN
endif

ifeq ($(DEVICE_RESOLUTION),)
$(warning ********************************************************************************)
Expand Down
10 changes: 5 additions & 5 deletions gui/devices/1024x600/res/ui.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@
<resource name="progress" type="animation" filename="indeterminate" />
<resource name="progress_empty" type="image" filename="progress_empty" />
<resource name="progress_full" type="image" filename="progress_fill" />
<resource name="checkbox_false" type="image" filename="checkbox_empty" />
<resource name="checkbox_true" type="image" filename="checkbox_checked" />
<resource name="radio_false" type="image" filename="radio_empty" />
<resource name="radio_true" type="image" filename="radio_selected" />
<resource name="checkbox_false" type="image" filename="checkbox_empty" retainaspect="1" />
<resource name="checkbox_true" type="image" filename="checkbox_checked" retainaspect="1" />
<resource name="radio_false" type="image" filename="radio_empty" retainaspect="1" />
<resource name="radio_true" type="image" filename="radio_selected" retainaspect="1" />
<resource name="medium_button" type="image" filename="medium-button" />
<resource name="mediumwide_button" type="image" filename="mediumwide-button" />
<resource name="sort_button" type="image" filename="sort-button" />
Expand All @@ -42,7 +42,7 @@
<resource name="keyboard2" type="image" filename="keyboard2" />
<resource name="keyboard3" type="image" filename="keyboard3" />
<resource name="keyboard4" type="image" filename="keyboard4" />
<resource name="cursor" type="image" filename="cursor" />
<resource name="cursor" type="image" filename="cursor" retainaspect="1" />
</resources>

<variables>
Expand Down
10 changes: 5 additions & 5 deletions gui/devices/1024x768/res/ui.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@
<resource name="progress" type="animation" filename="indeterminate" />
<resource name="progress_empty" type="image" filename="progress_empty" />
<resource name="progress_full" type="image" filename="progress_fill" />
<resource name="checkbox_false" type="image" filename="checkbox_empty" />
<resource name="checkbox_true" type="image" filename="checkbox_checked" />
<resource name="radio_false" type="image" filename="radio_empty" />
<resource name="radio_true" type="image" filename="radio_selected" />
<resource name="checkbox_false" type="image" filename="checkbox_empty" retainaspect="1" />
<resource name="checkbox_true" type="image" filename="checkbox_checked" retainaspect="1" />
<resource name="radio_false" type="image" filename="radio_empty" retainaspect="1" />
<resource name="radio_true" type="image" filename="radio_selected" retainaspect="1" />
<resource name="medium_button" type="image" filename="medium-button" />
<resource name="mediumwide_button" type="image" filename="mediumwide-button" />
<resource name="sort_button" type="image" filename="sort-button" />
Expand All @@ -42,7 +42,7 @@
<resource name="keyboard2" type="image" filename="keyboard2" />
<resource name="keyboard3" type="image" filename="keyboard3" />
<resource name="keyboard4" type="image" filename="keyboard4" />
<resource name="cursor" type="image" filename="cursor" />
<resource name="cursor" type="image" filename="cursor" retainaspect="1" />
</resources>

<variables>
Expand Down
10 changes: 5 additions & 5 deletions gui/devices/1080x1920/res/ui.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@
<resource name="progress" type="animation" filename="indeterminate" />
<resource name="progress_empty" type="image" filename="progress_empty" />
<resource name="progress_full" type="image" filename="progress_fill" />
<resource name="checkbox_false" type="image" filename="checkbox_empty" />
<resource name="checkbox_true" type="image" filename="checkbox_checked" />
<resource name="radio_false" type="image" filename="radio_empty" />
<resource name="radio_true" type="image" filename="radio_selected" />
<resource name="checkbox_false" type="image" filename="checkbox_empty" retainaspect="1" />
<resource name="checkbox_true" type="image" filename="checkbox_checked" retainaspect="1" />
<resource name="radio_false" type="image" filename="radio_empty" retainaspect="1" />
<resource name="radio_true" type="image" filename="radio_selected" retainaspect="1" />
<resource name="medium_button" type="image" filename="medium-button" />
<resource name="sort_button" type="image" filename="sort-button" />
<resource name="minus_button" type="image" filename="minus-button" />
Expand All @@ -43,7 +43,7 @@
<resource name="keyboard2" type="image" filename="keyboard2" />
<resource name="keyboard3" type="image" filename="keyboard3" />
<resource name="keyboard4" type="image" filename="keyboard4" />
<resource name="cursor" type="image" filename="cursor" />
<resource name="cursor" type="image" filename="cursor" retainaspect="1" />
</resources>

<variables>
Expand Down
10 changes: 5 additions & 5 deletions gui/devices/1200x1920/res/ui.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@
<resource name="progress" type="animation" filename="indeterminate" />
<resource name="progress_empty" type="image" filename="progress_empty" />
<resource name="progress_full" type="image" filename="progress_fill" />
<resource name="checkbox_false" type="image" filename="checkbox_empty" />
<resource name="checkbox_true" type="image" filename="checkbox_checked" />
<resource name="radio_false" type="image" filename="radio_empty" />
<resource name="radio_true" type="image" filename="radio_selected" />
<resource name="checkbox_false" type="image" filename="checkbox_empty" retainaspect="1" />
<resource name="checkbox_true" type="image" filename="checkbox_checked" retainaspect="1" />
<resource name="radio_false" type="image" filename="radio_empty" retainaspect="1" />
<resource name="radio_true" type="image" filename="radio_selected" retainaspect="1" />
<resource name="medium_button" type="image" filename="medium-button" />
<resource name="sort_button" type="image" filename="sort-button" />
<resource name="minus_button" type="image" filename="minus-button" />
Expand All @@ -43,7 +43,7 @@
<resource name="keyboard2" type="image" filename="keyboard2" />
<resource name="keyboard3" type="image" filename="keyboard3" />
<resource name="keyboard4" type="image" filename="keyboard4" />
<resource name="cursor" type="image" filename="cursor" />
<resource name="cursor" type="image" filename="cursor" retainaspect="1" />
</resources>

<variables>
Expand Down
10 changes: 5 additions & 5 deletions gui/devices/1280x800/res/ui.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@
<resource name="progress" type="animation" filename="indeterminate" />
<resource name="progress_empty" type="image" filename="progress_empty" />
<resource name="progress_full" type="image" filename="progress_fill" />
<resource name="checkbox_false" type="image" filename="checkbox_empty" />
<resource name="checkbox_true" type="image" filename="checkbox_checked" />
<resource name="radio_false" type="image" filename="radio_empty" />
<resource name="radio_true" type="image" filename="radio_selected" />
<resource name="checkbox_false" type="image" filename="checkbox_empty" retainaspect="1" />
<resource name="checkbox_true" type="image" filename="checkbox_checked" retainaspect="1" />
<resource name="radio_false" type="image" filename="radio_empty" retainaspect="1" />
<resource name="radio_true" type="image" filename="radio_selected" retainaspect="1" />
<resource name="medium_button" type="image" filename="medium-button" />
<resource name="mediumwide_button" type="image" filename="mediumwide-button" />
<resource name="sort_button" type="image" filename="sort-button" />
Expand All @@ -42,7 +42,7 @@
<resource name="keyboard2" type="image" filename="keyboard2" />
<resource name="keyboard3" type="image" filename="keyboard3" />
<resource name="keyboard4" type="image" filename="keyboard4" />
<resource name="cursor" type="image" filename="cursor" />
<resource name="cursor" type="image" filename="cursor" retainaspect="1" />
</resources>

<variables>
Expand Down
10 changes: 5 additions & 5 deletions gui/devices/1440x2560/res/ui.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@
<resource name="progress" type="animation" filename="indeterminate" />
<resource name="progress_empty" type="image" filename="progress_empty" />
<resource name="progress_full" type="image" filename="progress_fill" />
<resource name="checkbox_false" type="image" filename="checkbox_empty" />
<resource name="checkbox_true" type="image" filename="checkbox_checked" />
<resource name="radio_false" type="image" filename="radio_empty" />
<resource name="radio_true" type="image" filename="radio_selected" />
<resource name="checkbox_false" type="image" filename="checkbox_empty" retainaspect="1" />
<resource name="checkbox_true" type="image" filename="checkbox_checked" retainaspect="1" />
<resource name="radio_false" type="image" filename="radio_empty" retainaspect="1" />
<resource name="radio_true" type="image" filename="radio_selected" retainaspect="1" />
<resource name="medium_button" type="image" filename="medium-button" />
<resource name="sort_button" type="image" filename="sort-button" />
<resource name="minus_button" type="image" filename="minus-button" />
Expand All @@ -43,7 +43,7 @@
<resource name="keyboard2" type="image" filename="keyboard2" />
<resource name="keyboard3" type="image" filename="keyboard3" />
<resource name="keyboard4" type="image" filename="keyboard4" />
<resource name="cursor" type="image" filename="cursor" />
<resource name="cursor" type="image" filename="cursor" retainaspect="1" />
</resources>

<variables>
Expand Down
10 changes: 5 additions & 5 deletions gui/devices/1600x2560/res/ui.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@
<resource name="progress" type="animation" filename="indeterminate" />
<resource name="progress_empty" type="image" filename="progress_empty" />
<resource name="progress_full" type="image" filename="progress_fill" />
<resource name="checkbox_false" type="image" filename="checkbox_empty" />
<resource name="checkbox_true" type="image" filename="checkbox_checked" />
<resource name="radio_false" type="image" filename="radio_empty" />
<resource name="radio_true" type="image" filename="radio_selected" />
<resource name="checkbox_false" type="image" filename="checkbox_empty" retainaspect="1" />
<resource name="checkbox_true" type="image" filename="checkbox_checked" retainaspect="1" />
<resource name="radio_false" type="image" filename="radio_empty" retainaspect="1" />
<resource name="radio_true" type="image" filename="radio_selected" retainaspect="1" />
<resource name="medium_button" type="image" filename="medium-button" />
<resource name="sort_button" type="image" filename="sort-button" />
<resource name="minus_button" type="image" filename="minus-button" />
Expand All @@ -43,7 +43,7 @@
<resource name="keyboard2" type="image" filename="keyboard2" />
<resource name="keyboard3" type="image" filename="keyboard3" />
<resource name="keyboard4" type="image" filename="keyboard4" />
<resource name="cursor" type="image" filename="cursor" />
<resource name="cursor" type="image" filename="cursor" retainaspect="1" />
</resources>

<variables>
Expand Down
10 changes: 5 additions & 5 deletions gui/devices/1920x1200/res/ui.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@
<resource name="progress" type="animation" filename="indeterminate" />
<resource name="progress_empty" type="image" filename="progress_empty" />
<resource name="progress_full" type="image" filename="progress_fill" />
<resource name="checkbox_false" type="image" filename="checkbox_empty" />
<resource name="checkbox_true" type="image" filename="checkbox_checked" />
<resource name="radio_false" type="image" filename="radio_empty" />
<resource name="radio_true" type="image" filename="radio_selected" />
<resource name="checkbox_false" type="image" filename="checkbox_empty" retainaspect="1" />
<resource name="checkbox_true" type="image" filename="checkbox_checked" retainaspect="1" />
<resource name="radio_false" type="image" filename="radio_empty" retainaspect="1" />
<resource name="radio_true" type="image" filename="radio_selected" retainaspect="1" />
<resource name="medium_button" type="image" filename="medium-button" />
<resource name="mediumwide_button" type="image" filename="mediumwide-button" />
<resource name="sort_button" type="image" filename="sort-button" />
Expand All @@ -42,7 +42,7 @@
<resource name="keyboard2" type="image" filename="keyboard2" />
<resource name="keyboard3" type="image" filename="keyboard3" />
<resource name="keyboard4" type="image" filename="keyboard4" />
<resource name="cursor" type="image" filename="cursor" />
<resource name="cursor" type="image" filename="cursor" retainaspect="1" />
</resources>

<variables>
Expand Down
Binary file added gui/devices/240x240/res/images/cursor.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 6 additions & 4 deletions gui/devices/240x240/res/ui.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
<recovery>
<details>
<resolution width="240" height="240" />
<roundscreen offset_x="30" offset_y="30" />
<author>masteroftime</author>
<title>TWRP x201</title>
<description>tDPI Smartwatch Theme</description>
Expand All @@ -25,10 +26,10 @@
<resource name="progress" type="animation" filename="indeterminate" />
<resource name="progress_empty" type="image" filename="progress_empty" />
<resource name="progress_full" type="image" filename="progress_fill" />
<resource name="checkbox_false" type="image" filename="checkbox_empty" />
<resource name="checkbox_true" type="image" filename="checkbox_checked" />
<resource name="radio_false" type="image" filename="radio_empty" />
<resource name="radio_true" type="image" filename="radio_selected" />
<resource name="checkbox_false" type="image" filename="checkbox_empty" retainaspect="1" />
<resource name="checkbox_true" type="image" filename="checkbox_checked" retainaspect="1" />
<resource name="radio_false" type="image" filename="radio_empty" retainaspect="1" />
<resource name="radio_true" type="image" filename="radio_selected" retainaspect="1" />
<resource name="medium_button" type="image" filename="medium-button" />
<resource name="sort_button" type="image" filename="sort-button" />
<resource name="minus_button" type="image" filename="minus-button" />
Expand All @@ -43,6 +44,7 @@
<resource name="keyboard2" type="image" filename="keyboard2" />
<resource name="keyboard3" type="image" filename="keyboard3" />
<resource name="keyboard4" type="image" filename="keyboard4" />
<resource name="cursor" type="image" filename="cursor" retainaspect="1" />
</resources>

<variables>
Expand Down
10 changes: 5 additions & 5 deletions gui/devices/2560x1600/res/ui.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@
<resource name="progress" type="animation" filename="indeterminate" />
<resource name="progress_empty" type="image" filename="progress_empty" />
<resource name="progress_full" type="image" filename="progress_fill" />
<resource name="checkbox_false" type="image" filename="checkbox_empty" />
<resource name="checkbox_true" type="image" filename="checkbox_checked" />
<resource name="radio_false" type="image" filename="radio_empty" />
<resource name="radio_true" type="image" filename="radio_selected" />
<resource name="checkbox_false" type="image" filename="checkbox_empty" retainaspect="1" />
<resource name="checkbox_true" type="image" filename="checkbox_checked" retainaspect="1" />
<resource name="radio_false" type="image" filename="radio_empty" retainaspect="1" />
<resource name="radio_true" type="image" filename="radio_selected" retainaspect="1" />
<resource name="medium_button" type="image" filename="medium-button" />
<resource name="mediumwide_button" type="image" filename="mediumwide-button" />
<resource name="sort_button" type="image" filename="sort-button" />
Expand All @@ -42,7 +42,7 @@
<resource name="keyboard2" type="image" filename="keyboard2" />
<resource name="keyboard3" type="image" filename="keyboard3" />
<resource name="keyboard4" type="image" filename="keyboard4" />
<resource name="cursor" type="image" filename="cursor" />
<resource name="cursor" type="image" filename="cursor" retainaspect="1" />
</resources>

<variables>
Expand Down
Binary file added gui/devices/280x280/res/images/cursor.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 6 additions & 4 deletions gui/devices/280x280/res/ui.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
<recovery>
<details>
<resolution width="280" height="280" />
<roundscreen offset_x="35" offset_y="35" />
<author>TeamWin</author>
<title>Backup Naowz</title>
<description>Default basic theme</description>
Expand All @@ -25,10 +26,10 @@
<resource name="progress" type="animation" filename="indeterminate" />
<resource name="progress_empty" type="image" filename="progress_empty" />
<resource name="progress_full" type="image" filename="progress_fill" />
<resource name="checkbox_false" type="image" filename="checkbox_empty" />
<resource name="checkbox_true" type="image" filename="checkbox_checked" />
<resource name="radio_false" type="image" filename="radio_empty" />
<resource name="radio_true" type="image" filename="radio_selected" />
<resource name="checkbox_false" type="image" filename="checkbox_empty" retainaspect="1" />
<resource name="checkbox_true" type="image" filename="checkbox_checked" retainaspect="1" />
<resource name="radio_false" type="image" filename="radio_empty" retainaspect="1" />
<resource name="radio_true" type="image" filename="radio_selected" retainaspect="1" />
<resource name="medium_button" type="image" filename="medium-button" />
<resource name="sort_button" type="image" filename="sort-button" />
<resource name="minus_button" type="image" filename="minus-button" />
Expand All @@ -43,6 +44,7 @@
<resource name="keyboard2" type="image" filename="keyboard2" />
<resource name="keyboard3" type="image" filename="keyboard3" />
<resource name="keyboard4" type="image" filename="keyboard4" />
<resource name="cursor" type="image" filename="cursor" retainaspect="1" />
</resources>

<variables>
Expand Down
Binary file added gui/devices/320x320/res/images/cursor.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 6 additions & 4 deletions gui/devices/320x320/res/ui.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
<recovery>
<details>
<resolution width="320" height="320" />
<roundscreen offset_x="40" offset_y="40" />
<author>TeamWin</author>
<title>Backup Naowz</title>
<description>Default basic theme</description>
Expand All @@ -25,10 +26,10 @@
<resource name="progress" type="animation" filename="indeterminate" />
<resource name="progress_empty" type="image" filename="progress_empty" />
<resource name="progress_full" type="image" filename="progress_fill" />
<resource name="checkbox_false" type="image" filename="checkbox_empty" />
<resource name="checkbox_true" type="image" filename="checkbox_checked" />
<resource name="radio_false" type="image" filename="radio_empty" />
<resource name="radio_true" type="image" filename="radio_selected" />
<resource name="checkbox_false" type="image" filename="checkbox_empty" retainaspect="1" />
<resource name="checkbox_true" type="image" filename="checkbox_checked" retainaspect="1" />
<resource name="radio_false" type="image" filename="radio_empty" retainaspect="1" />
<resource name="radio_true" type="image" filename="radio_selected" retainaspect="1" />
<resource name="medium_button" type="image" filename="medium-button" />
<resource name="sort_button" type="image" filename="sort-button" />
<resource name="minus_button" type="image" filename="minus-button" />
Expand All @@ -43,6 +44,7 @@
<resource name="keyboard2" type="image" filename="keyboard2" />
<resource name="keyboard3" type="image" filename="keyboard3" />
<resource name="keyboard4" type="image" filename="keyboard4" />
<resource name="cursor" type="image" filename="cursor" retainaspect="1" />
</resources>

<variables>
Expand Down
Loading

0 comments on commit 63e414f

Please sign in to comment.