commit 519c65b46dc3554e93ab39e31793c436830f00fc
author Filipe Gonçalves <filipe@kwamecorp.com> Mon Jun 06 11:29:20 2016 +0000
committer Filipe Gonçalves <filipe@kwamecorp.com> Mon Jun 06 11:29:20 2016 +0000
tree 3a836177360813d13c5b0809c3e0a1681744df0e
parent 4097fa277207c90e7246c878d05c1ca3a1f25aa5
parent 8537be880c538a9fd38150d465648f5dbe9a5647

Merge branch 'fp2-1637' into 'master'

FPII-1637: Back to Updater home page automatically after lock and unlock screen

Display the last saved fragment instead of a new MainFragment during onResume().

See merge request !19

src/com/fairphone/updater/FairphoneUpdater.java

diff --git a/src/com/fairphone/updater/FairphoneUpdater.java b/src/com/fairphone/updater/FairphoneUpdater.java
index d932d79..3a18116 100644
--- a/src/com/fairphone/updater/FairphoneUpdater.java
+++ b/src/com/fairphone/updater/FairphoneUpdater.java
@@ -559,6 +559,10 @@
                 {
                     firstFragment = startGappsInstall();  
                 }
+                else if (getTopFragment() != null)
+                {
+                    firstFragment = getTopFragment();
+                }
                 else
                 {
                     firstFragment = new MainFragment();