Merge branch 'DEV' into eelo-0.1

res/values/colors.xml

@@ -2,6 +2,7 @@
 <!--
      Copyright (C) 2013 The CyanogenMod Project
      Copyright (C) 2017 The LineageOS Project
+	 Copyright (C) 2018 /e/
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -21,8 +22,8 @@
     <color name="page_background">#e4e7e9</color>
 
     <color name="primary">@color/page_background</color>
-    <color name="primary_dark">#c2c5c7</color>
-    <color name="accent">#167C80</color>
+    <color name="primary_dark">@color/black</color>
+    <color name="accent">@color/black</color>
     <color name="primary_text">#8a000000</color>
     <color name="secondary_text">#42000000</color>
     <color name="button_bar_text_enabled">#ff1e1e1e</color>
@@ -31,5 +32,5 @@
     <color name="header_bg">@color/primary</color>
     <color name="header_condensed_bg">@color/primary</color>
     <color name="button_bar_background">@color/primary</color>
-    <color name="fingerprint_setup_text_color">#167C80</color>
+    <color name="fingerprint_setup_text_color">@color/black</color>
 </resources>

src/com/cyanogenmod/setupwizard/FinishActivity.java

@@ -76,7 +76,7 @@ public class FinishActivity extends BaseSetupWizardActivity {
         hasError = false;
         
         try {
-            Intent intent = new Intent("io.eelo.drive.LAUNCHER"); // TODO static
+            Intent intent = new Intent("xxx.io.eelo.drive.LAUNCHER"); // TODO static
             intent.putExtra("EELO_SETTINGS_LAUNCHER", "SETUP_WIZARD");
             
             startActivityForResult(intent, EELO_SYNCHRONIZER_REQUEST_CODE);
@@ -89,7 +89,7 @@ public class FinishActivity extends BaseSetupWizardActivity {
         
         mSetupWizardApp = (SetupWizardApp) getApplication();
 
-		mSetupWizardApp.getSettingsBundle().putBoolean(KEY_SEND_METRICS, false);  // /e/ do *not* send metrics by default.
+		//mSetupWizardApp.getSettingsBundle().putBoolean(KEY_SEND_METRICS, false);  // /e/ do *not* send metrics by default.
 
         mReveal = (ImageView) findViewById(R.id.reveal);
         mEnableAccessibilityController =