diff --git a/app/build.gradle b/app/build.gradle index 5f5b6820..7f421762 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -7,8 +7,8 @@ android { applicationId "us.koller.cameraroll" minSdkVersion 19 targetSdkVersion 27 - versionCode 34 - versionName "v1.0.4" + versionCode 35 + versionName "v1.0.5" vectorDrawables.useSupportLibrary = true testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" } diff --git a/app/src/main/java/us/koller/cameraroll/ui/AlbumActivity.java b/app/src/main/java/us/koller/cameraroll/ui/AlbumActivity.java index cb90aca8..867c3d54 100644 --- a/app/src/main/java/us/koller/cameraroll/ui/AlbumActivity.java +++ b/app/src/main/java/us/koller/cameraroll/ui/AlbumActivity.java @@ -432,7 +432,7 @@ private void setupMenu() { @Override @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP) public void onActivityReenter(int requestCode, Intent data) { - /*super.onActivityReenter(requestCode, data);*/ + super.onActivityReenter(requestCode, data); Log.d("AlbumActivity", "onActivityReenter: " + this); if (data != null) { sharedElementReturnPosition = data.getIntExtra(EXTRA_CURRENT_ALBUM_POSITION, -1); @@ -452,7 +452,7 @@ public void onLayoutChange(View v, int l, int t, int r, int b, recyclerView.scrollToPosition(sharedElementReturnPosition); } } - super.onActivityReenter(requestCode, data); + /*super.onActivityReenter(requestCode, data);*/ } @Override diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml index e59187ab..f5e9cccc 100644 --- a/app/src/main/res/layout/activity_about.xml +++ b/app/src/main/res/layout/activity_about.xml @@ -26,6 +26,7 @@ android:layout_height="wrap_content" android:orientation="vertical" android:padding="32dp" + android:elevation="4dp" tools:ignore="UseCompoundDrawables"> @transition/album_item_transition + @transition/album_item_transition + false @android:color/transparent @@ -46,6 +48,8 @@ @transition/album_item_transition + @transition/album_item_transition + false @android:color/transparent