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 --- .../2560x1600/res/fonts/Roboto-Regular-40.dat | Bin 15345 -> 0 bytes gui/devices/2560x1600/res/images/back-icon.png | Bin 2786 -> 0 bytes gui/devices/2560x1600/res/images/background.jpg | Bin 15891 -> 0 bytes gui/devices/2560x1600/res/images/button.png | Bin 6337 -> 0 bytes .../2560x1600/res/images/checkbox_checked.png | Bin 2466 -> 0 bytes .../2560x1600/res/images/checkbox_empty.png | Bin 641 -> 0 bytes gui/devices/2560x1600/res/images/console-icon.png | Bin 3600 -> 0 bytes .../2560x1600/res/images/console-toggle.png | Bin 3249 -> 0 bytes gui/devices/2560x1600/res/images/cursor.png | Bin 1452 -> 0 bytes gui/devices/2560x1600/res/images/curtain.jpg | Bin 165524 -> 0 bytes gui/devices/2560x1600/res/images/file.png | Bin 1502 -> 0 bytes gui/devices/2560x1600/res/images/folder.png | Bin 1412 -> 0 bytes gui/devices/2560x1600/res/images/home-icon.png | Bin 2634 -> 0 bytes .../2560x1600/res/images/indeterminate001.png | Bin 21968 -> 0 bytes .../2560x1600/res/images/indeterminate002.png | Bin 21883 -> 0 bytes .../2560x1600/res/images/indeterminate003.png | Bin 21993 -> 0 bytes .../2560x1600/res/images/indeterminate004.png | Bin 21960 -> 0 bytes .../2560x1600/res/images/indeterminate005.png | Bin 22105 -> 0 bytes .../2560x1600/res/images/indeterminate006.png | Bin 21973 -> 0 bytes gui/devices/2560x1600/res/images/keyboard1.png | Bin 52841 -> 0 bytes gui/devices/2560x1600/res/images/keyboard2.png | Bin 54398 -> 0 bytes gui/devices/2560x1600/res/images/keyboard3.png | Bin 51755 -> 0 bytes gui/devices/2560x1600/res/images/keyboard4.png | Bin 48423 -> 0 bytes gui/devices/2560x1600/res/images/medium-button.png | Bin 1306 -> 0 bytes .../2560x1600/res/images/mediumwide-button.png | Bin 1395 -> 0 bytes gui/devices/2560x1600/res/images/minus-button.png | Bin 943 -> 0 bytes gui/devices/2560x1600/res/images/plus-button.png | Bin 1438 -> 0 bytes .../2560x1600/res/images/progress_empty.png | Bin 310 -> 0 bytes gui/devices/2560x1600/res/images/progress_fill.png | Bin 380 -> 0 bytes gui/devices/2560x1600/res/images/radio_empty.png | Bin 4353 -> 0 bytes .../2560x1600/res/images/radio_selected.png | Bin 5750 -> 0 bytes gui/devices/2560x1600/res/images/slider-touch.png | Bin 34883 -> 0 bytes gui/devices/2560x1600/res/images/slider-used.png | Bin 11888 -> 0 bytes gui/devices/2560x1600/res/images/slider.png | Bin 25897 -> 0 bytes gui/devices/2560x1600/res/images/sort-button.png | Bin 1583 -> 0 bytes gui/devices/2560x1600/res/images/unlock.png | Bin 116644 -> 0 bytes gui/devices/2560x1600/res/ui.xml | 441 --------------------- 37 files changed, 441 deletions(-) delete mode 100644 gui/devices/2560x1600/res/fonts/Roboto-Regular-40.dat delete mode 100644 gui/devices/2560x1600/res/images/back-icon.png delete mode 100644 gui/devices/2560x1600/res/images/background.jpg delete mode 100644 gui/devices/2560x1600/res/images/button.png delete mode 100644 gui/devices/2560x1600/res/images/checkbox_checked.png delete mode 100644 gui/devices/2560x1600/res/images/checkbox_empty.png delete mode 100644 gui/devices/2560x1600/res/images/console-icon.png delete mode 100644 gui/devices/2560x1600/res/images/console-toggle.png delete mode 100644 gui/devices/2560x1600/res/images/cursor.png delete mode 100644 gui/devices/2560x1600/res/images/curtain.jpg delete mode 100644 gui/devices/2560x1600/res/images/file.png delete mode 100644 gui/devices/2560x1600/res/images/folder.png delete mode 100644 gui/devices/2560x1600/res/images/home-icon.png delete mode 100755 gui/devices/2560x1600/res/images/indeterminate001.png delete mode 100755 gui/devices/2560x1600/res/images/indeterminate002.png delete mode 100755 gui/devices/2560x1600/res/images/indeterminate003.png delete mode 100755 gui/devices/2560x1600/res/images/indeterminate004.png delete mode 100755 gui/devices/2560x1600/res/images/indeterminate005.png delete mode 100755 gui/devices/2560x1600/res/images/indeterminate006.png delete mode 100644 gui/devices/2560x1600/res/images/keyboard1.png delete mode 100644 gui/devices/2560x1600/res/images/keyboard2.png delete mode 100644 gui/devices/2560x1600/res/images/keyboard3.png delete mode 100644 gui/devices/2560x1600/res/images/keyboard4.png delete mode 100644 gui/devices/2560x1600/res/images/medium-button.png delete mode 100644 gui/devices/2560x1600/res/images/mediumwide-button.png delete mode 100644 gui/devices/2560x1600/res/images/minus-button.png delete mode 100644 gui/devices/2560x1600/res/images/plus-button.png delete mode 100644 gui/devices/2560x1600/res/images/progress_empty.png delete mode 100644 gui/devices/2560x1600/res/images/progress_fill.png delete mode 100644 gui/devices/2560x1600/res/images/radio_empty.png delete mode 100644 gui/devices/2560x1600/res/images/radio_selected.png delete mode 100644 gui/devices/2560x1600/res/images/slider-touch.png delete mode 100644 gui/devices/2560x1600/res/images/slider-used.png delete mode 100644 gui/devices/2560x1600/res/images/slider.png delete mode 100644 gui/devices/2560x1600/res/images/sort-button.png delete mode 100644 gui/devices/2560x1600/res/images/unlock.png delete mode 100644 gui/devices/2560x1600/res/ui.xml (limited to 'gui/devices/2560x1600') diff --git a/gui/devices/2560x1600/res/fonts/Roboto-Regular-40.dat b/gui/devices/2560x1600/res/fonts/Roboto-Regular-40.dat deleted file mode 100644 index 637d9fe5b..000000000 Binary files a/gui/devices/2560x1600/res/fonts/Roboto-Regular-40.dat and /dev/null differ diff --git a/gui/devices/2560x1600/res/images/back-icon.png b/gui/devices/2560x1600/res/images/back-icon.png deleted file mode 100644 index effe411ec..000000000 Binary files a/gui/devices/2560x1600/res/images/back-icon.png and /dev/null differ diff --git a/gui/devices/2560x1600/res/images/background.jpg b/gui/devices/2560x1600/res/images/background.jpg deleted file mode 100644 index 3b8a71ac6..000000000 Binary files a/gui/devices/2560x1600/res/images/background.jpg and /dev/null differ diff --git a/gui/devices/2560x1600/res/images/button.png b/gui/devices/2560x1600/res/images/button.png deleted file mode 100644 index 4743ba5b0..000000000 Binary files a/gui/devices/2560x1600/res/images/button.png and /dev/null differ diff --git a/gui/devices/2560x1600/res/images/checkbox_checked.png b/gui/devices/2560x1600/res/images/checkbox_checked.png deleted file mode 100644 index c3ceeef0c..000000000 Binary files a/gui/devices/2560x1600/res/images/checkbox_checked.png and /dev/null differ diff --git a/gui/devices/2560x1600/res/images/checkbox_empty.png b/gui/devices/2560x1600/res/images/checkbox_empty.png deleted file mode 100644 index 87d6dd905..000000000 Binary files a/gui/devices/2560x1600/res/images/checkbox_empty.png and /dev/null differ diff --git a/gui/devices/2560x1600/res/images/console-icon.png b/gui/devices/2560x1600/res/images/console-icon.png deleted file mode 100644 index 4dd1a1415..000000000 Binary files a/gui/devices/2560x1600/res/images/console-icon.png and /dev/null differ diff --git a/gui/devices/2560x1600/res/images/console-toggle.png b/gui/devices/2560x1600/res/images/console-toggle.png deleted file mode 100644 index 3bf8a1ad0..000000000 Binary files a/gui/devices/2560x1600/res/images/console-toggle.png and /dev/null differ diff --git a/gui/devices/2560x1600/res/images/cursor.png b/gui/devices/2560x1600/res/images/cursor.png deleted file mode 100644 index 32c8ae1ca..000000000 Binary files a/gui/devices/2560x1600/res/images/cursor.png and /dev/null differ diff --git a/gui/devices/2560x1600/res/images/curtain.jpg b/gui/devices/2560x1600/res/images/curtain.jpg deleted file mode 100644 index e58811aab..000000000 Binary files a/gui/devices/2560x1600/res/images/curtain.jpg and /dev/null differ diff --git a/gui/devices/2560x1600/res/images/file.png b/gui/devices/2560x1600/res/images/file.png deleted file mode 100644 index 793b61d8b..000000000 Binary files a/gui/devices/2560x1600/res/images/file.png and /dev/null differ diff --git a/gui/devices/2560x1600/res/images/folder.png b/gui/devices/2560x1600/res/images/folder.png deleted file mode 100644 index f3ab28fd0..000000000 Binary files a/gui/devices/2560x1600/res/images/folder.png and /dev/null differ diff --git a/gui/devices/2560x1600/res/images/home-icon.png b/gui/devices/2560x1600/res/images/home-icon.png deleted file mode 100644 index 692d8dda3..000000000 Binary files a/gui/devices/2560x1600/res/images/home-icon.png and /dev/null differ diff --git a/gui/devices/2560x1600/res/images/indeterminate001.png b/gui/devices/2560x1600/res/images/indeterminate001.png deleted file mode 100755 index f0cb4b2f9..000000000 Binary files a/gui/devices/2560x1600/res/images/indeterminate001.png and /dev/null differ diff --git a/gui/devices/2560x1600/res/images/indeterminate002.png b/gui/devices/2560x1600/res/images/indeterminate002.png deleted file mode 100755 index eba46eb5b..000000000 Binary files a/gui/devices/2560x1600/res/images/indeterminate002.png and /dev/null differ diff --git a/gui/devices/2560x1600/res/images/indeterminate003.png b/gui/devices/2560x1600/res/images/indeterminate003.png deleted file mode 100755 index 34ef03e60..000000000 Binary files a/gui/devices/2560x1600/res/images/indeterminate003.png and /dev/null differ diff --git a/gui/devices/2560x1600/res/images/indeterminate004.png b/gui/devices/2560x1600/res/images/indeterminate004.png deleted file mode 100755 index de6f4d910..000000000 Binary files a/gui/devices/2560x1600/res/images/indeterminate004.png and /dev/null differ diff --git a/gui/devices/2560x1600/res/images/indeterminate005.png b/gui/devices/2560x1600/res/images/indeterminate005.png deleted file mode 100755 index d993f2c50..000000000 Binary files a/gui/devices/2560x1600/res/images/indeterminate005.png and /dev/null differ diff --git a/gui/devices/2560x1600/res/images/indeterminate006.png b/gui/devices/2560x1600/res/images/indeterminate006.png deleted file mode 100755 index 08ca229a7..000000000 Binary files a/gui/devices/2560x1600/res/images/indeterminate006.png and /dev/null differ diff --git a/gui/devices/2560x1600/res/images/keyboard1.png b/gui/devices/2560x1600/res/images/keyboard1.png deleted file mode 100644 index cef79d91c..000000000 Binary files a/gui/devices/2560x1600/res/images/keyboard1.png and /dev/null differ diff --git a/gui/devices/2560x1600/res/images/keyboard2.png b/gui/devices/2560x1600/res/images/keyboard2.png deleted file mode 100644 index d86027907..000000000 Binary files a/gui/devices/2560x1600/res/images/keyboard2.png and /dev/null differ diff --git a/gui/devices/2560x1600/res/images/keyboard3.png b/gui/devices/2560x1600/res/images/keyboard3.png deleted file mode 100644 index 34780976d..000000000 Binary files a/gui/devices/2560x1600/res/images/keyboard3.png and /dev/null differ diff --git a/gui/devices/2560x1600/res/images/keyboard4.png b/gui/devices/2560x1600/res/images/keyboard4.png deleted file mode 100644 index d491625ff..000000000 Binary files a/gui/devices/2560x1600/res/images/keyboard4.png and /dev/null differ diff --git a/gui/devices/2560x1600/res/images/medium-button.png b/gui/devices/2560x1600/res/images/medium-button.png deleted file mode 100644 index ef731cddf..000000000 Binary files a/gui/devices/2560x1600/res/images/medium-button.png and /dev/null differ diff --git a/gui/devices/2560x1600/res/images/mediumwide-button.png b/gui/devices/2560x1600/res/images/mediumwide-button.png deleted file mode 100644 index 94af41913..000000000 Binary files a/gui/devices/2560x1600/res/images/mediumwide-button.png and /dev/null differ diff --git a/gui/devices/2560x1600/res/images/minus-button.png b/gui/devices/2560x1600/res/images/minus-button.png deleted file mode 100644 index 8d343a7b3..000000000 Binary files a/gui/devices/2560x1600/res/images/minus-button.png and /dev/null differ diff --git a/gui/devices/2560x1600/res/images/plus-button.png b/gui/devices/2560x1600/res/images/plus-button.png deleted file mode 100644 index cc4c70af1..000000000 Binary files a/gui/devices/2560x1600/res/images/plus-button.png and /dev/null differ diff --git a/gui/devices/2560x1600/res/images/progress_empty.png b/gui/devices/2560x1600/res/images/progress_empty.png deleted file mode 100644 index 8f3f02a3a..000000000 Binary files a/gui/devices/2560x1600/res/images/progress_empty.png and /dev/null differ diff --git a/gui/devices/2560x1600/res/images/progress_fill.png b/gui/devices/2560x1600/res/images/progress_fill.png deleted file mode 100644 index 88d82d507..000000000 Binary files a/gui/devices/2560x1600/res/images/progress_fill.png and /dev/null differ diff --git a/gui/devices/2560x1600/res/images/radio_empty.png b/gui/devices/2560x1600/res/images/radio_empty.png deleted file mode 100644 index 946d46d06..000000000 Binary files a/gui/devices/2560x1600/res/images/radio_empty.png and /dev/null differ diff --git a/gui/devices/2560x1600/res/images/radio_selected.png b/gui/devices/2560x1600/res/images/radio_selected.png deleted file mode 100644 index d68e85570..000000000 Binary files a/gui/devices/2560x1600/res/images/radio_selected.png and /dev/null differ diff --git a/gui/devices/2560x1600/res/images/slider-touch.png b/gui/devices/2560x1600/res/images/slider-touch.png deleted file mode 100644 index 14c8f99ff..000000000 Binary files a/gui/devices/2560x1600/res/images/slider-touch.png and /dev/null differ diff --git a/gui/devices/2560x1600/res/images/slider-used.png b/gui/devices/2560x1600/res/images/slider-used.png deleted file mode 100644 index 21372da20..000000000 Binary files a/gui/devices/2560x1600/res/images/slider-used.png and /dev/null differ diff --git a/gui/devices/2560x1600/res/images/slider.png b/gui/devices/2560x1600/res/images/slider.png deleted file mode 100644 index ec2720095..000000000 Binary files a/gui/devices/2560x1600/res/images/slider.png and /dev/null differ diff --git a/gui/devices/2560x1600/res/images/sort-button.png b/gui/devices/2560x1600/res/images/sort-button.png deleted file mode 100644 index d5770960d..000000000 Binary files a/gui/devices/2560x1600/res/images/sort-button.png and /dev/null differ diff --git a/gui/devices/2560x1600/res/images/unlock.png b/gui/devices/2560x1600/res/images/unlock.png deleted file mode 100644 index a605d056a..000000000 Binary files a/gui/devices/2560x1600/res/images/unlock.png and /dev/null differ diff --git a/gui/devices/2560x1600/res/ui.xml b/gui/devices/2560x1600/res/ui.xml deleted file mode 100644 index 8f48cf227..000000000 --- a/gui/devices/2560x1600/res/ui.xml +++ /dev/null @@ -1,441 +0,0 @@ - - - -
- - TeamWin - Backup Naowz - Default basic theme - preview.jpg -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-- cgit v1.2.3