From: David A. Velasco Date: Wed, 12 Jun 2013 09:47:18 +0000 (+0200) Subject: Merge branch 'develop' into direct_download_with_click_at_list X-Git-Tag: oc-android-1.4.3~21^2 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/02d08d0f81ba408aef027c08f9f9bfbb26fe3dca?hp=782186f5b1fc40f60e8da73f219c7cda6a58b8d6 Merge branch 'develop' into direct_download_with_click_at_list --- diff --git a/.classpath b/.classpath index f7b8a1f9..d57ec025 100644 --- a/.classpath +++ b/.classpath @@ -4,6 +4,6 @@ - + diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs index 0ff9ee10..81acefee 100644 --- a/.settings/org.eclipse.jdt.core.prefs +++ b/.settings/org.eclipse.jdt.core.prefs @@ -1,4 +1,7 @@ eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 +org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.source=1.6 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 diff --git a/oc_jb_workaround/.classpath b/oc_jb_workaround/.classpath index 3f9691c5..d57ec025 100644 --- a/oc_jb_workaround/.classpath +++ b/oc_jb_workaround/.classpath @@ -1,8 +1,9 @@ - + + 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" + /> + - - - - - - - + +