diff options
24 files changed, 73 insertions, 81 deletions
diff --git a/android/source/AndroidManifest.xml b/android/source/AndroidManifest.xml index 987aeed66ae6..43f790fca985 100644 --- a/android/source/AndroidManifest.xml +++ b/android/source/AndroidManifest.xml @@ -116,7 +116,7 @@ </activity> <provider - android:name="android.support.v4.content.FileProvider" + android:name="androidx.core.content.FileProvider" android:authorities="${applicationId}.fileprovider" android:exported="false" android:grantUriPermissions="true"> diff --git a/android/source/build.gradle b/android/source/build.gradle index a690749ff0ee..7dc93e778a7c 100644 --- a/android/source/build.gradle +++ b/android/source/build.gradle @@ -27,8 +27,8 @@ dependencies { "libreoffice.jar", "unoloader.jar" ]) - implementation 'com.android.support:design:27.1.1' // also pulls-in corresponding support libraries - implementation 'com.android.support.constraint:constraint-layout:1.1.2' + implementation 'com.google.android.material:material:1.0.0' + implementation 'androidx.constraintlayout:constraintlayout:1.1.3' } android { diff --git a/android/source/gradle.properties b/android/source/gradle.properties index ad1671ef57fd..414d53485e7f 100644 --- a/android/source/gradle.properties +++ b/android/source/gradle.properties @@ -1 +1,3 @@ +android.enableJetifier=true +android.useAndroidX=true org.gradle.jvmargs=-Xmx3072m diff --git a/android/source/res/layout/activity_document_browser.xml b/android/source/res/layout/activity_document_browser.xml index 559d92efbb38..1632770d97a8 100644 --- a/android/source/res/layout/activity_document_browser.xml +++ b/android/source/res/layout/activity_document_browser.xml @@ -6,7 +6,7 @@ License, v. 2.0. If a copy of the MPL was not distributed with this file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" +<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" @@ -14,7 +14,7 @@ android:orientation="vertical"> <!-- The toolbar --> - <android.support.v7.widget.Toolbar + <androidx.appcompat.widget.Toolbar android:id="@+id/toolbar" android:layout_width="0dp" android:layout_height="wrap_content" @@ -30,10 +30,10 @@ app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toTopOf="parent"> - </android.support.v7.widget.Toolbar> + </androidx.appcompat.widget.Toolbar> - <android.support.v4.widget.DrawerLayout + <androidx.drawerlayout.widget.DrawerLayout android:id="@+id/drawer_layout" android:layout_width="0dp" android:layout_height="0dp" @@ -47,7 +47,7 @@ app:layout_constraintLeft_toLeftOf="parent"> <!-- The content --> - <android.support.v4.widget.NestedScrollView + <androidx.core.widget.NestedScrollView android:layout_width="match_parent" android:layout_height="match_parent"> @@ -99,7 +99,7 @@ android:textStyle="bold" /> <!--Recent files--> - <android.support.v7.widget.RecyclerView + <androidx.recyclerview.widget.RecyclerView android:id="@+id/list_recent" android:layout_width="match_parent" android:layout_height="wrap_content" @@ -108,13 +108,13 @@ </LinearLayout> - </android.support.v4.widget.NestedScrollView> + </androidx.core.widget.NestedScrollView> <!-- The navigation drawer --> - </android.support.v4.widget.DrawerLayout> + </androidx.drawerlayout.widget.DrawerLayout> - <android.support.design.widget.FloatingActionButton + <com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@+id/editFAB" android:layout_width="wrap_content" android:layout_height="wrap_content" @@ -144,7 +144,7 @@ android:layout_marginTop="@dimen/new_doc_fab_tweak_top" android:text="@string/new_textdocument" /> - <android.support.design.widget.FloatingActionButton + <com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@+id/newWriterFAB" android:layout_width="wrap_content" android:layout_height="wrap_content" @@ -176,7 +176,7 @@ android:layout_marginTop="@dimen/new_doc_fab_tweak_top" android:text="@string/new_presentation" /> - <android.support.design.widget.FloatingActionButton + <com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@+id/newImpressFAB" android:layout_width="wrap_content" android:layout_height="wrap_content" @@ -208,7 +208,7 @@ android:layout_marginTop="@dimen/new_doc_fab_tweak_top" android:text="@string/new_spreadsheet" /> - <android.support.design.widget.FloatingActionButton + <com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@+id/newCalcFAB" android:layout_width="wrap_content" android:layout_height="wrap_content" @@ -240,7 +240,7 @@ android:layout_marginTop="@dimen/new_doc_fab_tweak_top" android:text="@string/new_drawing" /> - <android.support.design.widget.FloatingActionButton + <com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@+id/newDrawFAB" android:layout_width="wrap_content" android:layout_height="wrap_content" @@ -254,4 +254,4 @@ </LinearLayout> -</android.support.constraint.ConstraintLayout> +</androidx.constraintlayout.widget.ConstraintLayout> diff --git a/android/source/res/layout/activity_main.xml b/android/source/res/layout/activity_main.xml index c2528023d0f8..bd444f9fe79f 100644 --- a/android/source/res/layout/activity_main.xml +++ b/android/source/res/layout/activity_main.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<android.support.v4.widget.DrawerLayout android:id="@+id/drawer_layout" +<androidx.drawerlayout.widget.DrawerLayout android:id="@+id/drawer_layout" xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" xmlns:app="http://schemas.android.com/apk/res-auto" @@ -8,7 +8,7 @@ android:background="#fff" tools:context=".LibreOfficeMainActivity"> - <android.support.design.widget.CoordinatorLayout + <androidx.coordinatorlayout.widget.CoordinatorLayout android:id="@+id/coordinator_layout" android:layout_width="match_parent" android:layout_height="match_parent"> @@ -18,12 +18,12 @@ android:layout_height="match_parent" android:orientation="vertical"> - <android.support.design.widget.AppBarLayout + <com.google.android.material.appbar.AppBarLayout android:id="@+id/appBar" android:layout_width="match_parent" android:layout_height="wrap_content"> - <android.support.v7.widget.Toolbar + <androidx.appcompat.widget.Toolbar android:id="@+id/toolbar" android:layout_width="match_parent" android:layout_height="?attr/actionBarSize" @@ -33,7 +33,7 @@ tools:theme="@style/LibreOfficeTheme.Toolbar" app:popupTheme="@style/LibreOfficeTheme" /> - </android.support.design.widget.AppBarLayout> + </com.google.android.material.appbar.AppBarLayout> <LinearLayout android:layout_width="match_parent" @@ -133,7 +133,7 @@ android:layout_width="match_parent" android:layout_height="match_parent"/> - </android.support.design.widget.CoordinatorLayout> + </androidx.coordinatorlayout.widget.CoordinatorLayout> <ListView android:id="@+id/left_drawer" @@ -143,4 +143,4 @@ android:background="#9FFF" android:choiceMode="singleChoice"/> -</android.support.v4.widget.DrawerLayout> +</androidx.drawerlayout.widget.DrawerLayout> diff --git a/android/source/res/layout/number_picker.xml b/android/source/res/layout/number_picker.xml index 51463926c70f..32eea0e80a84 100644 --- a/android/source/res/layout/number_picker.xml +++ b/android/source/res/layout/number_picker.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" +<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent" @@ -127,4 +127,4 @@ android:background="@drawable/image_button_background" app:layout_constraintEnd_toEndOf="@+id/numberpickerLayout" app:layout_constraintTop_toBottomOf="@+id/number_picker_rows_positive" /> -</android.support.constraint.ConstraintLayout>
\ No newline at end of file +</androidx.constraintlayout.widget.ConstraintLayout> diff --git a/android/source/res/layout/toolbar_bottom.xml b/android/source/res/layout/toolbar_bottom.xml index f4b3f3c5f8cc..7d420f35cbca 100644 --- a/android/source/res/layout/toolbar_bottom.xml +++ b/android/source/res/layout/toolbar_bottom.xml @@ -13,7 +13,7 @@ app:popupTheme="@style/LibreOfficeTheme.Toolbar" app:theme="@style/LibreOfficeTheme.Toolbar" tools:showIn="@layout/activity_main" - app:layout_behavior="android.support.design.widget.BottomSheetBehavior" + app:layout_behavior="@string/bottom_sheet_behavior" app:behavior_hideable="true" app:behavior_peekHeight="0dp"> diff --git a/android/source/res/layout/toolbar_color_picker.xml b/android/source/res/layout/toolbar_color_picker.xml index 9393259123be..e80f25bf46f6 100644 --- a/android/source/res/layout/toolbar_color_picker.xml +++ b/android/source/res/layout/toolbar_color_picker.xml @@ -12,7 +12,7 @@ app:popupTheme="@style/LibreOfficeTheme.Toolbar" app:theme="@style/LibreOfficeTheme.Toolbar" tools:showIn="@layout/activity_main" - app:layout_behavior="android.support.design.widget.BottomSheetBehavior" + app:layout_behavior="@string/bottom_sheet_behavior" app:behavior_hideable="true" app:behavior_peekHeight="0dp"> @@ -29,15 +29,15 @@ android:background="@drawable/image_button_background" android:layout_marginBottom="10dp"/> - <android.support.v7.widget.RecyclerView + <androidx.recyclerview.widget.RecyclerView android:layout_width="match_parent" android:layout_height="wrap_content" android:id="@+id/fontColorView" > - </android.support.v7.widget.RecyclerView> + </androidx.recyclerview.widget.RecyclerView> - <android.support.v7.widget.RecyclerView + <androidx.recyclerview.widget.RecyclerView android:layout_width="match_parent" android:layout_height="match_parent" android:id="@+id/fontColorViewSub" @@ -45,11 +45,11 @@ android:layout_below="@id/fontColorView" android:layout_alignParentBottom="true"> - </android.support.v7.widget.RecyclerView> + </androidx.recyclerview.widget.RecyclerView> </LinearLayout> -</LinearLayout>
\ No newline at end of file +</LinearLayout> diff --git a/android/source/src/java/org/libreoffice/AboutDialogFragment.java b/android/source/src/java/org/libreoffice/AboutDialogFragment.java index b8e22077e928..9695d1e9d650 100644 --- a/android/source/src/java/org/libreoffice/AboutDialogFragment.java +++ b/android/source/src/java/org/libreoffice/AboutDialogFragment.java @@ -18,8 +18,8 @@ import android.content.Intent; import android.content.pm.PackageManager; import android.net.Uri; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.v4.app.DialogFragment; +import androidx.annotation.NonNull; +import androidx.fragment.app.DialogFragment; import android.text.Html; import android.text.Spanned; import android.text.method.LinkMovementMethod; diff --git a/android/source/src/java/org/libreoffice/ColorPaletteAdapter.java b/android/source/src/java/org/libreoffice/ColorPaletteAdapter.java index 6ec6aa138f66..41aed46ca915 100644 --- a/android/source/src/java/org/libreoffice/ColorPaletteAdapter.java +++ b/android/source/src/java/org/libreoffice/ColorPaletteAdapter.java @@ -1,7 +1,7 @@ package org.libreoffice; import android.content.Context; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -128,4 +128,4 @@ public class ColorPaletteAdapter extends RecyclerView.Adapter<ColorPaletteAdapte } -}
\ No newline at end of file +} diff --git a/android/source/src/java/org/libreoffice/ColorPickerAdapter.java b/android/source/src/java/org/libreoffice/ColorPickerAdapter.java index c93d5a01bbb4..89b9b9044033 100644 --- a/android/source/src/java/org/libreoffice/ColorPickerAdapter.java +++ b/android/source/src/java/org/libreoffice/ColorPickerAdapter.java @@ -3,7 +3,7 @@ package org.libreoffice; import android.content.Context; import android.content.res.Resources; import android.graphics.Color; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -163,4 +163,4 @@ public class ColorPickerAdapter extends RecyclerView.Adapter<ColorPickerAdapter. this.colorBox = itemView.findViewById(R.id.fontColorBox); } } -}
\ No newline at end of file +} diff --git a/android/source/src/java/org/libreoffice/FontController.java b/android/source/src/java/org/libreoffice/FontController.java index 8729b51e01ac..8b7f232ac65c 100644 --- a/android/source/src/java/org/libreoffice/FontController.java +++ b/android/source/src/java/org/libreoffice/FontController.java @@ -2,9 +2,9 @@ package org.libreoffice; import android.graphics.Color; import android.graphics.Rect; -import android.support.design.widget.BottomSheetBehavior; -import android.support.v7.widget.GridLayoutManager; -import android.support.v7.widget.RecyclerView; +import com.google.android.material.bottomsheet.BottomSheetBehavior; +import androidx.recyclerview.widget.GridLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.view.View; import android.widget.AdapterView; import android.widget.ArrayAdapter; diff --git a/android/source/src/java/org/libreoffice/FormattingController.java b/android/source/src/java/org/libreoffice/FormattingController.java index 9259b2ea6cae..4527583d503c 100644 --- a/android/source/src/java/org/libreoffice/FormattingController.java +++ b/android/source/src/java/org/libreoffice/FormattingController.java @@ -11,8 +11,8 @@ import android.graphics.BitmapFactory; import android.net.Uri; import android.os.Environment; import android.provider.MediaStore; -import android.support.design.widget.Snackbar; -import android.support.v4.content.FileProvider; +import com.google.android.material.snackbar.Snackbar; +import androidx.core.content.FileProvider; import android.util.Log; import android.view.LayoutInflater; import android.view.View; diff --git a/android/source/src/java/org/libreoffice/LibreOfficeMainActivity.java b/android/source/src/java/org/libreoffice/LibreOfficeMainActivity.java index 5ce176716d66..dec1cb3649c2 100644 --- a/android/source/src/java/org/libreoffice/LibreOfficeMainActivity.java +++ b/android/source/src/java/org/libreoffice/LibreOfficeMainActivity.java @@ -15,11 +15,11 @@ import android.os.Build; import android.os.Bundle; import android.preference.PreferenceManager; import android.provider.DocumentsContract; -import android.support.design.widget.BottomSheetBehavior; -import android.support.design.widget.Snackbar; -import android.support.v4.widget.DrawerLayout; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.Toolbar; +import com.google.android.material.bottomsheet.BottomSheetBehavior; +import com.google.android.material.snackbar.Snackbar; +import androidx.drawerlayout.widget.DrawerLayout; +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.widget.Toolbar; import android.text.InputType; import android.util.Log; import android.view.KeyEvent; diff --git a/android/source/src/java/org/libreoffice/PasswordDialogFragment.java b/android/source/src/java/org/libreoffice/PasswordDialogFragment.java index 112e35c4b7ed..08bc7f596894 100644 --- a/android/source/src/java/org/libreoffice/PasswordDialogFragment.java +++ b/android/source/src/java/org/libreoffice/PasswordDialogFragment.java @@ -4,9 +4,9 @@ import android.app.AlertDialog; import android.app.Dialog; import android.content.DialogInterface; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.app.DialogFragment; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.fragment.app.DialogFragment; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/android/source/src/java/org/libreoffice/PresentationActivity.java b/android/source/src/java/org/libreoffice/PresentationActivity.java index 0fd3950f55d4..ede7c0c40101 100644 --- a/android/source/src/java/org/libreoffice/PresentationActivity.java +++ b/android/source/src/java/org/libreoffice/PresentationActivity.java @@ -1,16 +1,14 @@ package org.libreoffice; import android.content.Intent; -import android.os.Build; import android.os.Bundle; -import android.support.annotation.Nullable; -import android.support.v4.view.GestureDetectorCompat; -import android.support.v7.app.AppCompatActivity; +import androidx.annotation.Nullable; +import androidx.core.view.GestureDetectorCompat; +import androidx.appcompat.app.AppCompatActivity; import android.view.GestureDetector; import android.view.KeyEvent; import android.view.MotionEvent; import android.view.View; -import android.view.WindowManager; import android.webkit.WebView; import android.widget.Button; import android.widget.ImageButton; diff --git a/android/source/src/java/org/libreoffice/ToolbarController.java b/android/source/src/java/org/libreoffice/ToolbarController.java index c97d84f0f329..f0fbb139484d 100644 --- a/android/source/src/java/org/libreoffice/ToolbarController.java +++ b/android/source/src/java/org/libreoffice/ToolbarController.java @@ -11,7 +11,7 @@ package org.libreoffice; import android.content.ClipData; import android.content.ClipboardManager; import android.content.Context; -import android.support.v7.widget.Toolbar; +import androidx.appcompat.widget.Toolbar; import android.util.Log; import android.view.KeyEvent; import android.view.Menu; diff --git a/android/source/src/java/org/libreoffice/UNOCommandsController.java b/android/source/src/java/org/libreoffice/UNOCommandsController.java index 5834f7e07001..cba67732cce1 100644 --- a/android/source/src/java/org/libreoffice/UNOCommandsController.java +++ b/android/source/src/java/org/libreoffice/UNOCommandsController.java @@ -8,7 +8,7 @@ package org.libreoffice; import android.content.DialogInterface; -import android.support.v7.app.AlertDialog; +import androidx.appcompat.app.AlertDialog; import android.text.method.ScrollingMovementMethod; import android.view.View; import android.widget.EditText; diff --git a/android/source/src/java/org/libreoffice/canvas/BitmapHandle.java b/android/source/src/java/org/libreoffice/canvas/BitmapHandle.java index e46173db518f..51f6f7cf8611 100644 --- a/android/source/src/java/org/libreoffice/canvas/BitmapHandle.java +++ b/android/source/src/java/org/libreoffice/canvas/BitmapHandle.java @@ -5,7 +5,7 @@ import android.graphics.Bitmap; import android.graphics.Canvas; import android.graphics.RectF; import android.graphics.drawable.Drawable; -import android.support.v4.content.ContextCompat; +import androidx.core.content.ContextCompat; /** * Bitmap handle canvas element is used to show a handle on the screen. diff --git a/android/source/src/java/org/libreoffice/overlay/CalcHeadersController.java b/android/source/src/java/org/libreoffice/overlay/CalcHeadersController.java index 40c9ddcd8cea..8b99c292cbc5 100644 --- a/android/source/src/java/org/libreoffice/overlay/CalcHeadersController.java +++ b/android/source/src/java/org/libreoffice/overlay/CalcHeadersController.java @@ -4,7 +4,7 @@ import android.content.Context; import android.graphics.PointF; import android.graphics.RectF; import android.graphics.drawable.ColorDrawable; -import android.support.design.widget.Snackbar; +import com.google.android.material.snackbar.Snackbar; import android.util.Log; import android.view.KeyEvent; import android.view.Gravity; diff --git a/android/source/src/java/org/libreoffice/overlay/CalcHeadersView.java b/android/source/src/java/org/libreoffice/overlay/CalcHeadersView.java index 50a1bfbdc6b0..98af7a9554e7 100644 --- a/android/source/src/java/org/libreoffice/overlay/CalcHeadersView.java +++ b/android/source/src/java/org/libreoffice/overlay/CalcHeadersView.java @@ -4,7 +4,7 @@ import android.content.Context; import android.graphics.Canvas; import android.graphics.PointF; import android.graphics.RectF; -import android.support.v4.view.GestureDetectorCompat; +import androidx.core.view.GestureDetectorCompat; import android.util.AttributeSet; import android.view.GestureDetector.SimpleOnGestureListener; import android.view.MotionEvent; diff --git a/android/source/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java b/android/source/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java index 110123f54acf..c18b784e581b 100644 --- a/android/source/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java +++ b/android/source/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java @@ -23,15 +23,15 @@ import android.net.Uri; import android.os.Build; import android.os.Bundle; import android.preference.PreferenceManager; -import android.support.design.widget.FloatingActionButton; -import android.support.v4.app.ActivityCompat; -import android.support.v4.content.ContextCompat; -import android.support.v4.view.ViewCompat; -import android.support.v7.app.ActionBar; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.GridLayoutManager; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.Toolbar; +import com.google.android.material.floatingactionbutton.FloatingActionButton; +import androidx.core.app.ActivityCompat; +import androidx.core.content.ContextCompat; +import androidx.core.view.ViewCompat; +import androidx.appcompat.app.ActionBar; +import androidx.appcompat.app.AppCompatActivity; +import androidx.recyclerview.widget.GridLayoutManager; +import androidx.recyclerview.widget.RecyclerView; +import androidx.appcompat.widget.Toolbar; import android.text.TextUtils; import android.util.Log; import android.view.Menu; diff --git a/android/source/src/java/org/libreoffice/ui/RecentFilesAdapter.java b/android/source/src/java/org/libreoffice/ui/RecentFilesAdapter.java index 6011035c1610..ef00b9fb6cfd 100644 --- a/android/source/src/java/org/libreoffice/ui/RecentFilesAdapter.java +++ b/android/source/src/java/org/libreoffice/ui/RecentFilesAdapter.java @@ -9,8 +9,8 @@ package org.libreoffice.ui; -import android.support.v4.content.ContextCompat; -import android.support.v7.widget.RecyclerView; +import androidx.core.content.ContextCompat; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/configure.ac b/configure.ac index 6d992b20ef50..11a782cab3da 100644 --- a/configure.ac +++ b/configure.ac @@ -1253,14 +1253,6 @@ if test "$_os" = "Android" ; then add_warning " $ANDROID_SDK_HOME/tools/android update sdk -u --all --filter build-tools-$BUILD_TOOLS_VERSION" add_warning "or adjust $SRC_ROOT/android/source/build.gradle accordingly" fi - if test ! -f "$ANDROID_SDK_HOME/extras/android/m2repository/source.properties"; then - AC_MSG_WARN([android support repository not found - install with - $ANDROID_SDK_HOME/tools/android update sdk -u --filter extra-android-m2repository - to allow the build to download the specified version of the android support libraries]) - add_warning "android support repository not found - install with" - add_warning " $ANDROID_SDK_HOME/tools/android update sdk -u --filter extra-android-m2repository" - add_warning "to allow the build to download the specified version of the android support libraries" - fi fi if test "$_os" = "AIX"; then |