Skip to content

Commit

Permalink
1.91
Browse files Browse the repository at this point in the history
Fix Freeze on Changing Themes
Fix Exit Transition
Add support for Galaxy
S4 Touch Screen
Add new dark holo theme
  • Loading branch information
Ahmad Amarullah committed Sep 3, 2013
1 parent 8660770 commit 68651f4
Show file tree
Hide file tree
Showing 69 changed files with 97 additions and 22 deletions.
9 changes: 8 additions & 1 deletion Android.mk
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ include $(CLEAR_VARS)
## VERSIONING
##
AROMA_NAME := AROMA Filemanager
AROMA_VERSION := 1.90
AROMA_VERSION := 1.91
AROMA_BUILD := $(shell date +%y%m%d%H)
AROMA_CN := Degung Gamelan

Expand Down Expand Up @@ -156,6 +156,13 @@ include $(CLEAR_VARS)

## INCLUDED LIBRARIES
LOCAL_STATIC_LIBRARIES := libm libc

##
## Remove Old Build
##
ifeq ($(MAKECMDGOALS),$(LOCAL_MODULE))
$(shell rm -rf $(PRODUCT_OUT)/obj/EXECUTABLES/$(LOCAL_MODULE)_intermediates)
endif

include $(BUILD_EXECUTABLE)

Expand Down
Binary file removed assets/META-INF/com/google/android/update-binary
Binary file not shown.
Binary file added assets/assets/icons/Holo/dialog.alert.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/assets/icons/Holo/dialog.info.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/assets/icons/Holo/dialog.question.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/assets/icons/Holo/ime.123.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/assets/icons/Holo/ime.abc.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/assets/icons/Holo/ime.backspace.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/assets/icons/Holo/ime.down.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/assets/icons/Holo/ime.enter.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/assets/icons/Holo/ime.left.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/assets/icons/Holo/ime.right.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/assets/icons/Holo/ime.shiftcaps.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/assets/icons/Holo/ime.shiftlow.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/assets/icons/Holo/ime.shiftup.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/assets/icons/Holo/ime.tab.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/assets/icons/Holo/ime.up.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/assets/icons/Holo/tools.cancel.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/assets/icons/Holo/tools.chmod.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/assets/icons/Holo/tools.copy.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/assets/icons/Holo/tools.cut.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/assets/icons/Holo/tools.delete.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/assets/icons/Holo/tools.details.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/assets/icons/Holo/tools.fav.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/assets/icons/Holo/tools.favadd.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/assets/icons/Holo/tools.favdel.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/assets/icons/Holo/tools.info.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/assets/icons/Holo/tools.menu.png
Binary file added assets/assets/icons/Holo/tools.newfolder.png
Binary file added assets/assets/icons/Holo/tools.ok.png
Binary file added assets/assets/icons/Holo/tools.parent.png
Binary file added assets/assets/icons/Holo/tools.paste.png
Binary file added assets/assets/icons/Holo/tools.refresh.png
Binary file added assets/assets/icons/Holo/tools.rename.png
Binary file added assets/assets/icons/Holo/tools.selectall.png
Binary file added assets/assets/icons/Holo/tools.settings.png
Binary file added assets/assets/icons/Holo/tools.showhide.png
Binary file added assets/assets/icons/Holo/tools.terminal.png
Binary file added assets/assets/icons/Holo/tools.unselectall.png
Binary file added assets/assets/icons/Holo/tools.usb.png
Binary file added assets/assets/icons/Holo/type.default.png
Binary file added assets/assets/icons/Holo/type.folder.fav.png
Binary file added assets/assets/icons/Holo/type.folder.png
Binary file added assets/assets/icons/Holo/type.linkerror.png
Binary file added assets/assets/icons/Holo/type.linkfile.png
Binary file added assets/assets/icons/Holo/type.linkfolder.png
Binary file added assets/assets/icons/Holo/type.zip.png
Binary file added assets/assets/themes/Holo Dark/button.9.png
Binary file added assets/assets/themes/Holo Dark/button_focus.9.png
Binary file added assets/assets/themes/Holo Dark/button_press.9.png
Binary file added assets/assets/themes/Holo Dark/cboff.png
Binary file added assets/assets/themes/Holo Dark/cbon.png
Binary file added assets/assets/themes/Holo Dark/dialog.9.png
2 changes: 2 additions & 0 deletions assets/assets/themes/Holo Dark/info.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Holo Dark theme for AROMA File Manager
by <b>amarullz</b>
Binary file added assets/assets/themes/Holo Dark/list.9.png
Binary file added assets/assets/themes/Holo Dark/progbg.9.png
Binary file added assets/assets/themes/Holo Dark/progval.9.png
Binary file added assets/assets/themes/Holo Dark/radoff.png
Binary file added assets/assets/themes/Holo Dark/radon.png
61 changes: 61 additions & 0 deletions assets/assets/themes/Holo Dark/theme.prop
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
img.titlebar=titlebar.9
img.dialog=dialog.9
img.dialog.titlebar=dialog_titlebar.9
img.progress=progbg.9
img.prograss.fill=progval.9
img.selection=list.9
img.selection.push=list.9
img.button=button.9
img.button.focus=button_focus.9
img.button.push=button_press.9
img.checkbox=cboff
img.checkbox.focus=cboff
img.checkbox.push=cboff
img.checkbox.on=cbon
img.checkbox.on.focus=cbon
img.checkbox.on.push=cbon
img.radio=radoff
img.radio.focus=radoff
img.radio.push=radoff
img.radio.on=radon
img.radio.on.focus=radon
img.radio.on.push=radon


