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 18b15b5add..61a0e52eba 100644 Binary files a/pandora_agents/android/mobile/res/drawable-mdpi/about.png and b/pandora_agents/android/mobile/res/drawable-mdpi/about.png differ diff --git a/pandora_agents/android/mobile/res/drawable-mdpi/help.png b/pandora_agents/android/mobile/res/drawable-mdpi/help.png index 010577feda..47a98073e7 100644 Binary files a/pandora_agents/android/mobile/res/drawable-mdpi/help.png and b/pandora_agents/android/mobile/res/drawable-mdpi/help.png differ 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 18b15b5add..61a0e52eba 100644 Binary files a/pandora_agents/android/tablet/res/drawable-mdpi/about.png and b/pandora_agents/android/tablet/res/drawable-mdpi/about.png differ diff --git a/pandora_agents/android/tablet/res/drawable-mdpi/help.png b/pandora_agents/android/tablet/res/drawable-mdpi/help.png index 010577feda..47a98073e7 100644 Binary files a/pandora_agents/android/tablet/res/drawable-mdpi/help.png and b/pandora_agents/android/tablet/res/drawable-mdpi/help.png differ 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