From 64628b4132ea2a6cbd144e6c4cd736389d92e672 Mon Sep 17 00:00:00 2001
From: Matt Moening <matt.moening@MatterHackers.com>
Date: Fri, 31 Oct 2014 09:36:30 -0700
Subject: [PATCH 1/2] Improved auto-name feature to change on model change Will
 not change name if user types value into name box

---
 .../SetupStepMakeModelName.cs                 | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/PrinterControls/PrinterConnections/SetupStepMakeModelName.cs b/PrinterControls/PrinterConnections/SetupStepMakeModelName.cs
index 95c3acd20..d86f60eaf 100644
--- a/PrinterControls/PrinterConnections/SetupStepMakeModelName.cs
+++ b/PrinterControls/PrinterConnections/SetupStepMakeModelName.cs
@@ -29,6 +29,8 @@ namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections
 
         Button nextButton;
 
+		bool usingDefaultName;
+
         public SetupStepMakeModelName(ConnectionWindow windowController, GuiWidget containerWindowToClose, PrinterSetupStatus setupPrinter = null)
             : base(windowController, containerWindowToClose, setupPrinter)
         {
@@ -54,6 +56,8 @@ namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections
             footerRow.AddChild(hSpacer);
             footerRow.AddChild(cancelButton);
 
+			usingDefaultName = true;
+
             SetElementState();
         }
 
@@ -78,6 +82,7 @@ namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections
 
             printerNameInput = new MHTextEditWidget(this.ActivePrinter.Name);
             printerNameInput.HAnchor = HAnchor.ParentLeftRight;
+			printerNameInput.KeyPressed += new KeyPressEventHandler(PrinterNameInput_KeyPressed);
 
 			printerNameError = new TextWidget(LocalizedString.Get("Give your printer a name."), 0, 0, 10);
 			printerNameError.TextColor = ActiveTheme.Instance.PrimaryTextColor;
@@ -177,8 +182,17 @@ namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections
             LoadSetupSettings(ActivePrinter.Make, ActivePrinter.Model);            
             printerModelError.Visible = false;
             SetElementState();
+			if(usingDefaultName)
+			{
+				printerNameInput.Text = String.Format ("{0} {1} ({2})", this.ActivePrinter.Make, this.ActivePrinter.Model, ExistingPrinterCount () + 1); 
+			}
         }
 
+		private void PrinterNameInput_KeyPressed(object sender, KeyPressEventArgs e)
+		{
+			this.usingDefaultName = false;
+		}
+
         string defaultMaterialPreset;
         string defaultQualityPreset;
         string defaultMovementSpeeds;
@@ -425,10 +439,7 @@ namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections
 
         void NextButton_Click(object sender, EventArgs mouseEvent)
         {
-			if(printerNameInput.Text == "Default Printer ({0})".FormatWith(ExistingPrinterCount() + 1))
-			{
-				printerNameInput.Text = String.Format ("{0} {1} ({2})", this.ActivePrinter.Make, this.ActivePrinter.Model, ExistingPrinterCount () + 1); 
-			}
+
             bool canContinue = this.OnSave();
             if (canContinue)
             {

From 0a5b387366067f4ac6139bd447b344c8364c03f1 Mon Sep 17 00:00:00 2001
From: Kevin Pope <kevin.pope@gmail.com>
Date: Fri, 31 Oct 2014 10:19:50 -0700
Subject: [PATCH 2/2] Add support for apk downloads.

---
 AboutPage/UpdateControlData.cs | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/AboutPage/UpdateControlData.cs b/AboutPage/UpdateControlData.cs
index 52e5abb02..65a3e2011 100644
--- a/AboutPage/UpdateControlData.cs
+++ b/AboutPage/UpdateControlData.cs
@@ -117,10 +117,14 @@ namespace MatterHackers.MatterControl
         {
             get
             {
-                if (OsInformation.OperatingSystem == OSType.Mac)
-                {
-                    return "pkg";
-                }
+				if (OsInformation.OperatingSystem == OSType.Mac)
+				{
+					return "pkg";
+				}
+				else if (OsInformation.OperatingSystem == OSType.Android)
+				{
+					return "apk";
+				}
                 else
                 {
                     return "exe";