color.winbg = #000000
color.winbg_g = #272D33
color.winfg = #ffffff
color.winfg_gray = #666666
color.dialogbg = #000000
color.dialogbg_g = #000000
color.dialogfg = #ffffff
color.textbg = #000000
color.textfg = #ffffff
color.textfg_gray = #BFC6CC
color.controlbg = #0a0a0a
color.controlbg_g = #0a0a0a
color.controlfg = #ffffff
color.selectbg = #33B5E5
color.selectbg_g = #33B5E5
color.selectfg = #ffffff
color.titlebg = #000000
color.titlebg_g = #000000
color.titlefg = #ffffff
color.dlgtitlebg = #000000
color.dlgtitlebg_g = #000000
color.dlgtitlefg = #ffffff
color.scrollbar = #888888
color.navbg = #1a1a1a
color.navbg_g = #1a1a1a
color.border = #555555
color.border_g = #555555
color.progressglow = #33B5E5

config.roundsize = 1
config.button_roundsize = 1
config.window_roundsize = 1
config.transition_frame = 4

info.themename = Holo Dark
info.description = Holo Dark Theme for AROMA Installer
info.author = amarullz
Binary file added assets/assets/themes/Holo Dark/titlebar.9.png
Binary file removed out/aroma_filemanager
Binary file not shown.
Binary file removed out/aromafm.zip
Binary file not shown.
1 change: 1 addition & 0 deletions out/out_folder.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Output Binary and Zip Here
22 changes: 12 additions & 10 deletions src/libs/input/input_translate/translate_touch.c
Original file line number Diff line number Diff line change
Expand Up @@ -75,11 +75,11 @@ byte INDR_translate_touch(AINPUTP me, INDR_DEVICEP dev,
/* Get Internal Data */
INDR_INTERNALP mi = (INDR_INTERNALP)
me->internal;

/* DUMP RAW EVENTS */
//ALOGRT("INDR RAW TOUCH: T=%i, C=%i, V=%i",ev->type,ev->code,ev->value);
static int use_tracking_id_negative_as_touch_release = 0;
static int touchReleaseOnNextSynReport = 0;
static int MT_TRACKING_IS_UNTOUCHED = 0;
static int TOUCH_RELEASE_NEXTSYN = 0;

/* Process EV_ABS Event */
if (ev->type == EV_ABS) {
switch (ev->code) {
Expand Down Expand Up @@ -136,19 +136,21 @@ byte INDR_translate_touch(AINPUTP me, INDR_DEVICEP dev,
dev->p.x = 0;
dev->p.y = 0;
}

break;

case ABS_MT_TRACKING_ID:
if (ev->value < 0) {
/* Screen UnTouched */
dev->p.state |= INDR_POS_ST_RLS_NEXT;
dev->p.x = 0;
dev->p.y = 0;
touchReleaseOnNextSynReport = 1;
use_tracking_id_negative_as_touch_release = 1;
TOUCH_RELEASE_NEXTSYN = 1;
MT_TRACKING_IS_UNTOUCHED = 1;
}

break;

default:
/* Unknown Event */
goto return_none;
Expand All @@ -166,10 +168,10 @@ byte INDR_translate_touch(AINPUTP me, INDR_DEVICEP dev,
goto return_clear_sync;
}

if (((dev->p.state & (INDR_POS_ST_LASTSYNC | INDR_POS_ST_RLS_NEXT)) && !use_tracking_id_negative_as_touch_release) ||
(use_tracking_id_negative_as_touch_release && touchReleaseOnNextSynReport == 1)) {
if (((dev->p.state & (INDR_POS_ST_LASTSYNC | INDR_POS_ST_RLS_NEXT)) && !MT_TRACKING_IS_UNTOUCHED) ||
(MT_TRACKING_IS_UNTOUCHED && TOUCH_RELEASE_NEXTSYN == 1)) {
/* Set Destination Coordinate */
touchReleaseOnNextSynReport = 0;
TOUCH_RELEASE_NEXTSYN = 0;
dest_ev->x = dev->p.tx;
dest_ev->y = dev->p.ty;

Expand Down
6 changes: 3 additions & 3 deletions src/main/aroma.c
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,9 @@ int main(int argc, char ** argv) {
ag_close_thread();
//* Wait Thread Exit
usleep(300000);
//* Release All Resource
LOGS("Starting Release\n");
a_release_all();

//* Unmute Parent
if (parent_pid) {
Expand All @@ -171,9 +174,6 @@ int main(int argc, char ** argv) {

//* Wait Until Clean Up
usleep(200000);
//* Release All Resource
LOGS("Starting Release\n");
a_release_all();
}
else {
LOGE("Cannot Open Archive\n");
Expand Down
16 changes: 8 additions & 8 deletions src/main/libs/aroma_config.c
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@ typedef struct {
byte fontsize;
byte automount;
byte showhidden;
char fontfamily[128];
char iconset[128];
char language[128];
char theme[128];
char fontfamily[256];
char iconset[256];
char language[256];
char theme[256];
} AUICV, *AUICVP;
AUICV auicv;
AUICVP auic() {
Expand All @@ -42,10 +42,10 @@ void aui_cfg_init() {
auicv.automount = 0;
auicv.showhidden = 0;
acfg()->fadeframes = 4;
snprintf(auicv.fontfamily, 128, "Droid Sans");
snprintf(auicv.iconset, 128, "Generic");
snprintf(auicv.language, 128, "English");
snprintf(auicv.theme, 128, "");
snprintf(auicv.fontfamily, 256, "Droid Sans");
snprintf(auicv.iconset, 256, "Generic");
snprintf(auicv.language, 256, "English");
snprintf(auicv.theme, 256, "");
}

int aui_cfg_btnFH() {
Expand Down
2 changes: 2 additions & 0 deletions src/main/libs/aroma_themes.c
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,9 @@
*
*/
void aui_themereload() {
printf("acfg_init_ex() - start\n");
acfg_init_ex(1);
printf("acfg_init_ex() - end\n");

if (strcmp(auic()->theme, "") != 0) {
//-- Init Theme Prop Path
Expand Down

0 comments on commit 68651f4

Please sign in to comment.