From f6e8148534ecd934b0264347f24422150915b6e7 Mon Sep 17 00:00:00 2001 From: mdtrooper Date: Wed, 11 Dec 2013 10:51:41 +0000 Subject: [PATCH] 2013-08-11 Miguel de Dios * mobile/src/pandroid/agent/Setup.java, mobile/res/drawable-mdpi/help.png, mobile/res/drawable-mdpi/about.png, mobile/res/values-es/strings.xml, mobile/res/layout/about.xml, tablet/res/drawable-mdpi/help.png, tablet/res/drawable-mdpi/about.png, tablet/res/layout/about.xml, tablet/res/values-es/strings.xml: some changes. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9207 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_agents/android/ChangeLog | 10 ++++++++++ .../mobile/res/drawable-mdpi/about.png | Bin 1237 -> 1288 bytes .../android/mobile/res/drawable-mdpi/help.png | Bin 721 -> 1339 bytes .../android/mobile/res/layout/about.xml | 2 +- .../android/mobile/res/values-es/strings.xml | 2 +- .../mobile/src/pandroid/agent/Setup.java | 17 +++++++++++------ .../tablet/res/drawable-mdpi/about.png | Bin 1237 -> 1288 bytes .../android/tablet/res/drawable-mdpi/help.png | Bin 721 -> 1339 bytes .../android/tablet/res/layout/about.xml | 2 +- .../android/tablet/res/values-es/strings.xml | 2 +- 10 files changed, 25 insertions(+), 10 deletions(-) diff --git a/pandora_agents/android/ChangeLog b/pandora_agents/android/ChangeLog index d4e2b33f51..e19ad63b92 100644 --- a/pandora_agents/android/ChangeLog +++ b/pandora_agents/android/ChangeLog @@ -1,3 +1,13 @@ +2013-08-11 Miguel de Dios + + * mobile/src/pandroid/agent/Setup.java, + mobile/res/drawable-mdpi/help.png, + mobile/res/drawable-mdpi/about.png, + mobile/res/values-es/strings.xml, mobile/res/layout/about.xml, + tablet/res/drawable-mdpi/help.png, + tablet/res/drawable-mdpi/about.png, tablet/res/layout/about.xml, + tablet/res/values-es/strings.xml: some changes. + 2013-08-10 Miguel de Dios * tablet/*: updated the tablet version. diff --git a/pandora_agents/android/mobile/res/drawable-mdpi/about.png b/pandora_agents/android/mobile/res/drawable-mdpi/about.png index 18b15b5addaa6cabb3c762d2464bdc26c4bf8ffd..61a0e52eba0f527021f9f244c3a4016579949757 100644 GIT binary patch literal 1288 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 F{{^LDxqSct literal 721 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE0wix1Z>k4UOiAAEE)4(M`_JqL@;D1TB8!2v z2N=7Z%(epwmK8Xr18D^?ZvQoBE&~JOO-~oc5Rco^jn91S$S1-fvEiFMvuYA{V{35SN(4T&qP=CkKYcAuR! zVXtxaO7>+I&(Br$4AJ5*2`7FsB_q5;S^K52HS}L=0 z@3ETeK^-o&s?J^+ZeG^0B{x0UmqblFTa~c3{lqI#ljPRTa# zjE6PH^0aSc$)Q=Y_jbu@DXsI=_lYWqI6i~*xl?oiyGFrzJK4o@mhWd*6!5QRH0-lp zoO@-Cbl1UGtB>E%f6(C~?msbtKmNIvLu3EE?3>A~l@@zHIW{g^^WDnj;q(P;7w*`| zZeMo0_)tTF@MgIm6D;5B>};@@6Sr1j;_mm$N|nQWeyN^1bzy&Kvd%?^@auKLSMRR6 z-E8i$%V8$`!;5A*?Oy9+7&Cg$%FBUea3#q zv~`^}_bL?c0%KdX#5JNMC9x#cD!C{XNHG{07#ivt80s2XgcuoFnV4Id8tWQZSQ!{B z@hdusq9HdwB{QuOw}z|2r%HhuBtbR==ckpFCl;kLIHu$$r7C#lCZ?wbr6#6S7M@JC Q0V-nfboFyt=akR{0PmX@3IG5A diff --git a/pandora_agents/android/mobile/res/layout/about.xml b/pandora_agents/android/mobile/res/layout/about.xml index 5e4d0caece..4dbb820113 100644 --- a/pandora_agents/android/mobile/res/layout/about.xml +++ b/pandora_agents/android/mobile/res/layout/about.xml @@ -27,7 +27,7 @@ android:layout_gravity="center" android:layout_weight="0" android:contentDescription="@string/about_desc" - android:src="@drawable/pandorafms_logo" /> + android:src="@drawable/pandroid_large" /> Iniciar Conexion con éxito diff --git a/pandora_agents/android/mobile/src/pandroid/agent/Setup.java b/pandora_agents/android/mobile/src/pandroid/agent/Setup.java index 1b26628849..8069ab8562 100644 --- a/pandora_agents/android/mobile/src/pandroid/agent/Setup.java +++ b/pandora_agents/android/mobile/src/pandroid/agent/Setup.java @@ -247,6 +247,8 @@ public class Setup extends Activity { ArrayAdapter spinnerArrayAdapter = new ArrayAdapter(getApplicationContext(), R.layout.spinner, listProcessHuman); + spinnerArrayAdapter + .setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item); combo.setAdapter(spinnerArrayAdapter); combo.setSelection(position); @@ -650,12 +652,13 @@ public class Setup extends Activity { try { - if(TextUtils.isEmpty(createpass_password)) + if (TextUtils.isEmpty(createpass_password)) { Core.password = Core.defaultPassword; Core.updateConf(getApplicationContext()); + getApplicationContext(); //TODO - InputMethodManager im = (InputMethodManager)getSystemService(getApplicationContext().INPUT_METHOD_SERVICE); + InputMethodManager im = (InputMethodManager)getSystemService(Context.INPUT_METHOD_SERVICE); im.hideSoftInputFromWindow(text.getWindowToken(), 0); dialog.dismiss(); @@ -666,19 +669,20 @@ public class Setup extends Activity { return; } - else if(createpass_password.length() < 6) + else if (createpass_password.length() < 6) { text.setError(getString(R.string.password_length)); text2.setError(getString(R.string.password_length)); return; } - else if(createpass_password.equals(createpass_password2)) + else if (createpass_password.equals(createpass_password2)) { Core.password = createpass_password; Core.updateConf(getApplicationContext()); + getApplicationContext(); //TODO - InputMethodManager im = (InputMethodManager)getSystemService(getApplicationContext().INPUT_METHOD_SERVICE); + InputMethodManager im = (InputMethodManager)getSystemService(Context.INPUT_METHOD_SERVICE); im.hideSoftInputFromWindow(text.getWindowToken(), 0); dialog.dismiss(); @@ -737,8 +741,9 @@ public class Setup extends Activity { { if(password.equals(Core.password)) { + getApplicationContext(); //TODO - InputMethodManager im = (InputMethodManager)getSystemService(getApplicationContext().INPUT_METHOD_SERVICE); + InputMethodManager im = (InputMethodManager)getSystemService(Context.INPUT_METHOD_SERVICE); im.hideSoftInputFromWindow(text.getWindowToken(), 0); dialog.dismiss(); diff --git a/pandora_agents/android/tablet/res/drawable-mdpi/about.png b/pandora_agents/android/tablet/res/drawable-mdpi/about.png index 18b15b5addaa6cabb3c762d2464bdc26c4bf8ffd..61a0e52eba0f527021f9f244c3a4016579949757 100644 GIT binary patch literal 1288 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 F{{^LDxqSct literal 721 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE0wix1Z>k4UOiAAEE)4(M`_JqL@;D1TB8!2v z2N=7Z%(epwmK8Xr18D^?ZvQoBE&~JOO-~oc5Rco^jn91S$S1-fvEiFMvuYA{V{35SN(4T&qP=CkKYcAuR! zVXtxaO7>+I&(Br$4AJ5*2`7FsB_q5;S^K52HS}L=0 z@3ETeK^-o&s?J^+ZeG^0B{x0UmqblFTa~c3{lqI#ljPRTa# zjE6PH^0aSc$)Q=Y_jbu@DXsI=_lYWqI6i~*xl?oiyGFrzJK4o@mhWd*6!5QRH0-lp zoO@-Cbl1UGtB>E%f6(C~?msbtKmNIvLu3EE?3>A~l@@zHIW{g^^WDnj;q(P;7w*`| zZeMo0_)tTF@MgIm6D;5B>};@@6Sr1j;_mm$N|nQWeyN^1bzy&Kvd%?^@auKLSMRR6 z-E8i$%V8$`!;5A*?Oy9+7&Cg$%FBUea3#q zv~`^}_bL?c0%KdX#5JNMC9x#cD!C{XNHG{07#ivt80s2XgcuoFnV4Id8tWQZSQ!{B z@hdusq9HdwB{QuOw}z|2r%HhuBtbR==ckpFCl;kLIHu$$r7C#lCZ?wbr6#6S7M@JC Q0V-nfboFyt=akR{0PmX@3IG5A diff --git a/pandora_agents/android/tablet/res/layout/about.xml b/pandora_agents/android/tablet/res/layout/about.xml index 5e4d0caece..4dbb820113 100644 --- a/pandora_agents/android/tablet/res/layout/about.xml +++ b/pandora_agents/android/tablet/res/layout/about.xml @@ -27,7 +27,7 @@ android:layout_gravity="center" android:layout_weight="0" android:contentDescription="@string/about_desc" - android:src="@drawable/pandorafms_logo" /> + android:src="@drawable/pandroid_large" /> Iniciar Conexion con éxito