Bug 1299350 - If there is a homepage, show it at the end of the wizard. r=rnewman a=lizzard
authorMichael Kaply <mozilla@kaply.com>
Wed, 31 Aug 2016 15:48:13 -0500
changeset 348011 1dd122df980683688de68d91fa8a3bf90eac19b4
parent 348010 68613c98775b2221a6687f9b34bb28c029533056
child 348012 3cb50e5df49728e19c6f5bcb4c5b3fe34a9db53c
push id6389
push userraliiev@mozilla.com
push dateMon, 19 Sep 2016 13:38:22 +0000
treeherdermozilla-beta@01d67bfe6c81 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersrnewman, lizzard
bugs1299350
milestone50.0a2
Bug 1299350 - If there is a homepage, show it at the end of the wizard. r=rnewman a=lizzard
mobile/android/base/java/org/mozilla/gecko/BrowserApp.java
--- a/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java
+++ b/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java
@@ -2667,17 +2667,18 @@ public class BrowserApp extends GeckoApp
 
         if (mFirstrunAnimationContainer == null) {
             final ViewStub firstrunPagerStub = (ViewStub) findViewById(R.id.firstrun_pager_stub);
             mFirstrunAnimationContainer = (FirstrunAnimationContainer) firstrunPagerStub.inflate();
             mFirstrunAnimationContainer.load(getApplicationContext(), getSupportFragmentManager());
             mFirstrunAnimationContainer.registerOnFinishListener(new FirstrunAnimationContainer.OnFinishListener() {
                 @Override
                 public void onFinish() {
-                    if (mFirstrunAnimationContainer.showBrowserHint()) {
+                    if (mFirstrunAnimationContainer.showBrowserHint() &&
+                        TextUtils.isEmpty(getHomepage())) {
                         enterEditingMode();
                     }
                 }
             });
         }
 
         mHomeScreenContainer.setVisibility(View.VISIBLE);
     }