diff --git a/Android.mk b/Android.mk index 398eac7c..88066168 100644 --- a/Android.mk +++ b/Android.mk @@ -303,7 +303,6 @@ include $(commands_recovery_local_path)/libjpegtwrp/Android.mk \ $(commands_recovery_local_path)/crypto/cryptsettings/Android.mk \ $(commands_recovery_local_path)/crypto/cryptfs/Android.mk \ $(commands_recovery_local_path)/libcrecovery/Android.mk \ - $(commands_recovery_local_path)/twmincrypt/Android.mk \ $(commands_recovery_local_path)/libblkid/Android.mk \ $(commands_recovery_local_path)/minuitwrp/Android.mk diff --git a/data.cpp b/data.cpp index 9c60eddc..867c289c 100644 --- a/data.cpp +++ b/data.cpp @@ -470,7 +470,6 @@ int DataManager::SetValue(const string varName, int value, int persist /* = 0 */ str = GetStrValue(TW_EXTERNAL_PATH); SetValue("tw_storage_path", str); - SetBackupFolder(); } return SetValue(varName, valStr.str(), persist); } @@ -909,26 +908,19 @@ void DataManager::SetDefaultValues() mValues.insert(make_pair("tw_military_time", make_pair("0", 1))); mValues.insert(make_pair("tw_screen_timeout_secs", make_pair("60", 1))); mValues.insert(make_pair("tw_gui_done", make_pair("0", 0))); -#ifdef TW_MAX_BRIGHTNESS +#ifdef TW_BRIGHTNESS_PATH +#ifndef TW_MAX_BRIGHTNESS +#define TW_MAX_BRIGHTNESS 255 +#endif if (strcmp(EXPAND(TW_BRIGHTNESS_PATH), "/nobrightness") != 0) { LOGINFO("TW_BRIGHTNESS_PATH := %s\n", EXPAND(TW_BRIGHTNESS_PATH)); mConstValues.insert(make_pair("tw_has_brightnesss_file", "1")); mConstValues.insert(make_pair("tw_brightness_file", EXPAND(TW_BRIGHTNESS_PATH))); - ostringstream val100, val25, val50, val75; - int value = TW_MAX_BRIGHTNESS; - val100 << value; - mConstValues.insert(make_pair("tw_brightness_100", val100.str())); - value = TW_MAX_BRIGHTNESS * 0.25; - val25 << value; - mConstValues.insert(make_pair("tw_brightness_25", val25.str())); - value = TW_MAX_BRIGHTNESS * 0.5; - val50 << value; - mConstValues.insert(make_pair("tw_brightness_50", val50.str())); - value = TW_MAX_BRIGHTNESS * 0.75; - val75 << value; - mConstValues.insert(make_pair("tw_brightness_75", val75.str())); - mValues.insert(make_pair("tw_brightness", make_pair(val100.str(), 1))); - mValues.insert(make_pair("tw_brightness_display", make_pair("100", 1))); + ostringstream maxVal; + maxVal << TW_MAX_BRIGHTNESS; + mConstValues.insert(make_pair("tw_brightness_max", maxVal.str())); + mValues.insert(make_pair("tw_brightness", make_pair(maxVal.str(), 1))); + mValues.insert(make_pair("tw_brightness_pct", make_pair("100", 1))); } else { mConstValues.insert(make_pair("tw_has_brightnesss_file", "0")); } diff --git a/gui/Android.mk b/gui/Android.mk index 748c5ec8..35d877bc 100644 --- a/gui/Android.mk +++ b/gui/Android.mk @@ -17,6 +17,7 @@ LOCAL_SRC_FILES := \ animation.cpp \ conditional.cpp \ slider.cpp \ + slidervalue.cpp \ listbox.cpp \ keyboard.cpp \ input.cpp \ @@ -52,6 +53,11 @@ endif ifneq ($(TW_BRIGHTNESS_PATH),) LOCAL_CFLAGS += -DTW_BRIGHTNESS_PATH=$(TW_BRIGHTNESS_PATH) endif +ifneq ($(TW_MAX_BRIGHTNESS),) + LOCAL_CFLAGS += -DTW_MAX_BRIGHTNESS=$(TW_MAX_BRIGHTNESS) +else + LOCAL_CFLAGS += -DTW_MAX_BRIGHTNESS=255 +endif ifneq ($(TW_NO_SCREEN_BLANK),) LOCAL_CFLAGS += -DTW_NO_SCREEN_BLANK endif diff --git a/gui/action.cpp b/gui/action.cpp index b35074cf..64049b2c 100644 --- a/gui/action.cpp +++ b/gui/action.cpp @@ -540,6 +540,33 @@ int GUIAction::doAction(Action action, int isThreaded /* = 0 */) DataManager::SetValue(varName, value); return 0; } + if (arg.find("*") != string::npos) + { + string varName = arg.substr(0, arg.find('*')); + string multiply_by_str = gui_parse_text(arg.substr(arg.find('*') + 1, string::npos)); + int multiply_by = atoi(multiply_by_str.c_str()); + int value; + + DataManager::GetValue(varName, value); + DataManager::SetValue(varName, value*multiply_by); + return 0; + } + if (arg.find("/") != string::npos) + { + string varName = arg.substr(0, arg.find('/')); + string divide_by_str = gui_parse_text(arg.substr(arg.find('/') + 1, string::npos)); + int divide_by = atoi(divide_by_str.c_str()); + int value; + + if(divide_by != 0) + { + DataManager::GetValue(varName, value); + DataManager::SetValue(varName, value/divide_by); + } + return 0; + } + LOGERR("Unable to perform compute '%s'\n", arg.c_str()); + return -1; } if (function == "setguitimezone") diff --git a/gui/devices/1024x600/res/ui.xml b/gui/devices/1024x600/res/ui.xml index 1615ee9c..b24bda38 100755 --- a/gui/devices/1024x600/res/ui.xml +++ b/gui/devices/1024x600/res/ui.xml @@ -197,6 +197,14 @@ + + + + + + + + @@ -2289,100 +2297,47 @@ Screen Settings - - - - Screen Timeout: %tw_screen_timeout_secs% seconds - - - - - None - - tw_screen_timeout_secs=0 - - - - - - 60 - + + + + Enable screen timeout. + tw_screen_timeout_secs=60 - - - 120 - - tw_screen_timeout_secs=120 + + + + Enable screen timeout. + + tw_screen_timeout_secs=0 - - - - 180 - - tw_screen_timeout_secs=180 + + + + + + + Screen timeout in seconds: + - + - - - Brightness: %tw_brightness_display% - - - - - - - 25% - + + + + + Brightness: %tw_brightness_pct%% + - echo %tw_brightness_25% > "%tw_brightness_file%" - tw_brightness_display=25% - tw_brightness=%tw_brightness_25% - - - - - - - - 50% - - - echo %tw_brightness_50% > "%tw_brightness_file%" - tw_brightness_display=50% - tw_brightness=%tw_brightness_50% - - - - - - - - 75% - - - echo %tw_brightness_75% > "%tw_brightness_file%" - tw_brightness_display=75% - tw_brightness=%tw_brightness_75% - - - - - - - - 100% - - - echo %tw_brightness_100% > "%tw_brightness_file%" - tw_brightness_display=100% - tw_brightness=%tw_brightness_100% + tw_brightness=%tw_brightness_max% + tw_brightness*%tw_brightness_pct% + tw_brightness/100 + echo %tw_brightness% > "%tw_brightness_file%" diff --git a/gui/devices/1024x768/res/ui.xml b/gui/devices/1024x768/res/ui.xml index d1605622..5b9c3fcc 100644 --- a/gui/devices/1024x768/res/ui.xml +++ b/gui/devices/1024x768/res/ui.xml @@ -197,6 +197,14 @@ + + + + + + + + @@ -2289,100 +2297,47 @@ Screen Settings - - - - Screen Timeout: %tw_screen_timeout_secs% seconds - - - - - None - - tw_screen_timeout_secs=0 - - - - - - 60 - + + + + Enable screen timeout. + tw_screen_timeout_secs=60 - - - 120 - - tw_screen_timeout_secs=120 + + + + Enable screen timeout. + + tw_screen_timeout_secs=0 - - - - 180 - - tw_screen_timeout_secs=180 + + + + + + + Screen timeout in seconds: + - + - - - Brightness: %tw_brightness_display% - - - - - - - 25% - + + + + + Brightness: %tw_brightness_pct%% + - echo %tw_brightness_25% > "%tw_brightness_file%" - tw_brightness_display=25% - tw_brightness=%tw_brightness_25% - - - - - - - - 50% - - - echo %tw_brightness_50% > "%tw_brightness_file%" - tw_brightness_display=50% - tw_brightness=%tw_brightness_50% - - - - - - - - 75% - - - echo %tw_brightness_75% > "%tw_brightness_file%" - tw_brightness_display=75% - tw_brightness=%tw_brightness_75% - - - - - - - - 100% - - - echo %tw_brightness_100% > "%tw_brightness_file%" - tw_brightness_display=100% - tw_brightness=%tw_brightness_100% + tw_brightness=%tw_brightness_max% + tw_brightness*%tw_brightness_pct% + tw_brightness/100 + echo %tw_brightness% > "%tw_brightness_file%" diff --git a/gui/devices/1080x1920/res/ui.xml b/gui/devices/1080x1920/res/ui.xml index 93d539ca..625cad83 100644 --- a/gui/devices/1080x1920/res/ui.xml +++ b/gui/devices/1080x1920/res/ui.xml @@ -182,6 +182,13 @@ + + + + + + + @@ -2266,100 +2273,47 @@ Screen Settings - - - - Screen Timeout: %tw_screen_timeout_secs% seconds - - - - - None - - tw_screen_timeout_secs=0 - - - - - - 60 - + + + + Enable screen timeout. + tw_screen_timeout_secs=60 - - - 120 - - tw_screen_timeout_secs=120 + + + + Enable screen timeout. + + tw_screen_timeout_secs=0 - - - - 180 - - tw_screen_timeout_secs=180 + + + + + + + Screen timeout in seconds: + - + - - - Brightness: %tw_brightness_display% - - - - - - - 25% - + + + + + Brightness: %tw_brightness_pct%% + - echo %tw_brightness_25% > "%tw_brightness_file%" - tw_brightness_display=25% - tw_brightness=%tw_brightness_25% - - - - - - - - 50% - - - echo %tw_brightness_50% > "%tw_brightness_file%" - tw_brightness_display=50% - tw_brightness=%tw_brightness_50% - - - - - - - - 75% - - - echo %tw_brightness_75% > "%tw_brightness_file%" - tw_brightness_display=75% - tw_brightness=%tw_brightness_75% - - - - - - - - 100% - - - echo %tw_brightness_100% > "%tw_brightness_file%" - tw_brightness_display=100% - tw_brightness=%tw_brightness_100% + tw_brightness=%tw_brightness_max% + tw_brightness*%tw_brightness_pct% + tw_brightness/100 + echo %tw_brightness% > "%tw_brightness_file%" diff --git a/gui/devices/1280x800/res/ui.xml b/gui/devices/1280x800/res/ui.xml index 5ba47009..3ffa79de 100644 --- a/gui/devices/1280x800/res/ui.xml +++ b/gui/devices/1280x800/res/ui.xml @@ -197,6 +197,14 @@ + + + + + + + + @@ -2289,100 +2297,47 @@ Screen Settings - - - - Screen Timeout: %tw_screen_timeout_secs% seconds - - - - - None - - tw_screen_timeout_secs=0 - - - - - - 60 - + + + + Enable screen timeout. + tw_screen_timeout_secs=60 - - - 120 - - tw_screen_timeout_secs=120 + + + + Enable screen timeout. + + tw_screen_timeout_secs=0 - - - - 180 - - tw_screen_timeout_secs=180 + + + + + + + Screen timeout in seconds: + - + - - - Brightness: %tw_brightness_display% - - - - - - - 25% - + + + + + Brightness: %tw_brightness_pct%% + - echo %tw_brightness_25% > "%tw_brightness_file%" - tw_brightness_display=25% - tw_brightness=%tw_brightness_25% - - - - - - - - 50% - - - echo %tw_brightness_50% > "%tw_brightness_file%" - tw_brightness_display=50% - tw_brightness=%tw_brightness_50% - - - - - - - - 75% - - - echo %tw_brightness_75% > "%tw_brightness_file%" - tw_brightness_display=75% - tw_brightness=%tw_brightness_75% - - - - - - - - 100% - - - echo %tw_brightness_100% > "%tw_brightness_file%" - tw_brightness_display=100% - tw_brightness=%tw_brightness_100% + tw_brightness=%tw_brightness_max% + tw_brightness*%tw_brightness_pct% + tw_brightness/100 + echo %tw_brightness% > "%tw_brightness_file%" diff --git a/gui/devices/1920x1200/res/ui.xml b/gui/devices/1920x1200/res/ui.xml index 935080ae..af9aba6a 100644 --- a/gui/devices/1920x1200/res/ui.xml +++ b/gui/devices/1920x1200/res/ui.xml @@ -197,6 +197,14 @@ + + + + + + + + @@ -2289,100 +2297,47 @@ Screen Settings - - - - Screen Timeout: %tw_screen_timeout_secs% seconds - - - - - None - - tw_screen_timeout_secs=0 - - - - - - 60 - + + + + Enable screen timeout. + tw_screen_timeout_secs=60 - - - 120 - - tw_screen_timeout_secs=120 + + + + Enable screen timeout. + + tw_screen_timeout_secs=0 - - - - 180 - - tw_screen_timeout_secs=180 + + + + + + + Screen timeout in seconds: + - + - - - Brightness: %tw_brightness_display% - - - - - - - 25% - + + + + + Brightness: %tw_brightness_pct%% + - echo %tw_brightness_25% > "%tw_brightness_file%" - tw_brightness_display=25% - tw_brightness=%tw_brightness_25% - - - - - - - - 50% - - - echo %tw_brightness_50% > "%tw_brightness_file%" - tw_brightness_display=50% - tw_brightness=%tw_brightness_50% - - - - - - - - 75% - - - echo %tw_brightness_75% > "%tw_brightness_file%" - tw_brightness_display=75% - tw_brightness=%tw_brightness_75% - - - - - - - - 100% - - - echo %tw_brightness_100% > "%tw_brightness_file%" - tw_brightness_display=100% - tw_brightness=%tw_brightness_100% + tw_brightness=%tw_brightness_max% + tw_brightness*%tw_brightness_pct% + tw_brightness/100 + echo %tw_brightness% > "%tw_brightness_file%" diff --git a/gui/devices/2560x1600/res/ui.xml b/gui/devices/2560x1600/res/ui.xml index 7c46a994..12c032bd 100644 --- a/gui/devices/2560x1600/res/ui.xml +++ b/gui/devices/2560x1600/res/ui.xml @@ -197,6 +197,14 @@ + + + + + + + + diff --git a/gui/devices/320x480/res/ui.xml b/gui/devices/320x480/res/ui.xml index c85db3a2..66865a7c 100644 --- a/gui/devices/320x480/res/ui.xml +++ b/gui/devices/320x480/res/ui.xml @@ -177,6 +177,13 @@ + + + + + + + @@ -2253,100 +2260,47 @@ Screen Settings - - - - Screen Timeout: %tw_screen_timeout_secs% seconds - - - - - None - - tw_screen_timeout_secs=0 - - - - - - 60 - + + + + Enable screen timeout. + tw_screen_timeout_secs=60 - - - 120 - - tw_screen_timeout_secs=120 + + + + Enable screen timeout. + + tw_screen_timeout_secs=0 - - - - 180 - - tw_screen_timeout_secs=180 + + + + + + + Screen timeout in seconds: + - + - - - Brightness: %tw_brightness_display% - - - - - - - 25% - + + + + + Brightness: %tw_brightness_pct%% + - echo %tw_brightness_25% > "%tw_brightness_file%" - tw_brightness_display=25% - tw_brightness=%tw_brightness_25% - - - - - - - - 50% - - - echo %tw_brightness_50% > "%tw_brightness_file%" - tw_brightness_display=50% - tw_brightness=%tw_brightness_50% - - - - - - - - 75% - - - echo %tw_brightness_75% > "%tw_brightness_file%" - tw_brightness_display=75% - tw_brightness=%tw_brightness_75% - - - - - - - - 100% - - - echo %tw_brightness_100% > "%tw_brightness_file%" - tw_brightness_display=100% - tw_brightness=%tw_brightness_100% + tw_brightness=%tw_brightness_max% + tw_brightness*%tw_brightness_pct% + tw_brightness/100 + echo %tw_brightness% > "%tw_brightness_file%" diff --git a/gui/devices/480x800/res/ui.xml b/gui/devices/480x800/res/ui.xml index 6efca350..e33e5b1d 100644 --- a/gui/devices/480x800/res/ui.xml +++ b/gui/devices/480x800/res/ui.xml @@ -177,6 +177,13 @@ + + + + + + + @@ -2253,100 +2260,47 @@ Screen Settings - - - - Screen Timeout: %tw_screen_timeout_secs% seconds - - - - - None - - tw_screen_timeout_secs=0 - - - - - - 60 - + + + + Enable screen timeout. + tw_screen_timeout_secs=60 - - - 120 - - tw_screen_timeout_secs=120 + + + + Enable screen timeout. + + tw_screen_timeout_secs=0 - - - - 180 - - tw_screen_timeout_secs=180 + + + + + + + Screen timeout in seconds: + - + - - - Brightness: %tw_brightness_display% - - - - - - - 25% - + + + + + Brightness: %tw_brightness_pct%% + - echo %tw_brightness_25% > "%tw_brightness_file%" - tw_brightness_display=25% - tw_brightness=%tw_brightness_25% - - - - - - - - 50% - - - echo %tw_brightness_50% > "%tw_brightness_file%" - tw_brightness_display=50% - tw_brightness=%tw_brightness_50% - - - - - - - - 75% - - - echo %tw_brightness_75% > "%tw_brightness_file%" - tw_brightness_display=75% - tw_brightness=%tw_brightness_75% - - - - - - - - 100% - - - echo %tw_brightness_100% > "%tw_brightness_file%" - tw_brightness_display=100% - tw_brightness=%tw_brightness_100% + tw_brightness=%tw_brightness_max% + tw_brightness*%tw_brightness_pct% + tw_brightness/100 + echo %tw_brightness% > "%tw_brightness_file%" diff --git a/gui/devices/480x854/res/ui.xml b/gui/devices/480x854/res/ui.xml index de4d1594..e4487f65 100644 --- a/gui/devices/480x854/res/ui.xml +++ b/gui/devices/480x854/res/ui.xml @@ -176,6 +176,13 @@ + + + + + + + @@ -2252,100 +2259,47 @@ Screen Settings - - - - Screen Timeout: %tw_screen_timeout_secs% seconds - - - - - None - - tw_screen_timeout_secs=0 - - - - - - 60 - + + + + Enable screen timeout. + tw_screen_timeout_secs=60 - - - 120 - - tw_screen_timeout_secs=120 + + + + Enable screen timeout. + + tw_screen_timeout_secs=0 - - - - 180 - - tw_screen_timeout_secs=180 + + + + + + + Screen timeout in seconds: + - + - - - Brightness: %tw_brightness_display% - - - - - - - 25% - + + + + + Brightness: %tw_brightness_pct%% + - echo %tw_brightness_25% > "%tw_brightness_file%" - tw_brightness_display=25% - tw_brightness=%tw_brightness_25% - - - - - - - - 50% - - - echo %tw_brightness_50% > "%tw_brightness_file%" - tw_brightness_display=50% - tw_brightness=%tw_brightness_50% - - - - - - - - 75% - - - echo %tw_brightness_75% > "%tw_brightness_file%" - tw_brightness_display=75% - tw_brightness=%tw_brightness_75% - - - - - - - - 100% - - - echo %tw_brightness_100% > "%tw_brightness_file%" - tw_brightness_display=100% - tw_brightness=%tw_brightness_100% + tw_brightness=%tw_brightness_max% + tw_brightness*%tw_brightness_pct% + tw_brightness/100 + echo %tw_brightness% > "%tw_brightness_file%" diff --git a/gui/devices/540x960/res/ui.xml b/gui/devices/540x960/res/ui.xml index febc3db1..6ea2e1c6 100644 --- a/gui/devices/540x960/res/ui.xml +++ b/gui/devices/540x960/res/ui.xml @@ -177,6 +177,13 @@ + + + + + + + @@ -2253,100 +2260,47 @@ Screen Settings - - - - Screen Timeout: %tw_screen_timeout_secs% seconds - - - - - None - - tw_screen_timeout_secs=0 - - - - - - 60 - + + + + Enable screen timeout. + tw_screen_timeout_secs=60 - - - 120 - - tw_screen_timeout_secs=120 + + + + Enable screen timeout. + + tw_screen_timeout_secs=0 - - - - 180 - - tw_screen_timeout_secs=180 + + + + + + + Screen timeout in seconds: + - + - - - Brightness: %tw_brightness_display% - - - - - - - 25% - + + + + + Brightness: %tw_brightness_pct%% + - echo %tw_brightness_25% > "%tw_brightness_file%" - tw_brightness_display=25% - tw_brightness=%tw_brightness_25% - - - - - - - - 50% - - - echo %tw_brightness_50% > "%tw_brightness_file%" - tw_brightness_display=50% - tw_brightness=%tw_brightness_50% - - - - - - - - 75% - - - echo %tw_brightness_75% > "%tw_brightness_file%" - tw_brightness_display=75% - tw_brightness=%tw_brightness_75% - - - - - - - - 100% - - - echo %tw_brightness_100% > "%tw_brightness_file%" - tw_brightness_display=100% - tw_brightness=%tw_brightness_100% + tw_brightness=%tw_brightness_max% + tw_brightness*%tw_brightness_pct% + tw_brightness/100 + echo %tw_brightness% > "%tw_brightness_file%" diff --git a/gui/devices/720x1280/res/ui.xml b/gui/devices/720x1280/res/ui.xml index e2a02b1e..d43aae95 100644 --- a/gui/devices/720x1280/res/ui.xml +++ b/gui/devices/720x1280/res/ui.xml @@ -182,6 +182,13 @@ + + + + + + + @@ -2266,100 +2273,47 @@ Screen Settings - - - - Screen Timeout: %tw_screen_timeout_secs% seconds - - - - - None - - tw_screen_timeout_secs=0 - - - - - - 60 - + + + + Enable screen timeout. + tw_screen_timeout_secs=60 - - - 120 - - tw_screen_timeout_secs=120 + + + + Enable screen timeout. + + tw_screen_timeout_secs=0 - - - - 180 - - tw_screen_timeout_secs=180 + + + + + + + Screen timeout in seconds: + - + - - - Brightness: %tw_brightness_display% - - - - - - - 25% - + + + + + Brightness: %tw_brightness_pct%% + - echo %tw_brightness_25% > "%tw_brightness_file%" - tw_brightness_display=25% - tw_brightness=%tw_brightness_25% - - - - - - - - 50% - - - echo %tw_brightness_50% > "%tw_brightness_file%" - tw_brightness_display=50% - tw_brightness=%tw_brightness_50% - - - - - - - - 75% - - - echo %tw_brightness_75% > "%tw_brightness_file%" - tw_brightness_display=75% - tw_brightness=%tw_brightness_75% - - - - - - - - 100% - - - echo %tw_brightness_100% > "%tw_brightness_file%" - tw_brightness_display=100% - tw_brightness=%tw_brightness_100% + tw_brightness=%tw_brightness_max% + tw_brightness*%tw_brightness_pct% + tw_brightness/100 + echo %tw_brightness% > "%tw_brightness_file%" diff --git a/gui/devices/800x1280/res/ui.xml b/gui/devices/800x1280/res/ui.xml index 7282c929..f7226f0f 100755 --- a/gui/devices/800x1280/res/ui.xml +++ b/gui/devices/800x1280/res/ui.xml @@ -178,6 +178,13 @@ + + + + + + + @@ -2254,100 +2261,47 @@ Screen Settings - - - - Screen Timeout: %tw_screen_timeout_secs% seconds - - - - - None - - tw_screen_timeout_secs=0 - - - - - - 60 - + + + + Enable screen timeout. + tw_screen_timeout_secs=60 - - - 120 - - tw_screen_timeout_secs=120 + + + + Enable screen timeout. + + tw_screen_timeout_secs=0 - - - - 180 - - tw_screen_timeout_secs=180 + + + + + + + Screen timeout in seconds: + - + - - - Brightness: %tw_brightness_display% - - - - - - - 25% - + + + + + Brightness: %tw_brightness_pct%% + - echo %tw_brightness_25% > "%tw_brightness_file%" - tw_brightness_display=25% - tw_brightness=%tw_brightness_25% - - - - - - - - 50% - - - echo %tw_brightness_50% > "%tw_brightness_file%" - tw_brightness_display=50% - tw_brightness=%tw_brightness_50% - - - - - - - - 75% - - - echo %tw_brightness_75% > "%tw_brightness_file%" - tw_brightness_display=75% - tw_brightness=%tw_brightness_75% - - - - - - - - 100% - - - echo %tw_brightness_100% > "%tw_brightness_file%" - tw_brightness_display=100% - tw_brightness=%tw_brightness_100% + tw_brightness=%tw_brightness_max% + tw_brightness*%tw_brightness_pct% + tw_brightness/100 + echo %tw_brightness% > "%tw_brightness_file%" diff --git a/gui/devices/800x480/res/ui.xml b/gui/devices/800x480/res/ui.xml index 97fdf44c..bb324dff 100755 --- a/gui/devices/800x480/res/ui.xml +++ b/gui/devices/800x480/res/ui.xml @@ -197,6 +197,14 @@ + + + + + + + + @@ -2297,100 +2305,47 @@ Screen Settings - - - - Screen Timeout: %tw_screen_timeout_secs% seconds - - - - - None - - tw_screen_timeout_secs=0 - - - - - - 60 - + + + + Enable screen timeout. + tw_screen_timeout_secs=60 - - - 120 - - tw_screen_timeout_secs=120 + + + + Enable screen timeout. + + tw_screen_timeout_secs=0 - - - - 180 - - tw_screen_timeout_secs=180 + + + + + + + Screen timeout in seconds: + - + - - - Brightness: %tw_brightness_display% - - - - - - - 25% - + + + + + Brightness: %tw_brightness_pct%% + - echo %tw_brightness_25% > "%tw_brightness_file%" - tw_brightness_display=25% - tw_brightness=%tw_brightness_25% - - - - - - - - 50% - - - echo %tw_brightness_50% > "%tw_brightness_file%" - tw_brightness_display=50% - tw_brightness=%tw_brightness_50% - - - - - - - - 75% - - - echo %tw_brightness_75% > "%tw_brightness_file%" - tw_brightness_display=75% - tw_brightness=%tw_brightness_75% - - - - - - - - 100% - - - echo %tw_brightness_100% > "%tw_brightness_file%" - tw_brightness_display=100% - tw_brightness=%tw_brightness_100% + tw_brightness=%tw_brightness_max% + tw_brightness*%tw_brightness_pct% + tw_brightness/100 + echo %tw_brightness% > "%tw_brightness_file%" diff --git a/gui/objects.hpp b/gui/objects.hpp index 973c3cfe..ff5429a9 100644 --- a/gui/objects.hpp +++ b/gui/objects.hpp @@ -909,6 +909,72 @@ public: virtual int KeyRepeat(void); }; +class GUISliderValue: public RenderObject, public ActionObject, public Conditional +{ +public: + GUISliderValue(xml_node<>* node); + virtual ~GUISliderValue(); + +public: + // Render - Render the full object to the GL surface + // Return 0 on success, <0 on error + virtual int Render(void); + + // Update - Update any UI component animations (called <= 30 FPS) + // Return 0 if nothing to update, 1 on success and contiue, >1 if full render required, and <0 on error + virtual int Update(void); + + // SetPos - Update the position of the render object + // Return 0 on success, <0 on error + virtual int SetRenderPos(int x, int y, int w = 0, int h = 0); + + // NotifyTouch - Notify of a touch event + // Return 0 on success, >0 to ignore remainder of touch, and <0 on error + virtual int NotifyTouch(TOUCH_STATE state, int x, int y); + + // Notify of a variable change + virtual int NotifyVarChange(std::string varName, std::string value); + + // SetPageFocus - Notify when a page gains or loses focus + virtual void SetPageFocus(int inFocus); + +protected: + int measureText(const std::string& str); + int valueFromPct(float pct); + float pctFromValue(int value); + void loadValue(bool force = false); + + std::string mVariable; + int mMax; + int mMin; + int mValue; + char *mValueStr; + float mValuePct; + std::string mMaxStr; + std::string mMinStr; + Resource *mFont; + GUIText* mLabel; + int mLabelW; + COLOR mTextColor; + COLOR mLineColor; + COLOR mSliderColor; + bool mShowRange; + bool mShowCurr; + int mLineX; + int mLineY; + int mLineH; + int mLinePadding; + int mPadding; + int mSliderY; + int mSliderW; + int mSliderH; + bool mRendered; + int mFontHeight; + GUIAction *mAction; + bool mChangeOnDrag; + int lineW; +}; + // Helper APIs bool LoadPlacement(xml_node<>* node, int* x, int* y, int* w = NULL, int* h = NULL, RenderObject::Placement* placement = NULL); diff --git a/gui/pages.cpp b/gui/pages.cpp index bf44b385..11fe9b08 100644 --- a/gui/pages.cpp +++ b/gui/pages.cpp @@ -273,6 +273,12 @@ bool Page::ProcessNode(xml_node<>* page, xml_node<>* templates /* = NULL */, int mRenders.push_back(element); mActions.push_back(element); } + else if (type == "slidervalue") + { + GUISliderValue *element = new GUISliderValue(child); + mRenders.push_back(element); + mActions.push_back(element); + } else if (type == "listbox") { GUIListBox* element = new GUIListBox(child); diff --git a/gui/slidervalue.cpp b/gui/slidervalue.cpp new file mode 100644 index 00000000..d369aceb --- /dev/null +++ b/gui/slidervalue.cpp @@ -0,0 +1,418 @@ +// slidervalue.cpp - GUISliderValue object + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include + +extern "C" { +#include "../twcommon.h" +#include "../minuitwrp/minui.h" +} + +#include "rapidxml.hpp" +#include "objects.hpp" + +GUISliderValue::GUISliderValue(xml_node<>* node) : Conditional(node) +{ + xml_attribute<>* attr; + xml_node<>* child; + + mMin = 0; + mMax = 100; + mValue = 0; + mLineH = 2; + mLinePadding = 10; + mSliderW = 5; + mSliderH = 30; + mLineX = 0; + mLineY = 0; + mValueStr = NULL; + mAction = NULL; + mShowCurr = true; + mShowRange = false; + mChangeOnDrag = false; + mRendered = false; + + mLabel = NULL; + ConvertStrToColor("white", &mTextColor); + ConvertStrToColor("white", &mLineColor); + ConvertStrToColor("blue", &mSliderColor); + + if (!node) + { + LOGERR("GUISliderValue created without XML node\n"); + return; + } + + mLabel = new GUIText(node); + if(mLabel->Render() < 0) + { + delete mLabel; + mLabel = NULL; + } + + mAction = new GUIAction(node); + + child = node->first_node("font"); + if (child) + { + attr = child->first_attribute("resource"); + if (attr) + mFont = PageManager::FindResource(attr->value()); + + attr = child->first_attribute("color"); + if (attr) + { + std::string color = attr->value(); + ConvertStrToColor(color, &mTextColor); + } + } + + // Load the placement + LoadPlacement(node->first_node("placement"), &mRenderX, &mRenderY, &mRenderW); + + child = node->first_node("colors"); + if (child) + { + attr = child->first_attribute("line"); + if (attr) + ConvertStrToColor(attr->value(), &mLineColor); + + attr = child->first_attribute("slider"); + if (attr) + ConvertStrToColor(attr->value(), &mSliderColor); + } + + child = node->first_node("data"); + if (child) + { + attr = child->first_attribute("variable"); + if (attr) + mVariable = attr->value(); + + attr = child->first_attribute("min"); + if (attr) + { + mMinStr = gui_parse_text(attr->value()); + mMin = atoi(mMinStr.c_str()); + } + + attr = child->first_attribute("max"); + if (attr) + { + mMaxStr = gui_parse_text(attr->value()); + mMax = atoi(mMaxStr.c_str()); + } + + if (mMin > mMax) + mMin = mMax; + + attr = child->first_attribute("default"); + if (attr) + { + string parsevalue = gui_parse_text(attr->value()); + int def = atoi(parsevalue.c_str()); + + if (def < mMin) def = mMin; + else if (def > mMax) def = mMax; + DataManager::SetValue(mVariable, def); + } + + attr = child->first_attribute("showrange"); + if (attr) + mShowRange = atoi(attr->value()); + + attr = child->first_attribute("showcurr"); + if (attr) + mShowCurr = atoi(attr->value()); + + attr = child->first_attribute("changeondrag"); + if (attr) + mChangeOnDrag = atoi(attr->value()); + } + + child = node->first_node("dimensions"); + if (child) + { + attr = child->first_attribute("lineh"); + if (attr) + { + string parsevalue = gui_parse_text(attr->value()); + mLineH = atoi(parsevalue.c_str()); + } + + attr = child->first_attribute("linepadding"); + if (attr) + { + string parsevalue = gui_parse_text(attr->value()); + mPadding = atoi(parsevalue.c_str()); + } + + attr = child->first_attribute("sliderw"); + if (attr) + { + string parsevalue = gui_parse_text(attr->value()); + mSliderW = atoi(parsevalue.c_str()); + } + + attr = child->first_attribute("sliderh"); + if (attr) + { + string parsevalue = gui_parse_text(attr->value()); + mSliderH = atoi(parsevalue.c_str()); + } + } + + gr_getFontDetails(mFont ? mFont->GetResource() : NULL, (unsigned*) &mFontHeight, NULL); + + if(mShowCurr) + { + int maxLen = std::max(strlen(mMinStr.c_str()), strlen(mMaxStr.c_str())); + mValueStr = new char[maxLen+1]; + } + + loadValue(true); + + mLinePadding = mPadding; + if (mShowRange) + { + int textW = std::max(measureText(mMaxStr), measureText(mMinStr)); + mLinePadding += textW; + } + + SetRenderPos(mRenderX, mRenderY, mRenderW); +} + +GUISliderValue::~GUISliderValue() +{ + delete mLabel; + delete mAction; + delete[] mValueStr; +} + +void GUISliderValue::loadValue(bool force) +{ + if(!mVariable.empty()) + { + int value = DataManager::GetIntValue(mVariable); + if(mValue == value && !force) + return; + + mValue = value; + } + + mValue = std::max(mValue, mMin); + mValue = std::min(mValue, mMax); + mValuePct = pctFromValue(mValue); + mRendered = false; +} + +int GUISliderValue::SetRenderPos(int x, int y, int w, int h) +{ + mRenderX = x; + mRenderY = y; + if (w || h) + { + mRenderW = w; + mRenderH = h; + } + + mRenderH = mSliderH; + if(mShowCurr) + mRenderH += mFontHeight; + + if (mLabel) + { + int lw, lh; + mLabel->GetCurrentBounds(lw, lh); + int textX = mRenderX + (mRenderW/2 - lw/2); + + mLabel->SetRenderPos(textX, mRenderY); + + y += lh; + mRenderH += lh; + } + + mSliderY = y; + mLineY = (y + mSliderH/2) - (mLineH/2); + + mLineX = mRenderX + mLinePadding; + + mActionX = mRenderX; + mActionY = mRenderY; + mActionW = mRenderW; + mActionH = mRenderH; + lineW = mRenderW - (mLinePadding * 2); + + return 0; +} + +int GUISliderValue::measureText(const std::string& str) +{ + void* fontResource = NULL; + if (mFont) fontResource = mFont->GetResource(); + + return gr_measureEx(str.c_str(), fontResource); +} + +int GUISliderValue::Render(void) +{ + if (!isConditionTrue()) + { + mRendered = false; + return 0; + } + + if(mLabel) + { + int w, h; + mLabel->GetCurrentBounds(w, h); + if (w != mLabelW) { + mLabelW = w; + int textX = mRenderX + (mRenderW/2 - mLabelW/2); + mLabel->SetRenderPos(textX, mRenderY); + } + int res = mLabel->Render(); + if(res < 0) + return res; + } + + // line + gr_color(mLineColor.red, mLineColor.green, mLineColor.blue, mLineColor.alpha); + gr_fill(mLineX, mLineY, lineW, mLineH); + + // slider + uint32_t sliderX = (mValuePct*lineW)/100 + mLineX; + sliderX -= mSliderW/2; + + gr_color(mSliderColor.red, mSliderColor.green, mSliderColor.blue, mSliderColor.alpha); + gr_fill(sliderX, mSliderY, mSliderW, mSliderH); + + void *fontResource = NULL; + if(mFont) fontResource = mFont->GetResource(); + gr_color(mTextColor.red, mTextColor.green, mTextColor.blue, mTextColor.alpha); + if(mShowRange) + { + int rangeY = (mLineY - mLineH/2) - mFontHeight/2; + gr_textEx(mRenderX + mPadding/2, rangeY, mMinStr.c_str(), fontResource); + gr_textEx(mLineX + lineW + mPadding/2, rangeY, mMaxStr.c_str(), fontResource); + } + + if(mValueStr && mShowCurr) + { + sprintf(mValueStr, "%d", mValue); + int textW = measureText(mValueStr); + gr_textEx(mRenderX + (mRenderW/2 - textW/2), mSliderY+mSliderH, mValueStr, fontResource); + } + + mRendered = true; + return 0; +} + +int GUISliderValue::Update(void) +{ + if (!isConditionTrue()) return mRendered ? 2 : 0; + if (!mRendered) return 2; + + if(mLabel) + return mLabel->Update(); + return 0; +} + +int GUISliderValue::valueFromPct(float pct) +{ + int range = abs(mMax - mMin); + return mMin + (pct * range) / 100; +} + +float GUISliderValue::pctFromValue(int value) +{ + return float((value - mMin) * 100) / abs(mMax - mMin); +} + +int GUISliderValue::NotifyTouch(TOUCH_STATE state, int x, int y) +{ + if (!isConditionTrue()) return -1; + + static bool dragging = false; + switch (state) + { + case TOUCH_START: + if (x >= mRenderX && x <= mRenderX + mRenderW && + y >= mRenderY && y <= mRenderY + mRenderH) + { + dragging = true; + } + // no break + case TOUCH_DRAG: + { + if (!dragging) return 0; + + x = std::max(mLineX, x); + x = std::min(mLineX + lineW, x); + + mValuePct = float(((x - mLineX) * 100) / lineW); + int newVal = valueFromPct(mValuePct); + if (newVal != mValue) { + mRendered = false; + mValue = newVal; + if (mChangeOnDrag) { + if (!mVariable.empty()) + DataManager::SetValue(mVariable, mValue); + if (mAction) + mAction->doActions(); + } + } + break; + } + case TOUCH_RELEASE: + { + if (!dragging) return 0; + dragging = false; + + if (!mVariable.empty()) + DataManager::SetValue(mVariable, mValue); + if (mAction) + mAction->doActions(); + break; + } + case TOUCH_REPEAT: + case TOUCH_HOLD: + break; + } + return 0; +} + +int GUISliderValue::NotifyVarChange(std::string varName, std::string value) +{ + if (mLabel) + mLabel->NotifyVarChange(varName, value); + if (varName == mVariable) { + int newVal = atoi(value.c_str()); + if(newVal != mValue) { + mValue = newVal; + mValuePct = pctFromValue(mValue); + mRendered = false; + } + } + return 0; +} + +void GUISliderValue::SetPageFocus(int inFocus) +{ + if (inFocus) + loadValue(); +} diff --git a/prebuilt/Android.mk b/prebuilt/Android.mk index d28d289d..dc5ababb 100644 --- a/prebuilt/Android.mk +++ b/prebuilt/Android.mk @@ -51,7 +51,7 @@ RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libmmcutils.so RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libbmlutils.so RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libflashutils.so RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libstlport.so -RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libmincrypt.so +#RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libmincrypt.so RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libext4_utils.so RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libaosprecovery.so ifeq ($(BUILD_ID), GINGERBREAD) diff --git a/twmincrypt/Android.mk b/twmincrypt/Android.mk deleted file mode 100644 index 38c80568..00000000 --- a/twmincrypt/Android.mk +++ /dev/null @@ -1,16 +0,0 @@ -# This provides a rule to make libmincrypt as a shared library. -# As a static library, zip signature verification was crashing. -# Making it as a shared library seems to fix that issue. - -LOCAL_PATH := $(call my-dir) -include $(CLEAR_VARS) - -LOCAL_MODULE_TAGS:= eng -LOCAL_MODULE := libmincrypt -LOCAL_SRC_FILES := ../../../system/core/libmincrypt/rsa.c ../../../system/core/libmincrypt/sha.c - -ifneq ($(wildcard system/core/libmincrypt/rsa_e_3.c),) -LOCAL_SRC_FILES += ../../../system/core/libmincrypt/rsa_e_3.c ../../../system/core/libmincrypt/rsa_e_f4.c -endif - -include $(BUILD_SHARED_LIBRARY)