[tor-commits] [orbot/master] Merge branch 'eighthave-the-big-start-stop-makeover'

[n8fr8 at torproject.org]

commit a8384bde7400abb9282a509e5b897ca5e987923e
Merge: 9a786d4 225ad9d
Author: Nathan Freitas <nathan at freitas.net>
Date:   Mon Jun 22 12:39:17 2015 -0400

    Merge branch 'eighthave-the-big-start-stop-makeover'

 .tx/config                                         |   13 +
 AndroidManifest.xml                                |   37 +-
 description/source.xlf                             |   86 +++
 external/.tx/config                                |   15 -
 external/tor                                       |    2 +-
 res/layout/layout_main.xml                         |   80 +-
 res/layout/layout_promo_apps.xml                   |  115 +++
 res/layout/layout_wizard.xml                       |   22 -
 res/layout/layout_wizard_locale.xml                |   57 --
 res/layout/layout_wizard_tips.xml                  |  115 ---
 res/menu/orbot_main.xml                            |    4 +-
 res/values/strings.xml                             |    6 +-
 res/xml/preferences.xml                            |    5 +
 src/org/torproject/android/OrbotApp.java           |   16 +-
 src/org/torproject/android/OrbotConstants.java     |   21 +-
 src/org/torproject/android/OrbotMainActivity.java  |  798 +++++++------------
 src/org/torproject/android/Prefs.java              |  121 +++
 .../torproject/android/service/OnBootReceiver.java |   22 +-
 .../android/service/StartTorReceiver.java          |   36 +
 .../android/service/TorResourceInstaller.java      |   15 +-
 src/org/torproject/android/service/TorService.java |  808 +++++++-------------
 .../android/service/TorServiceConstants.java       |   99 ++-
 .../torproject/android/service/TorTransProxy.java  |   36 +-
 .../torproject/android/ui/OrbotLogActivity.java    |   75 --
 .../torproject/android/ui/PromoAppsActivity.java   |  213 ++++++
 .../ui/wizard/ChooseLocaleWizardActivity.java      |  108 ---
 .../android/ui/wizard/PromoAppsActivity.java       |  270 -------
 .../torproject/android/vpn/OrbotVpnService.java    |    3 +-
 28 files changed, 1353 insertions(+), 1845 deletions(-)