[tor-commits] [orbot/master] Merge branch 'new_notification_expanded' of github.com:amoghbl1/orbot-1 into amoghbl1-new_notification_expanded

[n8fr8@xxxxxxxxxxxxxx]

commit 3bc8760beb47eae482bfe086a106cc65d08522ee
Merge: 41064d8 367002b
Author: Nathan Freitas <nathan@xxxxxxxxxxx>
Date:   Thu Jul 10 11:05:59 2014 -0400

    Merge branch 'new_notification_expanded' of github.com:amoghbl1/orbot-1 into amoghbl1-new_notification_expanded

 .classpath                                         |    2 +-
 AndroidManifest.xml                                |    2 +-
 external/libevent                                  |    2 +-
 external/openssl                                   |    2 +-
 external/polipo                                    |    2 +-
 external/tor                                       |    2 +-
 res/drawable/icon_orweb.png                        |  Bin 6596 -> 6596 bytes
 res/drawable/icon_story_maker.png                  |  Bin 4290 -> 4290 bytes
 res/drawable/torerror.png                          |  Bin 14633 -> 14633 bytes
 res/layout/layout_notification_expanded.xml        |  136 ++++++++
 .../notification_template_part_chronometer.xml     |   25 ++
 res/layout/notification_template_part_time.xml     |   25 ++
 res/values/dimens.xml                              |  361 ++++++++++++++++++++
 res/values/styles.xml                              |    5 +
 src/org/torproject/android/Orbot.java              |    1 +
 src/org/torproject/android/service/TorService.java |  105 +++++-
 16 files changed, 647 insertions(+), 23 deletions(-)

diff --cc res/menu/main.xml
index a42eb1f,df929ab..a42eb1f
mode 100755,100644..100644
--- a/res/menu/main.xml
+++ b/res/menu/main.xml



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