From 591b9205365e6bc1cefece2e0a05f29b9cddee32 Mon Sep 17 00:00:00 2001 From: Ethan Yonker Date: Wed, 11 Mar 2015 11:17:15 -0500 Subject: Reduce themes to 5 and rely on scaling This will significantly reduce theme maintainence and should be a lot more sustainable over time. Eliminate most themes leaving only 5 remaining in 3 categores: * watch_mdpi: 320x320 * portrait_mdpi: 480x800 * portrait_hdpi: 1080x1920 * landscape_mdpi: 800x480 * landscape_hdpi: 1920x1200 Add handling to map the old DEVICE RESOLUTION to the new TW_THEME build flag. New devices should specify a theme using the new TW_THEME build flag using one of the 5 values from the list above. Long term we will eliminate the use of the DEVICE_RESOLUTION flag in favor of the new flag. Change the way sliders render so that they completely follow the placement="5". This will probably break some custom themes but is necessary so that we can retain the aspect ratio on slider images and still have them rendered at the center of the screen. Add code to the console slideout button so that it can be centered. Centering the slideout button allows us to keep the button at the center of the screen when retaining aspect ratios on the image. Add more retain aspect ratios for home, back, slideout, folder, file, and lock screen images. Change the way we build the top bar in TWRP. It is now mostly drawn using fill objects and the TWRP logo is a separate image so that we can retain its aspect ratio during scaling. Thanks to Mark Norelus for providing the TWRP logo. Change-Id: I801a7b3163cad9ef353461f4c327690a9ccbb3aa --- .../540x960/res/fonts/Roboto-Regular-20.dat | Bin 3876 -> 0 bytes .../540x960/res/fonts/Roboto-Regular-25.dat | Bin 6262 -> 0 bytes .../540x960/res/fonts/Roboto-Regular-40.dat | Bin 15345 -> 0 bytes gui/devices/540x960/res/images/.BridgeSort | 29 -- gui/devices/540x960/res/images/back-icon.png | Bin 584 -> 0 bytes .../540x960/res/images/checkbox_checked.png | Bin 446 -> 0 bytes gui/devices/540x960/res/images/checkbox_empty.png | Bin 216 -> 0 bytes gui/devices/540x960/res/images/cursor.png | Bin 1452 -> 0 bytes gui/devices/540x960/res/images/curtain.jpg | Bin 41166 -> 0 bytes gui/devices/540x960/res/images/file.png | Bin 287 -> 0 bytes gui/devices/540x960/res/images/folder.png | Bin 322 -> 0 bytes gui/devices/540x960/res/images/home-icon.png | Bin 480 -> 0 bytes .../540x960/res/images/indeterminate001.png | Bin 1742 -> 0 bytes .../540x960/res/images/indeterminate002.png | Bin 1744 -> 0 bytes .../540x960/res/images/indeterminate003.png | Bin 1748 -> 0 bytes .../540x960/res/images/indeterminate004.png | Bin 1748 -> 0 bytes .../540x960/res/images/indeterminate005.png | Bin 1740 -> 0 bytes .../540x960/res/images/indeterminate006.png | Bin 1740 -> 0 bytes gui/devices/540x960/res/images/keyboard1.png | Bin 22042 -> 0 bytes gui/devices/540x960/res/images/keyboard2.png | Bin 23053 -> 0 bytes gui/devices/540x960/res/images/keyboard3.png | Bin 22122 -> 0 bytes gui/devices/540x960/res/images/keyboard4.png | Bin 21111 -> 0 bytes gui/devices/540x960/res/images/progress_empty.png | Bin 1004 -> 0 bytes gui/devices/540x960/res/images/progress_fill.png | Bin 238 -> 0 bytes .../540x960/res/images/qhd-medium-button.png | Bin 848 -> 0 bytes gui/devices/540x960/res/images/qhd-menu-button.png | Bin 1493 -> 0 bytes .../540x960/res/images/qhd-minus-button.png | Bin 253 -> 0 bytes gui/devices/540x960/res/images/qhd-plus-button.png | Bin 325 -> 0 bytes .../540x960/res/images/qhd-small-button.png | Bin 238 -> 0 bytes gui/devices/540x960/res/images/qhd-sort-button.png | Bin 427 -> 0 bytes gui/devices/540x960/res/images/radio_empty.png | Bin 983 -> 0 bytes gui/devices/540x960/res/images/radio_selected.png | Bin 1175 -> 0 bytes gui/devices/540x960/res/images/slideout.png | Bin 649 -> 0 bytes gui/devices/540x960/res/images/slider-touch.png | Bin 6365 -> 0 bytes gui/devices/540x960/res/images/slider-used.png | Bin 2067 -> 0 bytes gui/devices/540x960/res/images/slider.png | Bin 3730 -> 0 bytes gui/devices/540x960/res/images/top-bar.jpg | Bin 3312 -> 0 bytes gui/devices/540x960/res/images/unlock.png | Bin 22631 -> 0 bytes gui/devices/540x960/res/ui.xml | 414 --------------------- 39 files changed, 443 deletions(-) delete mode 100644 gui/devices/540x960/res/fonts/Roboto-Regular-20.dat delete mode 100644 gui/devices/540x960/res/fonts/Roboto-Regular-25.dat delete mode 100644 gui/devices/540x960/res/fonts/Roboto-Regular-40.dat delete mode 100644 gui/devices/540x960/res/images/.BridgeSort delete mode 100644 gui/devices/540x960/res/images/back-icon.png delete mode 100644 gui/devices/540x960/res/images/checkbox_checked.png delete mode 100644 gui/devices/540x960/res/images/checkbox_empty.png delete mode 100644 gui/devices/540x960/res/images/cursor.png delete mode 100644 gui/devices/540x960/res/images/curtain.jpg delete mode 100644 gui/devices/540x960/res/images/file.png delete mode 100644 gui/devices/540x960/res/images/folder.png delete mode 100644 gui/devices/540x960/res/images/home-icon.png delete mode 100644 gui/devices/540x960/res/images/indeterminate001.png delete mode 100644 gui/devices/540x960/res/images/indeterminate002.png delete mode 100644 gui/devices/540x960/res/images/indeterminate003.png delete mode 100644 gui/devices/540x960/res/images/indeterminate004.png delete mode 100644 gui/devices/540x960/res/images/indeterminate005.png delete mode 100644 gui/devices/540x960/res/images/indeterminate006.png delete mode 100644 gui/devices/540x960/res/images/keyboard1.png delete mode 100644 gui/devices/540x960/res/images/keyboard2.png delete mode 100644 gui/devices/540x960/res/images/keyboard3.png delete mode 100644 gui/devices/540x960/res/images/keyboard4.png delete mode 100644 gui/devices/540x960/res/images/progress_empty.png delete mode 100644 gui/devices/540x960/res/images/progress_fill.png delete mode 100644 gui/devices/540x960/res/images/qhd-medium-button.png delete mode 100644 gui/devices/540x960/res/images/qhd-menu-button.png delete mode 100644 gui/devices/540x960/res/images/qhd-minus-button.png delete mode 100644 gui/devices/540x960/res/images/qhd-plus-button.png delete mode 100644 gui/devices/540x960/res/images/qhd-small-button.png delete mode 100644 gui/devices/540x960/res/images/qhd-sort-button.png delete mode 100644 gui/devices/540x960/res/images/radio_empty.png delete mode 100644 gui/devices/540x960/res/images/radio_selected.png delete mode 100644 gui/devices/540x960/res/images/slideout.png delete mode 100644 gui/devices/540x960/res/images/slider-touch.png delete mode 100644 gui/devices/540x960/res/images/slider-used.png delete mode 100644 gui/devices/540x960/res/images/slider.png delete mode 100644 gui/devices/540x960/res/images/top-bar.jpg delete mode 100644 gui/devices/540x960/res/images/unlock.png delete mode 100644 gui/devices/540x960/res/ui.xml (limited to 'gui/devices/540x960/res') diff --git a/gui/devices/540x960/res/fonts/Roboto-Regular-20.dat b/gui/devices/540x960/res/fonts/Roboto-Regular-20.dat deleted file mode 100644 index 6588b41e7..000000000 Binary files a/gui/devices/540x960/res/fonts/Roboto-Regular-20.dat and /dev/null differ diff --git a/gui/devices/540x960/res/fonts/Roboto-Regular-25.dat b/gui/devices/540x960/res/fonts/Roboto-Regular-25.dat deleted file mode 100644 index 392cce97d..000000000 Binary files a/gui/devices/540x960/res/fonts/Roboto-Regular-25.dat and /dev/null differ diff --git a/gui/devices/540x960/res/fonts/Roboto-Regular-40.dat b/gui/devices/540x960/res/fonts/Roboto-Regular-40.dat deleted file mode 100644 index 637d9fe5b..000000000 Binary files a/gui/devices/540x960/res/fonts/Roboto-Regular-40.dat and /dev/null differ diff --git a/gui/devices/540x960/res/images/.BridgeSort b/gui/devices/540x960/res/images/.BridgeSort deleted file mode 100644 index b475f87dc..000000000 --- a/gui/devices/540x960/res/images/.BridgeSort +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/gui/devices/540x960/res/images/back-icon.png b/gui/devices/540x960/res/images/back-icon.png deleted file mode 100644 index f5ba872de..000000000 Binary files a/gui/devices/540x960/res/images/back-icon.png and /dev/null differ diff --git a/gui/devices/540x960/res/images/checkbox_checked.png b/gui/devices/540x960/res/images/checkbox_checked.png deleted file mode 100644 index 3447349cf..000000000 Binary files a/gui/devices/540x960/res/images/checkbox_checked.png and /dev/null differ diff --git a/gui/devices/540x960/res/images/checkbox_empty.png b/gui/devices/540x960/res/images/checkbox_empty.png deleted file mode 100644 index f5f35d8d1..000000000 Binary files a/gui/devices/540x960/res/images/checkbox_empty.png and /dev/null differ diff --git a/gui/devices/540x960/res/images/cursor.png b/gui/devices/540x960/res/images/cursor.png deleted file mode 100644 index 32c8ae1ca..000000000 Binary files a/gui/devices/540x960/res/images/cursor.png and /dev/null differ diff --git a/gui/devices/540x960/res/images/curtain.jpg b/gui/devices/540x960/res/images/curtain.jpg deleted file mode 100644 index f1a6316bb..000000000 Binary files a/gui/devices/540x960/res/images/curtain.jpg and /dev/null differ diff --git a/gui/devices/540x960/res/images/file.png b/gui/devices/540x960/res/images/file.png deleted file mode 100644 index 8556bc7fa..000000000 Binary files a/gui/devices/540x960/res/images/file.png and /dev/null differ diff --git a/gui/devices/540x960/res/images/folder.png b/gui/devices/540x960/res/images/folder.png deleted file mode 100644 index a3a5f69df..000000000 Binary files a/gui/devices/540x960/res/images/folder.png and /dev/null differ diff --git a/gui/devices/540x960/res/images/home-icon.png b/gui/devices/540x960/res/images/home-icon.png deleted file mode 100644 index 46ccf6acc..000000000 Binary files a/gui/devices/540x960/res/images/home-icon.png and /dev/null differ diff --git a/gui/devices/540x960/res/images/indeterminate001.png b/gui/devices/540x960/res/images/indeterminate001.png deleted file mode 100644 index e6fa1c574..000000000 Binary files a/gui/devices/540x960/res/images/indeterminate001.png and /dev/null differ diff --git a/gui/devices/540x960/res/images/indeterminate002.png b/gui/devices/540x960/res/images/indeterminate002.png deleted file mode 100644 index e1fceaba1..000000000 Binary files a/gui/devices/540x960/res/images/indeterminate002.png and /dev/null differ diff --git a/gui/devices/540x960/res/images/indeterminate003.png b/gui/devices/540x960/res/images/indeterminate003.png deleted file mode 100644 index 670286743..000000000 Binary files a/gui/devices/540x960/res/images/indeterminate003.png and /dev/null differ diff --git a/gui/devices/540x960/res/images/indeterminate004.png b/gui/devices/540x960/res/images/indeterminate004.png deleted file mode 100644 index ff65e0930..000000000 Binary files a/gui/devices/540x960/res/images/indeterminate004.png and /dev/null differ diff --git a/gui/devices/540x960/res/images/indeterminate005.png b/gui/devices/540x960/res/images/indeterminate005.png deleted file mode 100644 index e61e2cc15..000000000 Binary files a/gui/devices/540x960/res/images/indeterminate005.png and /dev/null differ diff --git a/gui/devices/540x960/res/images/indeterminate006.png b/gui/devices/540x960/res/images/indeterminate006.png deleted file mode 100644 index c9c21ba9c..000000000 Binary files a/gui/devices/540x960/res/images/indeterminate006.png and /dev/null differ diff --git a/gui/devices/540x960/res/images/keyboard1.png b/gui/devices/540x960/res/images/keyboard1.png deleted file mode 100644 index 9fecdcd94..000000000 Binary files a/gui/devices/540x960/res/images/keyboard1.png and /dev/null differ diff --git a/gui/devices/540x960/res/images/keyboard2.png b/gui/devices/540x960/res/images/keyboard2.png deleted file mode 100644 index 0d1e966de..000000000 Binary files a/gui/devices/540x960/res/images/keyboard2.png and /dev/null differ diff --git a/gui/devices/540x960/res/images/keyboard3.png b/gui/devices/540x960/res/images/keyboard3.png deleted file mode 100644 index b9eab174f..000000000 Binary files a/gui/devices/540x960/res/images/keyboard3.png and /dev/null differ diff --git a/gui/devices/540x960/res/images/keyboard4.png b/gui/devices/540x960/res/images/keyboard4.png deleted file mode 100644 index 909956bdd..000000000 Binary files a/gui/devices/540x960/res/images/keyboard4.png and /dev/null differ diff --git a/gui/devices/540x960/res/images/progress_empty.png b/gui/devices/540x960/res/images/progress_empty.png deleted file mode 100644 index b85371014..000000000 Binary files a/gui/devices/540x960/res/images/progress_empty.png and /dev/null differ diff --git a/gui/devices/540x960/res/images/progress_fill.png b/gui/devices/540x960/res/images/progress_fill.png deleted file mode 100644 index 669c6efa9..000000000 Binary files a/gui/devices/540x960/res/images/progress_fill.png and /dev/null differ diff --git a/gui/devices/540x960/res/images/qhd-medium-button.png b/gui/devices/540x960/res/images/qhd-medium-button.png deleted file mode 100644 index b91e7fc60..000000000 Binary files a/gui/devices/540x960/res/images/qhd-medium-button.png and /dev/null differ diff --git a/gui/devices/540x960/res/images/qhd-menu-button.png b/gui/devices/540x960/res/images/qhd-menu-button.png deleted file mode 100644 index ec2b1fd3a..000000000 Binary files a/gui/devices/540x960/res/images/qhd-menu-button.png and /dev/null differ diff --git a/gui/devices/540x960/res/images/qhd-minus-button.png b/gui/devices/540x960/res/images/qhd-minus-button.png deleted file mode 100644 index 0cbc5ce7a..000000000 Binary files a/gui/devices/540x960/res/images/qhd-minus-button.png and /dev/null differ diff --git a/gui/devices/540x960/res/images/qhd-plus-button.png b/gui/devices/540x960/res/images/qhd-plus-button.png deleted file mode 100644 index 89c8048ea..000000000 Binary files a/gui/devices/540x960/res/images/qhd-plus-button.png and /dev/null differ diff --git a/gui/devices/540x960/res/images/qhd-small-button.png b/gui/devices/540x960/res/images/qhd-small-button.png deleted file mode 100644 index 255d09d7c..000000000 Binary files a/gui/devices/540x960/res/images/qhd-small-button.png and /dev/null differ diff --git a/gui/devices/540x960/res/images/qhd-sort-button.png b/gui/devices/540x960/res/images/qhd-sort-button.png deleted file mode 100644 index e06618e19..000000000 Binary files a/gui/devices/540x960/res/images/qhd-sort-button.png and /dev/null differ diff --git a/gui/devices/540x960/res/images/radio_empty.png b/gui/devices/540x960/res/images/radio_empty.png deleted file mode 100644 index 88d1c1f5e..000000000 Binary files a/gui/devices/540x960/res/images/radio_empty.png and /dev/null differ diff --git a/gui/devices/540x960/res/images/radio_selected.png b/gui/devices/540x960/res/images/radio_selected.png deleted file mode 100644 index 864065dea..000000000 Binary files a/gui/devices/540x960/res/images/radio_selected.png and /dev/null differ diff --git a/gui/devices/540x960/res/images/slideout.png b/gui/devices/540x960/res/images/slideout.png deleted file mode 100644 index 963b9fdba..000000000 Binary files a/gui/devices/540x960/res/images/slideout.png and /dev/null differ diff --git a/gui/devices/540x960/res/images/slider-touch.png b/gui/devices/540x960/res/images/slider-touch.png deleted file mode 100644 index d8647b8a6..000000000 Binary files a/gui/devices/540x960/res/images/slider-touch.png and /dev/null differ diff --git a/gui/devices/540x960/res/images/slider-used.png b/gui/devices/540x960/res/images/slider-used.png deleted file mode 100644 index bf6cad924..000000000 Binary files a/gui/devices/540x960/res/images/slider-used.png and /dev/null differ diff --git a/gui/devices/540x960/res/images/slider.png b/gui/devices/540x960/res/images/slider.png deleted file mode 100644 index 4081ea540..000000000 Binary files a/gui/devices/540x960/res/images/slider.png and /dev/null differ diff --git a/gui/devices/540x960/res/images/top-bar.jpg b/gui/devices/540x960/res/images/top-bar.jpg deleted file mode 100644 index fbe72302d..000000000 Binary files a/gui/devices/540x960/res/images/top-bar.jpg and /dev/null differ diff --git a/gui/devices/540x960/res/images/unlock.png b/gui/devices/540x960/res/images/unlock.png deleted file mode 100644 index 904122120..000000000 Binary files a/gui/devices/540x960/res/images/unlock.png and /dev/null differ diff --git a/gui/devices/540x960/res/ui.xml b/gui/devices/540x960/res/ui.xml deleted file mode 100644 index 66f4cbeee..000000000 --- a/gui/devices/540x960/res/ui.xml +++ /dev/null @@ -1,414 +0,0 @@ - - - -
- - TeamWin - Backup Naowz - Default basic theme - preview.jpg -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-- cgit v1.2.3