Left: | ||
Right: |
OLD | NEW |
---|---|
1 /* -*- Mode: Java; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: nil; -*- | 1 /* -*- Mode: Java; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: nil; -*- |
2 * This Source Code Form is subject to the terms of the Mozilla Public | 2 * This Source Code Form is subject to the terms of the Mozilla Public |
3 * License, v. 2.0. If a copy of the MPL was not distributed with this | 3 * License, v. 2.0. If a copy of the MPL was not distributed with this |
4 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ | 4 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ |
5 | 5 |
6 package org.mozilla.gecko; | 6 package org.mozilla.gecko; |
7 | 7 |
8 import java.io.File; | 8 import java.io.File; |
9 import java.io.FileNotFoundException; | 9 import java.io.FileNotFoundException; |
10 import java.lang.reflect.Method; | 10 import java.lang.reflect.Method; |
(...skipping 604 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
615 } | 615 } |
616 | 616 |
617 /** | 617 /** |
618 * Check and show Onboarding start pane if Firefox has never been launched a nd | 618 * Check and show Onboarding start pane if Firefox has never been launched a nd |
619 * is not opening an external link from another application. | 619 * is not opening an external link from another application. |
620 * | 620 * |
621 * @param context Context of application; used to show Start Pane if appropr iate | 621 * @param context Context of application; used to show Start Pane if appropr iate |
622 * @param intentAction Intent that launched this activity | 622 * @param intentAction Intent that launched this activity |
623 */ | 623 */ |
624 private void checkStartPane(Context context, String intentAction) { | 624 private void checkStartPane(Context context, String intentAction) { |
625 // We never want the start pane to show up in Adblock Browser. | |
Felix Dahlke
2015/03/01 12:00:50
There are two places where we can keep the start p
René Jeschke
2015/03/01 18:27:30
I really don't like having dead code lying around,
Felix Dahlke
2015/03/02 03:46:59
We can change it in GeckoProfile, as I said. But t
| |
626 if (true) | |
627 return; | |
628 | |
625 final StrictMode.ThreadPolicy savedPolicy = StrictMode.allowThreadDiskRe ads(); | 629 final StrictMode.ThreadPolicy savedPolicy = StrictMode.allowThreadDiskRe ads(); |
626 | 630 |
627 try { | 631 try { |
628 final SharedPreferences prefs = GeckoSharedPrefs.forProfile(this); | 632 final SharedPreferences prefs = GeckoSharedPrefs.forProfile(this); |
629 | 633 |
630 if (prefs.getBoolean(PREF_STARTPANE_ENABLED, false)) { | 634 if (prefs.getBoolean(PREF_STARTPANE_ENABLED, false)) { |
631 if (!Intent.ACTION_VIEW.equals(intentAction)) { | 635 if (!Intent.ACTION_VIEW.equals(intentAction)) { |
632 final DialogFragment dialog = new StartPane(); | 636 final DialogFragment dialog = new StartPane(); |
633 dialog.show(getSupportFragmentManager(), ONBOARD_STARTPANE_T AG); | 637 dialog.show(getSupportFragmentManager(), ONBOARD_STARTPANE_T AG); |
634 } | 638 } |
(...skipping 2529 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
3164 final SessionInformation previ ousSession) { | 3168 final SessionInformation previ ousSession) { |
3165 return new BrowserHealthRecorder(context, | 3169 return new BrowserHealthRecorder(context, |
3166 GeckoSharedPrefs.forApp(context), | 3170 GeckoSharedPrefs.forApp(context), |
3167 profilePath, | 3171 profilePath, |
3168 dispatcher, | 3172 dispatcher, |
3169 osLocale, | 3173 osLocale, |
3170 appLocale, | 3174 appLocale, |
3171 previousSession); | 3175 previousSession); |
3172 } | 3176 } |
3173 } | 3177 } |
OLD | NEW |