From b7989b4b9f72c8b6933a9c4ddbeef07d9b7c9797 Mon Sep 17 00:00:00 2001 From: serso Date: Sat, 30 Apr 2016 10:07:07 +0200 Subject: [PATCH] Fix non-scrollable toolbar in AboutActivity --- .../calculator/about/AboutFragment.java | 2 +- .../about/ReleaseNotesFragment.java | 2 +- app/src/main/res/layout/about_fragment.xml | 76 ------------------- app/src/main/res/layout/fragment_about.xml | 69 +++++++++++++++++ ...ragment.xml => fragment_release_notes.xml} | 10 +-- 5 files changed, 76 insertions(+), 83 deletions(-) delete mode 100644 app/src/main/res/layout/about_fragment.xml create mode 100644 app/src/main/res/layout/fragment_about.xml rename app/src/main/res/layout/{release_notes_fragment.xml => fragment_release_notes.xml} (77%) diff --git a/app/src/main/java/org/solovyev/android/calculator/about/AboutFragment.java b/app/src/main/java/org/solovyev/android/calculator/about/AboutFragment.java index 33e4e62b..66a8243b 100644 --- a/app/src/main/java/org/solovyev/android/calculator/about/AboutFragment.java +++ b/app/src/main/java/org/solovyev/android/calculator/about/AboutFragment.java @@ -50,7 +50,7 @@ public class AboutFragment extends BaseFragment { TextView translatorsView; public AboutFragment() { - super(R.layout.about_fragment); + super(R.layout.fragment_about); } @Override diff --git a/app/src/main/java/org/solovyev/android/calculator/about/ReleaseNotesFragment.java b/app/src/main/java/org/solovyev/android/calculator/about/ReleaseNotesFragment.java index 9cfddf2a..b493a3c0 100644 --- a/app/src/main/java/org/solovyev/android/calculator/about/ReleaseNotesFragment.java +++ b/app/src/main/java/org/solovyev/android/calculator/about/ReleaseNotesFragment.java @@ -41,7 +41,7 @@ public class ReleaseNotesFragment extends BaseFragment { TextView text; public ReleaseNotesFragment() { - super(R.layout.release_notes_fragment); + super(R.layout.fragment_release_notes); } @Override diff --git a/app/src/main/res/layout/about_fragment.xml b/app/src/main/res/layout/about_fragment.xml deleted file mode 100644 index 4384cd65..00000000 --- a/app/src/main/res/layout/about_fragment.xml +++ /dev/null @@ -1,76 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_about.xml b/app/src/main/res/layout/fragment_about.xml new file mode 100644 index 00000000..a9e711ba --- /dev/null +++ b/app/src/main/res/layout/fragment_about.xml @@ -0,0 +1,69 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/release_notes_fragment.xml b/app/src/main/res/layout/fragment_release_notes.xml similarity index 77% rename from app/src/main/res/layout/release_notes_fragment.xml rename to app/src/main/res/layout/fragment_release_notes.xml index 73ee4e06..5173b6f0 100644 --- a/app/src/main/res/layout/release_notes_fragment.xml +++ b/app/src/main/res/layout/fragment_release_notes.xml @@ -22,16 +22,16 @@ ~ Site: http://se.solovyev.org --> - + app:layout_behavior="@string/appbar_scrolling_view_behavior"> + a:layout_height="wrap_content" /> - \ No newline at end of file + \ No newline at end of file