From: masensio Date: Mon, 10 Jun 2013 11:19:11 +0000 (+0200) Subject: Merge OC-297 X-Git-Tag: oc-android-1.4.3~22^2 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/472b6b48bfa33dac02d12a0d09e91dfd675569a8?hp=9f20cc45ccbbfd73bc51e16bd8abab3be856fcac Merge OC-297 --- diff --git a/.classpath b/.classpath index f7b8a1f9..d57ec025 100644 --- a/.classpath +++ b/.classpath @@ -4,6 +4,6 @@ - + diff --git a/res/drawable/ic_hide.png b/res/drawable/ic_hide.png new file mode 100644 index 00000000..8a8144b5 Binary files /dev/null and b/res/drawable/ic_hide.png differ diff --git a/res/drawable/ic_view.png b/res/drawable/ic_view.png new file mode 100644 index 00000000..b57c2499 Binary files /dev/null and b/res/drawable/ic_view.png differ diff --git a/res/layout-land/account_setup.xml b/res/layout-land/account_setup.xml index b8b8b534..dea86cd9 100644 --- a/res/layout-land/account_setup.xml +++ b/res/layout-land/account_setup.xml @@ -122,28 +122,16 @@ android:hint="@string/auth_username" android:inputType="textNoSuggestions" /> - - - - - - + android:ems="10" + android:hint="@string/auth_password" + android:inputType="textPassword" + android:drawablePadding="5dp" + /> + - - - - - - - + + 2) { - rightDrawable = drawables[2]; - } + Drawable rightDrawable = null; + if (view instanceof TextView) { + Drawable[] drawables = ((TextView)view).getCompoundDrawables(); + if (drawables.length > 2) { + rightDrawable = drawables[2]; } - if (rightDrawable != null) { - final int x = (int) event.getX(); - final int y = (int) event.getY(); - final Rect bounds = rightDrawable.getBounds(); - if (x >= (view.getRight() - bounds.width() - fuzz) && x <= (view.getRight() - view.getPaddingRight() + fuzz) - && y >= (view.getPaddingTop() - fuzz) && y <= (view.getHeight() - view.getPaddingBottom()) + fuzz) { - - return onDrawableTouch(event); - } + } + if (rightDrawable != null) { + final int x = (int) event.getX(); + final int y = (int) event.getY(); + final Rect bounds = rightDrawable.getBounds(); + if (x >= (view.getRight() - bounds.width() - fuzz) && x <= (view.getRight() - view.getPaddingRight() + fuzz) + && y >= (view.getPaddingTop() - fuzz) && y <= (view.getHeight() - view.getPaddingBottom()) + fuzz) { + + return onDrawableTouch(event); } } return false; diff --git a/tests/.classpath b/tests/.classpath index 0331c0e2..59401260 100644 --- a/tests/.classpath +++ b/tests/.classpath @@ -2,8 +2,8 @@ - - + +