android/source/res/layout/toolbar_bottom.xml | 12 +++++----- android/source/res/xml/documentprovider_preferences.xml | 7 ++--- android/source/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java | 6 ++--- 3 files changed, 12 insertions(+), 13 deletions(-)
New commits: commit ef3191e73399f9a8572210853b3c22d3840c46a2 Author: Christian Lohmaier <[email protected]> Date: Wed Apr 5 16:16:08 2017 +0200 android: using VectorCompat requires to use app:srcCompat Change-Id: Ifd66e104519ace4d1d27f1312b66d873476ed2c3 diff --git a/android/source/res/layout/toolbar_bottom.xml b/android/source/res/layout/toolbar_bottom.xml index c412678f7817..b028e8b0fbe0 100644 --- a/android/source/res/layout/toolbar_bottom.xml +++ b/android/source/res/layout/toolbar_bottom.xml @@ -132,7 +132,7 @@ android:background="@drawable/image_button_background" android:paddingBottom="12dp" android:paddingTop="12dp" - android:src="@drawable/ic_shrink" /> + app:srcCompat="@drawable/ic_shrink" /> <ImageButton android:id="@+id/button_font_grow" @@ -142,7 +142,7 @@ android:background="@drawable/image_button_background" android:paddingBottom="12dp" android:paddingTop="12dp" - android:src="@drawable/ic_grow" /> + app:srcCompat="@drawable/ic_grow" /> <ImageButton android:id="@+id/button_subscript" @@ -152,7 +152,7 @@ android:background="@drawable/image_button_background" android:paddingBottom="12dp" android:paddingTop="12dp" - android:src="@drawable/ic_subscript" /> + app:srcCompat="@drawable/ic_subscript" /> <ImageButton android:id="@+id/button_superscript" @@ -162,7 +162,7 @@ android:background="@drawable/image_button_background" android:paddingBottom="12dp" android:paddingTop="12dp" - android:src="@drawable/ic_superscript" /> + app:srcCompat="@drawable/ic_superscript" /> </LinearLayout> </LinearLayout> @@ -285,7 +285,7 @@ android:background="@drawable/image_button_background" android:paddingBottom="12dp" android:paddingTop="12dp" - android:src="@drawable/ic_line" /> + app:srcCompat="@drawable/ic_line" /> <ImageButton android:id="@+id/button_insert_rect" @@ -295,7 +295,7 @@ android:background="@drawable/image_button_background" android:paddingBottom="12dp" android:paddingTop="12dp" - android:src="@drawable/ic_rect" /> + app:srcCompat="@drawable/ic_rect" /> </LinearLayout> </ScrollView> </LinearLayout> commit b59bda7cd6e93710f2c096b4ec284ff0d5cee425 Author: Christian Lohmaier <[email protected]> Date: Wed Apr 5 15:33:02 2017 +0200 android: position in RecyclerView must not be treated as fixed Change-Id: I162428edb00550d496a5cf580d00189d17ea2587 diff --git a/android/source/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java b/android/source/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java index e6cf3081848e..06d6daba90e3 100644 --- a/android/source/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java +++ b/android/source/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java @@ -1031,7 +1031,7 @@ public class LibreOfficeUIActivity extends AppCompatActivity implements Settings holder.itemView.setOnClickListener(new OnClickListener() { @Override public void onClick(View view) { - open(position); + open(holder.getAdapterPosition()); } }); holder.itemView.setOnLongClickListener(new OnLongClickListener() { @@ -1039,7 +1039,7 @@ public class LibreOfficeUIActivity extends AppCompatActivity implements Settings @Override public boolean onLongClick(View view) { //to be picked out by floating context menu (workaround-ish) - currentlySelectedFile = position; + currentlySelectedFile = holder.getAdapterPosition(); //must return false so the click is not consumed return false; } commit 0b727cb61ddaae0b2dded5da23fbfc8dea4358b3 Author: Christian Lohmaier <[email protected]> Date: Wed Apr 5 15:31:06 2017 +0200 android: prevent NullPointerException in RecyclerView Change-Id: I31ffaf62ce470630556db3cf3f4d7a643ad39f5a diff --git a/android/source/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java b/android/source/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java index 01585b1077be..e6cf3081848e 100644 --- a/android/source/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java +++ b/android/source/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java @@ -92,7 +92,7 @@ public class LibreOfficeUIActivity extends AppCompatActivity implements Settings FileFilter fileFilter; FilenameFilter filenameFilter; - private List<IFile> filePaths; + private List<IFile> filePaths = new ArrayList<IFile>(); private DocumentProviderFactory documentProviderFactory; private IDocumentProvider documentProvider; private IFile homeDirectory; commit 9f89997e301c6c748957b410314a1b44b59b1bb6 Author: Christian Lohmaier <[email protected]> Date: Wed Apr 5 15:14:58 2017 +0200 android: defaultValue is not the same as a hint also flag the password field as password entry Change-Id: I91d74335ac63ea6ddbe8df274a9b0e130fc14744 diff --git a/android/source/res/xml/documentprovider_preferences.xml b/android/source/res/xml/documentprovider_preferences.xml index 4a66c6377847..bb5f087ddf71 100644 --- a/android/source/res/xml/documentprovider_preferences.xml +++ b/android/source/res/xml/documentprovider_preferences.xml @@ -13,15 +13,14 @@ android:key="pref_server_url" android:title="@string/server_url" android:summary="@string/server_url_and_port" - android:defaultValue="http://"; /> + android:hint="https://server:port/"; /> <EditTextPreference android:key="pref_user_name" - android:title="@string/user_name" - android:defaultValue="" /> + android:title="@string/user_name" /> <EditTextPreference android:key="pref_password" android:title="@string/password" - android:defaultValue="" /> + android:password="true" /> </PreferenceCategory> <PreferenceCategory android:title="@string/physical_storage_settings"> _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
