[tor-commits] [orbot/master] Merge branch 'tladesignz-master'

[n8fr8@xxxxxxxxxxxxxx]

commit df847ff1472c5731fc4787eb026c965db2913d1f
Merge: 732c1538 b2646a3c
Author: n8fr8 <nathan@xxxxxxxxxxxxxxxxxxxx>
Date:   Fri Apr 24 23:14:18 2020 -0400

    Merge branch 'tladesignz-master'

 BUILD                                              |   3 +
 app/build.gradle                                   |  11 +-
 app/src/main/AndroidManifest.xml                   | 139 +--
 .../org/torproject/android/OrbotMainActivity.java  | 937 ++++++++++-----------
 .../ui/onboarding/BridgeWizardActivity.java        | 133 ++-
 .../android/ui/onboarding/CustomSlideBigText.java  |   6 +-
 .../android/ui/onboarding/MoatActivity.java        | 428 ++++++++++
 .../android/ui/onboarding/ProxiedHurlStack.java    |  33 +
 app/src/main/res/layout/activity_moat.xml          |  81 ++
 app/src/main/res/layout/content_bridge_wizard.xml  |   9 +-
 app/src/main/res/menu/moat.xml                     |  28 +
 app/src/main/res/values/strings.xml                |  16 +-
 build.gradle                                       |   2 +-
 gradle/wrapper/gradle-wrapper.properties           |   4 +-
 orbotservice/build.gradle                          |   2 +-
 orbotservice/src/main/res/values/strings.xml       |   8 +
 16 files changed, 1228 insertions(+), 612 deletions(-)



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits