From 2c0d8e80e7ef9e1485d69746bf63b133a8afc42f Mon Sep 17 00:00:00 2001 From: Emmanuel Date: Fri, 30 Nov 2018 16:09:53 -0300 Subject: [PATCH] Merge pull request #1533 from EmmanuelMess/fix-hacksavedstate Added Android P to NavigationView$SavedState hack --- .travis.yml | 2 +- app/build.gradle | 6 +++--- .../filemanager/ui/views/drawer/CustomNavigationView.java | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index b8e5ba2546..5fdb4db91f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,7 +8,7 @@ android: - platform-tools - tools - build-tools-27.0.3 - - android-27 + - android-28 - extra-google-m2repository script: "./gradlew assembledebug" diff --git a/app/build.gradle b/app/build.gradle index 780a205390..53e228a5b5 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,7 +1,7 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 27 + compileSdkVersion 28 buildToolsVersion '27.0.3' dexOptions { @@ -23,7 +23,7 @@ android { defaultConfig { applicationId "com.amaze.filemanager" minSdkVersion 14 - targetSdkVersion 26 + targetSdkVersion 28 versionCode 75 versionName "3.3.0" multiDexEnabled true @@ -183,7 +183,7 @@ dependencies { implementation 'com.github.jahirfiquitiva:FABsMenu:1.1.3'//Floating Action Buttons Menu (aka expandable FAB) //Simple library show - implementation('com.mikepenz:aboutlibraries:6.0.3@aar') { + implementation('com.mikepenz:aboutlibraries:6.1.1@aar') { transitive = true } diff --git a/app/src/main/java/com/amaze/filemanager/ui/views/drawer/CustomNavigationView.java b/app/src/main/java/com/amaze/filemanager/ui/views/drawer/CustomNavigationView.java index c4d74c9006..a3cbfee3d5 100644 --- a/app/src/main/java/com/amaze/filemanager/ui/views/drawer/CustomNavigationView.java +++ b/app/src/main/java/com/amaze/filemanager/ui/views/drawer/CustomNavigationView.java @@ -114,7 +114,7 @@ public void onRestoreInstanceState(Parcelable state) { */ public boolean isNavigationViewSavedStateMissing() { return Build.VERSION.SDK_INT >= Build.VERSION_CODES.M - && Build.VERSION.SDK_INT <= Build.VERSION_CODES.O_MR1; + && Build.VERSION.SDK_INT <= Build.VERSION_CODES.P; } static class SavedState extends BaseSavedState {