[tbb-commits] [tor-browser/tor-browser-60.3.0esr-8.5-1] Bug 27111: Configure tor browser for mobile to load about:tor

[gk at torproject.org]

commit c0c87e1a9a6573ac480e4b46d232a4b451f6475c
Author: Igor Oliveira <igt0 at torproject.org>
Date:   Thu Nov 15 07:33:54 2018 -0200

    Bug 27111: Configure tor browser for mobile to load about:tor
    
    - Add preferences.json: it is used to configure android specific
    preferences
    
    - Keep the ActivityStream HomePager closed when the user clicks in the
    url bar
---
 mobile/android/base/java/org/mozilla/gecko/BrowserApp.java     |  2 --
 mobile/android/torbrowser/assets/distribution/preferences.json | 10 ++++++++++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java b/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java
index 4a497f6999e0..5efd83398775 100644
--- a/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java
+++ b/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java
@@ -2734,8 +2734,6 @@ public class BrowserApp extends GeckoApp
 
         mBrowserToolbar.startEditing(url, animator);
 
-        showHomePagerWithAnimator(panelId, null, animator);
-
         animator.start();
         Telemetry.startUISession(TelemetryContract.Session.AWESOMESCREEN);
     }
diff --git a/mobile/android/torbrowser/assets/distribution/preferences.json b/mobile/android/torbrowser/assets/distribution/preferences.json
new file mode 100644
index 000000000000..bebd14967d8e
--- /dev/null
+++ b/mobile/android/torbrowser/assets/distribution/preferences.json
@@ -0,0 +1,10 @@
+{
+  "ApplicationPreferences": {
+    "newtab.load_homepage": true
+  },
+  "AndroidPreferences": {
+    "homepage": "about:tor",
+    "startpane_enabled_after_57": true,
+    "startpane_enabled": true
+  }
+}