clean up. reorder activities

Author: vkocheryzhkin

FaceTracker/app/build.gradle

@@ -1,7 +1,4 @@
 apply plugin: 'com.android.application'
-
-def cpuType = 'arm64-v8a'
-
 // Output directory in the local directory for packaging into the APK.
 
 android {
@@ -25,15 +22,7 @@ android {
             cmake {
                 cppFlags "-frtti -fexceptions -std=c++11"
                 abiFilters 'x86', 'x86_64', 'armeabi-v7a', 'arm64-v8a'
-                //abiFilters "${cpuType}"
                 arguments "-DANDROID_STL=gnustl_shared"
-                //arguments "-DANDROID_STL=c++_shared"
-                // AL:  arguments "-DANDROID_STL=c++_shared", "-DBUILD_opencv_apps:BOOL=ON", "-DBUILD_SHARED_LIBS:BOOL=ON"
-                // Passes optional arguments to CMake.
-                //arguments "-DANDROID_ARM_NEON=TRUE", "-DANDROID_TOOLCHAIN=clang"
-
-                // Sets a flag to enable format macro constants for the C compiler.
-                //cFlags "-D__STDC_FORMAT_MACROS"
             }
         }    
         signingConfig signingConfigs.config

FaceTracker/app/src/main/AndroidManifest.xml

@@ -32,19 +32,22 @@
             android:name="com.google.android.gms.vision.DEPENDENCIES"
             android:value="face" />
 
+
         <activity
-            android:name="tensorflow.detector.spc.CameraActivityMain"
+            android:name="com.google.android.gms.samples.vision.face.facetracker.FaceTrackerActivity"
             android:icon="@drawable/icon"
-            android:label="@string/app_name"
-            android:theme="@style/AppTheme">
+            android:label="Face Recognition"
+            android:theme="@style/Theme.AppCompat.NoActionBar"
+            android:screenOrientation="fullSensor">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+
         <activity
-            android:name="com.google.android.gms.samples.vision.face.facetracker.FaceTrackerActivity"
+            android:name="org.opencv.android.facetracker.OpenCvActivity"
             android:icon="@drawable/icon"
             android:label="Face Recognition"
             android:theme="@style/Theme.AppCompat.NoActionBar"
@@ -57,11 +60,10 @@
         </activity>
 
         <activity
-            android:name="org.opencv.android.facetracker.OpenCvActivity"
+            android:name="tensorflow.detector.spc.CameraActivityMain"
             android:icon="@drawable/icon"
-            android:label="Face Recognition"
-            android:theme="@style/Theme.AppCompat.NoActionBar"
-            android:screenOrientation="fullSensor">
+            android:label="@string/app_name"
+            android:theme="@style/AppTheme">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />