Merge pull request #799 from gerhardol/feature/froyo-floatbutton

Froyo: Disable FloatingActionButton
jonasoreland · Jun 15, 2019 · bfaf543 · bfaf543
2 parents 0e9b29a + 997f875
commit bfaf543
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 12 deletions.
diff --git 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/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/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
@@ -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

diff --git a/app/res/layout-v15/history.xml → app/latest/res/layout-v15/history.xml b/app/res/layout-v15/history.xml → app/latest/res/layout-v15/history.xml
diff --git a/app/res/layout-v15/start_fab.xml → app/latest/res/layout-v15/start_fab.xml b/app/res/layout-v15/start_fab.xml → app/latest/res/layout-v15/start_fab.xml