From 4a79c12673c4f3e67d9b979e2cd92cccbf7e6f03 Mon Sep 17 00:00:00 2001 From: Iordan Iordanov Date: Fri, 4 Sep 2015 19:58:14 -0400 Subject: [PATCH] Adding a menu button next to the keyboard button for newer devices that don't show the overflow menu. --- .../jni/libs/deps/include/openssl/comp.h | 80 ------------------ ...ic_menu_moreoverflow_normal_holo_light.png | Bin 0 -> 881 bytes ...ic_menu_moreoverflow_normal_holo_light.png | Bin 0 -> 522 bytes ...ic_menu_moreoverflow_normal_holo_light.png | Bin 0 -> 540 bytes ...ic_menu_moreoverflow_normal_holo_light.png | Bin 0 -> 862 bytes ...ic_menu_moreoverflow_normal_holo_light.png | Bin 0 -> 540 bytes .../res/layout/zoom_controls.xml | 5 ++ .../android/zoomer/ZoomControls.java | 6 ++ eclipse_projects/bVNC/AndroidManifest.xml | 2 +- .../iiordanov/bVNC/RemoteCanvasActivity.java | 14 +-- 10 files changed, 20 insertions(+), 87 deletions(-) delete mode 100644 eclipse_projects/Opaque/jni/libs/deps/include/openssl/comp.h create mode 100644 eclipse_projects/ZoomerWithKeys/res/drawable-hdpi/ic_menu_moreoverflow_normal_holo_light.png create mode 100644 eclipse_projects/ZoomerWithKeys/res/drawable-ldpi/ic_menu_moreoverflow_normal_holo_light.png create mode 100644 eclipse_projects/ZoomerWithKeys/res/drawable-mdpi/ic_menu_moreoverflow_normal_holo_light.png create mode 100644 eclipse_projects/ZoomerWithKeys/res/drawable-xhdpi/ic_menu_moreoverflow_normal_holo_light.png create mode 100644 eclipse_projects/ZoomerWithKeys/res/drawable/ic_menu_moreoverflow_normal_holo_light.png diff --git a/eclipse_projects/Opaque/jni/libs/deps/include/openssl/comp.h b/eclipse_projects/Opaque/jni/libs/deps/include/openssl/comp.h deleted file mode 100644 index 4b405c7d4..000000000 --- a/eclipse_projects/Opaque/jni/libs/deps/include/openssl/comp.h +++ /dev/null @@ -1,80 +0,0 @@ - -#ifndef HEADER_COMP_H -#define HEADER_COMP_H - -#include - -#ifdef __cplusplus -extern "C" { -#endif - -typedef struct comp_ctx_st COMP_CTX; - -typedef struct comp_method_st - { - int type; /* NID for compression library */ - const char *name; /* A text string to identify the library */ - int (*init)(COMP_CTX *ctx); - void (*finish)(COMP_CTX *ctx); - int (*compress)(COMP_CTX *ctx, - unsigned char *out, unsigned int olen, - unsigned char *in, unsigned int ilen); - int (*expand)(COMP_CTX *ctx, - unsigned char *out, unsigned int olen, - unsigned char *in, unsigned int ilen); - /* The following two do NOTHING, but are kept for backward compatibility */ - long (*ctrl)(void); - long (*callback_ctrl)(void); - } COMP_METHOD; - -struct comp_ctx_st - { - COMP_METHOD *meth; - unsigned long compress_in; - unsigned long compress_out; - unsigned long expand_in; - unsigned long expand_out; - - CRYPTO_EX_DATA ex_data; - }; - - -COMP_CTX *COMP_CTX_new(COMP_METHOD *meth); -void COMP_CTX_free(COMP_CTX *ctx); -int COMP_compress_block(COMP_CTX *ctx, unsigned char *out, int olen, - unsigned char *in, int ilen); -int COMP_expand_block(COMP_CTX *ctx, unsigned char *out, int olen, - unsigned char *in, int ilen); -COMP_METHOD *COMP_rle(void ); -COMP_METHOD *COMP_zlib(void ); -void COMP_zlib_cleanup(void); - -#ifdef HEADER_BIO_H -#ifdef ZLIB -BIO_METHOD *BIO_f_zlib(void); -#endif -#endif - -/* BEGIN ERROR CODES */ -/* The following lines are auto generated by the script mkerr.pl. Any changes - * made after this point may be overwritten when the script is next run. - */ -void ERR_load_COMP_strings(void); - -/* Error codes for the COMP functions. */ - -/* Function codes. */ -#define COMP_F_BIO_ZLIB_FLUSH 99 -#define COMP_F_BIO_ZLIB_NEW 100 -#define COMP_F_BIO_ZLIB_READ 101 -#define COMP_F_BIO_ZLIB_WRITE 102 - -/* Reason codes. */ -#define COMP_R_ZLIB_DEFLATE_ERROR 99 -#define COMP_R_ZLIB_INFLATE_ERROR 100 -#define COMP_R_ZLIB_NOT_SUPPORTED 101 - -#ifdef __cplusplus -} -#endif -#endif diff --git a/eclipse_projects/ZoomerWithKeys/res/drawable-hdpi/ic_menu_moreoverflow_normal_holo_light.png b/eclipse_projects/ZoomerWithKeys/res/drawable-hdpi/ic_menu_moreoverflow_normal_holo_light.png new file mode 100644 index 0000000000000000000000000000000000000000..e3ada9726cf0ed0c3473316a4c16d398d0b31b22 GIT binary patch literal 881 zcmV-%1CIQOP)>*)9M80{%%v zK~!ko?OCx-+&~bWvDd!iatBxRjTo4Mj8>8D}pLE^mJkL8bes2~aARr(hARr)M5g;OSmlL-A zfaBxiXKQO~Z;UZql?NjJzP!AAzp=4VwwaG=n{c<=ebw*x-#O<@72BdH@=mAoax@y1 zr>Cd>5_Zl-hzM~Ur#0o@AtG#(?1K;{BG6g`BG$!;wYK#heh|V$R2yfEX%sj2gsrte zME9PshyWta;ueB%lTsxjVCKarX=6;|N?52KzE6lCV&h)-riU90t%!)wd%{|4ljnJ5 zABzYWWBvd@>rLGH8_lvzDW&2nT^&UcAfgmSVYSxI>k}T2$4R%_ea_4R0CJzSjG~Cr zH2t=-v(sumQ5%1{wYBx{jVe`&$QJ;(0D!Om`-#Yfhb z=ILNCShv=%Gq}T8F2LLdriZ6;HnNFv%x1S{igP)&^UBBO7D;I45 zKXV-C7=WCI{PB2vUaeNI*2yC_D16^_-9ux{G7!h{-nvQF28UsoD5aL)#uzYjVjaxP zP)cD@F%cn(B5b2#l2RhwYGx+u;K^ii4d4~PqTgN^h7Z=jtyT*`5TMuV-4W3v05fkj z5z&V=a1aFWecvgU%MGQ}QOZtvt@R~6qp%O%B+vA+litm%BR5qFq_RhtKdSRAcw=@h1U8xWhYl_eQRwq)$8?d z@7wLR-R;!rbecqTkbXdz`KH_LKH1(*&0H>bnx5(;NkRa2!OU!g5ZU1}TiH%o@HXrO zW_E-S*$2eg##($KqFn&-JhT(X@tf5@%37_qvE6=L#bR;g{MWD3Cr#bRLxSG=jsO4v M07*qoM6N<$f*U*J1ONa4 literal 0 HcmV?d00001 diff --git a/eclipse_projects/ZoomerWithKeys/res/drawable-mdpi/ic_menu_moreoverflow_normal_holo_light.png b/eclipse_projects/ZoomerWithKeys/res/drawable-mdpi/ic_menu_moreoverflow_normal_holo_light.png new file mode 100644 index 0000000000000000000000000000000000000000..f1cba845ba0e01e5ccc31fa5b6a465e23502be34 GIT binary patch literal 540 zcmV+%0^|LOP)Wa!$1&y>t70jAV{1bSD@t@6e*A}1x+pxDP1ZqU{P5}9Dtsh6QoFigd(NG zO|WEZf7)FNQpFo1#X)O~=gJKhNj$z4HeLIOJ&*Md!9aQ4}Xl$Q^_rr4#^QjH$$g5RFgYn4k~>p66A*8)LvZ zcTccRK`CWB6eNUL6=aOLCs-7PDa+DIP)e!(yw~pSgK-=qO;b##(=%htaV7CLK4!BS zb#ldNnj((lu;1@rP)aWW=q-X_5Co3^-kiNbrPR@IIK1lhdbhSWxLhvZof2e>nX)XE zQp#E+LI~xwitEg{6-F(D0Amcs7^_h`C#bdF*>5*K=v+Y}gz#cnN>by4Zi{5oO99rv2Cn1EiV`<`?@4Vu+EKQ$;kj%2UM@p%DFc@IHUc2$Z(P-2) egAN@!{D3bmef^%Y*Se&&$4DwF zODF|OEDN-rpPK?34TMNDOR|PN&d1emOJ7z&R%rI1^~CO%mvwV+GzPP(-3y*cbzAEd_?v zF~ZkuwUsPGiotx3_lyM6ZD&0&8snKm%Be?U; zxvsUq`B7|k7M7IdWHv}I#Q3rh0#hS>Yc125xqvc}KF`9zsiUmG+NUvdfnl7L5<*>g zk-mtG0bo2H|5i#3udc3E0i=cr1P_bU6!j5O87C(vkG=&f{{#B{{_~BEjl9H3rWgzc zV^n;tS^2&2-rnANyWRe7jETNj2cV0h7y|fE+c72>XPQ}-b+Rmro*$iaxV*evuk{=l zo=Cj+Ns<2SEbJ)|w!A1{}Gt_34SKhx>-tM~o|;v@Ym%d%6D8zH60 o^ITIOA%qY@2qAWa!$1&y>t70jAV{1bSD@t@6e*A}1x+pxDP1ZqU{P5}9Dtsh6QoFigd(NG zO|WEZf7)FNQpFo1#X)O~=gJKhNj$z4HeLIOJ&*Md!9aQ4}Xl$Q^_rr4#^QjH$$g5RFgYn4k~>p66A*8)LvZ zcTccRK`CWB6eNUL6=aOLCs-7PDa+DIP)e!(yw~pSgK-=qO;b##(=%htaV7CLK4!BS zb#ldNnj((lu;1@rP)aWW=q-X_5Co3^-kiNbrPR@IIK1lhdbhSWxLhvZof2e>nX)XE zQp#E+LI~xwitEg{6-F(D0Amcs7^_h`C#bdF*>5*K=v+Y}gz#cnN>by4Zi{5oO99rv2Cn1EiV`<`?@4Vu+EKQ$;kj%2UM@p%DFc@IHUc2$Z(P-2) egAN@!{D3bmef^%Y*Se + + android:versionCode="3780" android:versionName="v3.7.8"> diff --git a/eclipse_projects/bVNC/src/com/iiordanov/bVNC/RemoteCanvasActivity.java b/eclipse_projects/bVNC/src/com/iiordanov/bVNC/RemoteCanvasActivity.java index ae19ff635..e251a0d4d 100644 --- a/eclipse_projects/bVNC/src/com/iiordanov/bVNC/RemoteCanvasActivity.java +++ b/eclipse_projects/bVNC/src/com/iiordanov/bVNC/RemoteCanvasActivity.java @@ -308,18 +308,20 @@ public void onGlobalLayout() { zoomer.hide(); zoomer.setOnZoomKeyboardClickListener(new View.OnClickListener() { - - /* - * (non-Javadoc) - * - * @see android.view.View.OnClickListener#onClick(android.view.View) - */ @Override public void onClick(View v) { InputMethodManager inputMgr = (InputMethodManager)getSystemService(Context.INPUT_METHOD_SERVICE); inputMgr.toggleSoftInput(0, 0); } + }); + + zoomer.setOnShowMenuClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + RemoteCanvasActivity.this.openOptionsMenu(); + } + }); panner = new Panner(this, canvas.handler);