From f23808dd232df4bc83db0ea1c5a6877e34fbad58 Mon Sep 17 00:00:00 2001
From: Gerhard Olsson <gerhardol@users.noreply.github.com>
Date: Fri, 14 Jun 2019 01:16:35 +0200
Subject: [PATCH 1/2] Froyo: Disable FloatingActionButton

---
 app/build.gradle                              | 1 +
 app/{ => latest}/res/layout-v15/history.xml   | 0
 app/{ => latest}/res/layout-v15/start_fab.xml | 0
 3 files changed, 1 insertion(+)
 rename app/{ => latest}/res/layout-v15/history.xml (100%)
 rename app/{ => latest}/res/layout-v15/start_fab.xml (100%)

diff --git a/app/build.gradle b/app/build.gradle
index d5851b844..fa6e0b25f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -41,6 +41,7 @@ android {
         latest {
             manifest.srcFile 'latest/AndroidManifest.xml'
             java.srcDirs = ['latest/java']
+            res.srcDirs = ['latest/res']
             assets.srcDirs = ['latest/assets']
         }
         test.setRoot('test')
diff --git a/app/res/layout-v15/history.xml b/app/latest/res/layout-v15/history.xml
similarity index 100%
rename from app/res/layout-v15/history.xml
rename to app/latest/res/layout-v15/history.xml
diff --git a/app/res/layout-v15/start_fab.xml b/app/latest/res/layout-v15/start_fab.xml
similarity index 100%
rename from app/res/layout-v15/start_fab.xml
rename to app/latest/res/layout-v15/start_fab.xml

From 997f875b2044b25ca34bd7939f2f5a585b651fdc Mon Sep 17 00:00:00 2001
From: Gerhard Olsson <gerhardol@users.noreply.github.com>
Date: Sat, 15 Jun 2019 22:10:20 +0200
Subject: [PATCH 2/2] Backbutton in toolbar for 2.x

---
 app/AndroidManifest.xml        | 38 +++++++++++++++++++++++++++-------
 app/froyo/AndroidManifest.xml  |  5 ++---
 app/latest/AndroidManifest.xml |  3 +--
 3 files changed, 34 insertions(+), 12 deletions(-)

diff --git a/app/AndroidManifest.xml b/app/AndroidManifest.xml
index 51b661175..a90a016d9 100644
--- a/app/AndroidManifest.xml
+++ b/app/AndroidManifest.xml
@@ -114,7 +114,7 @@
             <!-- Parent activity meta-data to support 4.0 and lower -->
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
-                android:value=".view.MainLayout"/>
+                android:value="org.runnerup.view.MainLayout"/>
         </activity>
 
         <activity
@@ -130,7 +130,7 @@
             <!-- Parent activity meta-data to support 4.0 and lower -->
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
-                android:value=".view.MainLayout"/>
+                android:value="org.runnerup.view.MainLayout"/>
         </activity>
 
         <activity
@@ -141,13 +141,18 @@
             <!-- Parent activity meta-data to support 4.0 and lower -->
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
-                android:value=".view.MainLayout"/>
+                android:value="org.runnerup.view.MainLayout"/>
         </activity>
 
         <activity
             android:name=".view.AccountActivity"
             android:parentActivityName=".view.AccountListActivity"
-            android:theme="@style/AppTheme"/>
+            android:theme="@style/AppTheme">
+            <!-- Parent activity meta-data to support 4.0 and lower -->
+            <meta-data
+                android:name="android.support.PARENT_ACTIVITY"
+                android:value="org.runnerup.view.AccountListActivity"/>
+        </activity>
 
         <activity android:name=".view.UploadActivity"/>
 
@@ -156,6 +161,10 @@
             android:label="@string/Manage_workouts"
             android:parentActivityName=".view.MainLayout"
             android:theme="@style/AppTheme">
+            <!-- Parent activity meta-data to support 4.0 and lower -->
+            <meta-data
+                android:name="android.support.PARENT_ACTIVITY"
+                android:value="org.runnerup.view.MainLayout"/>
             <intent-filter tools:ignore="GoogleAppIndexingWarning,AppLinkUrlError">
                 <action android:name="android.intent.action.VIEW"/>
                 <action android:name="android.intent.action.EDIT"/>
@@ -190,19 +199,34 @@
         <activity
             android:name=".export.oauth2client.OAuth2Activity"
             android:parentActivityName=".view.AccountListActivity"
-            android:theme="@style/AppTheme"/>
+            android:theme="@style/AppTheme">
+            <!-- Parent activity meta-data to support 4.0 and lower -->
+            <meta-data
+                android:name="android.support.PARENT_ACTIVITY"
+                android:value="org.runnerup.view.AccountListActivity"/>
+        </activity>
 
         <activity
             android:name=".view.HRSettingsActivity"
             android:label="@string/Heart_Rate_Monitor"
             android:parentActivityName=".view.SettingsActivity"
-            android:theme="@style/AppTheme"/>
+            android:theme="@style/AppTheme">
+            <!-- Parent activity meta-data to support 4.0 and lower -->
+            <meta-data
+                android:name="android.support.PARENT_ACTIVITY"
+                android:value="org.runnerup.view.SettingsActivity"/>
+        </activity>
 
         <activity
             android:name=".view.HRZonesActivity"
             android:label="@string/Heart_Rate_Zones"
             android:parentActivityName=".view.SettingsActivity"
-            android:theme="@style/AppTheme"/>
+            android:theme="@style/AppTheme">
+            <!-- Parent activity meta-data to support 4.0 and lower -->
+            <meta-data
+                android:name="android.support.PARENT_ACTIVITY"
+                android:value="org.runnerup.view.SettingsActivity"/>
+        </activity>
 
         <service android:name=".tracker.Tracker"/>
         <service android:name=".export.RunnerUpLiveSynchronizer$LiveService"/>
diff --git a/app/froyo/AndroidManifest.xml b/app/froyo/AndroidManifest.xml
index c97085c45..d5414bc3c 100644
--- a/app/froyo/AndroidManifest.xml
+++ b/app/froyo/AndroidManifest.xml
@@ -15,10 +15,9 @@
   ~  along with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="org.runnerup">
+    xmlns:tools="http://schemas.android.com/tools">
 
-    <uses-sdk tools:overrideLibrary="com.mapbox.mapboxsdk, com.jjoe64.graphview" />
+    <uses-sdk tools:overrideLibrary="com.mapbox.mapboxsdk, com.jjoe64.graphview, android.support.graphics.drawable.animated" />
 
     <application
         android:label="@string/app_name"
diff --git a/app/latest/AndroidManifest.xml b/app/latest/AndroidManifest.xml
index 86357e87d..7546ca28e 100644
--- a/app/latest/AndroidManifest.xml
+++ b/app/latest/AndroidManifest.xml
@@ -15,8 +15,7 @@
   ~  along with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="org.runnerup">
+    xmlns:tools="http://schemas.android.com/tools">
 
 
     <application