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 --- gui/devices/320x480/res/images/android.png | Bin 1120 -> 0 bytes gui/devices/320x480/res/images/back-icon.png | Bin 558 -> 0 bytes gui/devices/320x480/res/images/checkbox_checked.png | Bin 524 -> 0 bytes gui/devices/320x480/res/images/checkbox_empty.png | Bin 207 -> 0 bytes gui/devices/320x480/res/images/cursor.png | Bin 1452 -> 0 bytes gui/devices/320x480/res/images/curtain.jpg | Bin 16490 -> 0 bytes gui/devices/320x480/res/images/file.png | Bin 287 -> 0 bytes gui/devices/320x480/res/images/folder.png | Bin 322 -> 0 bytes gui/devices/320x480/res/images/hdpi-medium-button.png | Bin 904 -> 0 bytes gui/devices/320x480/res/images/hdpi-menu-button.png | Bin 2051 -> 0 bytes gui/devices/320x480/res/images/hdpi-minus-button.png | Bin 552 -> 0 bytes gui/devices/320x480/res/images/hdpi-plus-button.png | Bin 603 -> 0 bytes gui/devices/320x480/res/images/hdpi-small-button.png | Bin 521 -> 0 bytes gui/devices/320x480/res/images/hdpi-sort-button.png | Bin 578 -> 0 bytes gui/devices/320x480/res/images/home-icon.png | Bin 549 -> 0 bytes gui/devices/320x480/res/images/indeterminate001.png | Bin 1742 -> 0 bytes gui/devices/320x480/res/images/indeterminate002.png | Bin 1744 -> 0 bytes gui/devices/320x480/res/images/indeterminate003.png | Bin 1748 -> 0 bytes gui/devices/320x480/res/images/indeterminate004.png | Bin 1748 -> 0 bytes gui/devices/320x480/res/images/indeterminate005.png | Bin 1740 -> 0 bytes gui/devices/320x480/res/images/indeterminate006.png | Bin 1740 -> 0 bytes gui/devices/320x480/res/images/keyboard1.png | Bin 18053 -> 0 bytes gui/devices/320x480/res/images/keyboard2.png | Bin 18719 -> 0 bytes gui/devices/320x480/res/images/keyboard3.png | Bin 17189 -> 0 bytes gui/devices/320x480/res/images/keyboard4.png | Bin 16166 -> 0 bytes gui/devices/320x480/res/images/medium-button.png | Bin 712 -> 0 bytes gui/devices/320x480/res/images/menu-button.png | Bin 1263 -> 0 bytes gui/devices/320x480/res/images/minus-button.png | Bin 257 -> 0 bytes gui/devices/320x480/res/images/plus-button.png | Bin 374 -> 0 bytes gui/devices/320x480/res/images/progress_empty.png | Bin 1004 -> 0 bytes gui/devices/320x480/res/images/progress_fill.png | Bin 238 -> 0 bytes gui/devices/320x480/res/images/radio_empty.png | Bin 810 -> 0 bytes gui/devices/320x480/res/images/radio_selected.png | Bin 992 -> 0 bytes gui/devices/320x480/res/images/slideout.png | Bin 684 -> 0 bytes gui/devices/320x480/res/images/slider-touch.png | Bin 3781 -> 0 bytes gui/devices/320x480/res/images/slider-used.png | Bin 1728 -> 0 bytes gui/devices/320x480/res/images/slider.png | Bin 2611 -> 0 bytes gui/devices/320x480/res/images/sort-button.png | Bin 368 -> 0 bytes gui/devices/320x480/res/images/top-bar.jpg | Bin 2472 -> 0 bytes gui/devices/320x480/res/images/top-bar.png | Bin 7738 -> 0 bytes gui/devices/320x480/res/images/unlock.png | Bin 20080 -> 0 bytes 41 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 gui/devices/320x480/res/images/android.png delete mode 100644 gui/devices/320x480/res/images/back-icon.png delete mode 100644 gui/devices/320x480/res/images/checkbox_checked.png delete mode 100644 gui/devices/320x480/res/images/checkbox_empty.png delete mode 100644 gui/devices/320x480/res/images/cursor.png delete mode 100644 gui/devices/320x480/res/images/curtain.jpg delete mode 100644 gui/devices/320x480/res/images/file.png delete mode 100644 gui/devices/320x480/res/images/folder.png delete mode 100644 gui/devices/320x480/res/images/hdpi-medium-button.png delete mode 100644 gui/devices/320x480/res/images/hdpi-menu-button.png delete mode 100644 gui/devices/320x480/res/images/hdpi-minus-button.png delete mode 100644 gui/devices/320x480/res/images/hdpi-plus-button.png delete mode 100644 gui/devices/320x480/res/images/hdpi-small-button.png delete mode 100644 gui/devices/320x480/res/images/hdpi-sort-button.png delete mode 100644 gui/devices/320x480/res/images/home-icon.png delete mode 100644 gui/devices/320x480/res/images/indeterminate001.png delete mode 100644 gui/devices/320x480/res/images/indeterminate002.png delete mode 100644 gui/devices/320x480/res/images/indeterminate003.png delete mode 100644 gui/devices/320x480/res/images/indeterminate004.png delete mode 100644 gui/devices/320x480/res/images/indeterminate005.png delete mode 100644 gui/devices/320x480/res/images/indeterminate006.png delete mode 100644 gui/devices/320x480/res/images/keyboard1.png delete mode 100644 gui/devices/320x480/res/images/keyboard2.png delete mode 100644 gui/devices/320x480/res/images/keyboard3.png delete mode 100644 gui/devices/320x480/res/images/keyboard4.png delete mode 100644 gui/devices/320x480/res/images/medium-button.png delete mode 100644 gui/devices/320x480/res/images/menu-button.png delete mode 100644 gui/devices/320x480/res/images/minus-button.png delete mode 100644 gui/devices/320x480/res/images/plus-button.png delete mode 100644 gui/devices/320x480/res/images/progress_empty.png delete mode 100644 gui/devices/320x480/res/images/progress_fill.png delete mode 100644 gui/devices/320x480/res/images/radio_empty.png delete mode 100644 gui/devices/320x480/res/images/radio_selected.png delete mode 100644 gui/devices/320x480/res/images/slideout.png delete mode 100644 gui/devices/320x480/res/images/slider-touch.png delete mode 100644 gui/devices/320x480/res/images/slider-used.png delete mode 100644 gui/devices/320x480/res/images/slider.png delete mode 100644 gui/devices/320x480/res/images/sort-button.png delete mode 100644 gui/devices/320x480/res/images/top-bar.jpg delete mode 100644 gui/devices/320x480/res/images/top-bar.png delete mode 100644 gui/devices/320x480/res/images/unlock.png (limited to 'gui/devices/320x480/res/images') diff --git a/gui/devices/320x480/res/images/android.png b/gui/devices/320x480/res/images/android.png deleted file mode 100644 index 0ccd02cd0..000000000 Binary files a/gui/devices/320x480/res/images/android.png and /dev/null differ diff --git a/gui/devices/320x480/res/images/back-icon.png b/gui/devices/320x480/res/images/back-icon.png deleted file mode 100644 index 26778d941..000000000 Binary files a/gui/devices/320x480/res/images/back-icon.png and /dev/null differ diff --git a/gui/devices/320x480/res/images/checkbox_checked.png b/gui/devices/320x480/res/images/checkbox_checked.png deleted file mode 100644 index 620fee88d..000000000 Binary files a/gui/devices/320x480/res/images/checkbox_checked.png and /dev/null differ diff --git a/gui/devices/320x480/res/images/checkbox_empty.png b/gui/devices/320x480/res/images/checkbox_empty.png deleted file mode 100644 index fa86e0dce..000000000 Binary files a/gui/devices/320x480/res/images/checkbox_empty.png and /dev/null differ diff --git a/gui/devices/320x480/res/images/cursor.png b/gui/devices/320x480/res/images/cursor.png deleted file mode 100644 index 32c8ae1ca..000000000 Binary files a/gui/devices/320x480/res/images/cursor.png and /dev/null differ diff --git a/gui/devices/320x480/res/images/curtain.jpg b/gui/devices/320x480/res/images/curtain.jpg deleted file mode 100644 index 63c961998..000000000 Binary files a/gui/devices/320x480/res/images/curtain.jpg and /dev/null differ diff --git a/gui/devices/320x480/res/images/file.png b/gui/devices/320x480/res/images/file.png deleted file mode 100644 index 8556bc7fa..000000000 Binary files a/gui/devices/320x480/res/images/file.png and /dev/null differ diff --git a/gui/devices/320x480/res/images/folder.png b/gui/devices/320x480/res/images/folder.png deleted file mode 100644 index a3a5f69df..000000000 Binary files a/gui/devices/320x480/res/images/folder.png and /dev/null differ diff --git a/gui/devices/320x480/res/images/hdpi-medium-button.png b/gui/devices/320x480/res/images/hdpi-medium-button.png deleted file mode 100644 index cb223b1c9..000000000 Binary files a/gui/devices/320x480/res/images/hdpi-medium-button.png and /dev/null differ diff --git a/gui/devices/320x480/res/images/hdpi-menu-button.png b/gui/devices/320x480/res/images/hdpi-menu-button.png deleted file mode 100644 index 1fa62cf1d..000000000 Binary files a/gui/devices/320x480/res/images/hdpi-menu-button.png and /dev/null differ diff --git a/gui/devices/320x480/res/images/hdpi-minus-button.png b/gui/devices/320x480/res/images/hdpi-minus-button.png deleted file mode 100644 index 025b379fa..000000000 Binary files a/gui/devices/320x480/res/images/hdpi-minus-button.png and /dev/null differ diff --git a/gui/devices/320x480/res/images/hdpi-plus-button.png b/gui/devices/320x480/res/images/hdpi-plus-button.png deleted file mode 100644 index f567e1d6e..000000000 Binary files a/gui/devices/320x480/res/images/hdpi-plus-button.png and /dev/null differ diff --git a/gui/devices/320x480/res/images/hdpi-small-button.png b/gui/devices/320x480/res/images/hdpi-small-button.png deleted file mode 100644 index 369409811..000000000 Binary files a/gui/devices/320x480/res/images/hdpi-small-button.png and /dev/null differ diff --git a/gui/devices/320x480/res/images/hdpi-sort-button.png b/gui/devices/320x480/res/images/hdpi-sort-button.png deleted file mode 100644 index 3662f2385..000000000 Binary files a/gui/devices/320x480/res/images/hdpi-sort-button.png and /dev/null differ diff --git a/gui/devices/320x480/res/images/home-icon.png b/gui/devices/320x480/res/images/home-icon.png deleted file mode 100644 index 690bfafc5..000000000 Binary files a/gui/devices/320x480/res/images/home-icon.png and /dev/null differ diff --git a/gui/devices/320x480/res/images/indeterminate001.png b/gui/devices/320x480/res/images/indeterminate001.png deleted file mode 100644 index e6fa1c574..000000000 Binary files a/gui/devices/320x480/res/images/indeterminate001.png and /dev/null differ diff --git a/gui/devices/320x480/res/images/indeterminate002.png b/gui/devices/320x480/res/images/indeterminate002.png deleted file mode 100644 index e1fceaba1..000000000 Binary files a/gui/devices/320x480/res/images/indeterminate002.png and /dev/null differ diff --git a/gui/devices/320x480/res/images/indeterminate003.png b/gui/devices/320x480/res/images/indeterminate003.png deleted file mode 100644 index 670286743..000000000 Binary files a/gui/devices/320x480/res/images/indeterminate003.png and /dev/null differ diff --git a/gui/devices/320x480/res/images/indeterminate004.png b/gui/devices/320x480/res/images/indeterminate004.png deleted file mode 100644 index ff65e0930..000000000 Binary files a/gui/devices/320x480/res/images/indeterminate004.png and /dev/null differ diff --git a/gui/devices/320x480/res/images/indeterminate005.png b/gui/devices/320x480/res/images/indeterminate005.png deleted file mode 100644 index e61e2cc15..000000000 Binary files a/gui/devices/320x480/res/images/indeterminate005.png and /dev/null differ diff --git a/gui/devices/320x480/res/images/indeterminate006.png b/gui/devices/320x480/res/images/indeterminate006.png deleted file mode 100644 index c9c21ba9c..000000000 Binary files a/gui/devices/320x480/res/images/indeterminate006.png and /dev/null differ diff --git a/gui/devices/320x480/res/images/keyboard1.png b/gui/devices/320x480/res/images/keyboard1.png deleted file mode 100644 index 914304c93..000000000 Binary files a/gui/devices/320x480/res/images/keyboard1.png and /dev/null differ diff --git a/gui/devices/320x480/res/images/keyboard2.png b/gui/devices/320x480/res/images/keyboard2.png deleted file mode 100644 index 4761f3a87..000000000 Binary files a/gui/devices/320x480/res/images/keyboard2.png and /dev/null differ diff --git a/gui/devices/320x480/res/images/keyboard3.png b/gui/devices/320x480/res/images/keyboard3.png deleted file mode 100644 index 23103dc2c..000000000 Binary files a/gui/devices/320x480/res/images/keyboard3.png and /dev/null differ diff --git a/gui/devices/320x480/res/images/keyboard4.png b/gui/devices/320x480/res/images/keyboard4.png deleted file mode 100644 index 58c7289df..000000000 Binary files a/gui/devices/320x480/res/images/keyboard4.png and /dev/null differ diff --git a/gui/devices/320x480/res/images/medium-button.png b/gui/devices/320x480/res/images/medium-button.png deleted file mode 100644 index eee6ccedc..000000000 Binary files a/gui/devices/320x480/res/images/medium-button.png and /dev/null differ diff --git a/gui/devices/320x480/res/images/menu-button.png b/gui/devices/320x480/res/images/menu-button.png deleted file mode 100644 index 731453b40..000000000 Binary files a/gui/devices/320x480/res/images/menu-button.png and /dev/null differ diff --git a/gui/devices/320x480/res/images/minus-button.png b/gui/devices/320x480/res/images/minus-button.png deleted file mode 100644 index 21cd77444..000000000 Binary files a/gui/devices/320x480/res/images/minus-button.png and /dev/null differ diff --git a/gui/devices/320x480/res/images/plus-button.png b/gui/devices/320x480/res/images/plus-button.png deleted file mode 100644 index ce9ec4eba..000000000 Binary files a/gui/devices/320x480/res/images/plus-button.png and /dev/null differ diff --git a/gui/devices/320x480/res/images/progress_empty.png b/gui/devices/320x480/res/images/progress_empty.png deleted file mode 100644 index b85371014..000000000 Binary files a/gui/devices/320x480/res/images/progress_empty.png and /dev/null differ diff --git a/gui/devices/320x480/res/images/progress_fill.png b/gui/devices/320x480/res/images/progress_fill.png deleted file mode 100644 index 669c6efa9..000000000 Binary files a/gui/devices/320x480/res/images/progress_fill.png and /dev/null differ diff --git a/gui/devices/320x480/res/images/radio_empty.png b/gui/devices/320x480/res/images/radio_empty.png deleted file mode 100644 index d993c4a60..000000000 Binary files a/gui/devices/320x480/res/images/radio_empty.png and /dev/null differ diff --git a/gui/devices/320x480/res/images/radio_selected.png b/gui/devices/320x480/res/images/radio_selected.png deleted file mode 100644 index c89aac3d5..000000000 Binary files a/gui/devices/320x480/res/images/radio_selected.png and /dev/null differ diff --git a/gui/devices/320x480/res/images/slideout.png b/gui/devices/320x480/res/images/slideout.png deleted file mode 100644 index 8974fef79..000000000 Binary files a/gui/devices/320x480/res/images/slideout.png and /dev/null differ diff --git a/gui/devices/320x480/res/images/slider-touch.png b/gui/devices/320x480/res/images/slider-touch.png deleted file mode 100644 index 77cb80975..000000000 Binary files a/gui/devices/320x480/res/images/slider-touch.png and /dev/null differ diff --git a/gui/devices/320x480/res/images/slider-used.png b/gui/devices/320x480/res/images/slider-used.png deleted file mode 100644 index 85c2f4368..000000000 Binary files a/gui/devices/320x480/res/images/slider-used.png and /dev/null differ diff --git a/gui/devices/320x480/res/images/slider.png b/gui/devices/320x480/res/images/slider.png deleted file mode 100644 index 2d09187f4..000000000 Binary files a/gui/devices/320x480/res/images/slider.png and /dev/null differ diff --git a/gui/devices/320x480/res/images/sort-button.png b/gui/devices/320x480/res/images/sort-button.png deleted file mode 100644 index 579c75f34..000000000 Binary files a/gui/devices/320x480/res/images/sort-button.png and /dev/null differ diff --git a/gui/devices/320x480/res/images/top-bar.jpg b/gui/devices/320x480/res/images/top-bar.jpg deleted file mode 100644 index 84f7f1e65..000000000 Binary files a/gui/devices/320x480/res/images/top-bar.jpg and /dev/null differ diff --git a/gui/devices/320x480/res/images/top-bar.png b/gui/devices/320x480/res/images/top-bar.png deleted file mode 100644 index 887f62973..000000000 Binary files a/gui/devices/320x480/res/images/top-bar.png and /dev/null differ diff --git a/gui/devices/320x480/res/images/unlock.png b/gui/devices/320x480/res/images/unlock.png deleted file mode 100644 index 09e9efdb3..000000000 Binary files a/gui/devices/320x480/res/images/unlock.png and /dev/null differ -- cgit v1.2.3