Peter Serwylo 0e5c039536 Merge branch 'master' into new-swap ...

Fixed lots of (minor) conflicts. Some due to earlier rebasing of
material stuff that was subsequently merged into master with a
different commit hash (I guess, that's what it looked like anyway).

2015-07-27 18:42:16 +10:00

..

circle.png

WIP: Don't show self in Bonjour peer list. Implement UI for peer list.

2015-06-27 10:12:26 +10:00

hotspot.png

initial sketch of how to display hotspot mode on the swap wifi screen

2015-05-10 00:37:05 -04:00

ic_add_circle_outline_white.png

WIP: Implementing UI mockup, different "selected" indicator for swap.

2015-06-11 08:21:10 +10:00

ic_add_white.png

Added material icons from CC licensed "Google material icons" set.

2015-06-15 21:19:14 +02:00

ic_arrow_forward_white.png

WIP: Implementing mockups from Carrie, added "Toolbar"

2015-06-12 22:45:55 +10:00

ic_attach_money_white.png

Added material icons from CC licensed "Google material icons" set.

2015-05-12 01:26:31 +10:00

ic_bitcoin.png

fix link icons

2015-06-16 20:15:01 +02:00

ic_bluetooth_white.png

Added material icons from CC licensed "Google material icons" set.

2015-06-15 21:19:14 +02:00

ic_bullet_key_permission.png

Add install confirm+perms screen to SystemInstaller

2015-05-20 21:59:24 +02:00

ic_cancel_white.png

Added material icons from CC licensed "Google material icons" set.

2015-05-12 01:26:31 +10:00

ic_changelog.png

fix link icons

2015-06-16 20:15:01 +02:00

ic_check_circle_white.png

WIP: Implementing UI mockup, different "selected" indicator for swap.

2015-06-11 08:21:10 +10:00

ic_close_white.png

WIP: Implementing mockups from Carrie, added "Toolbar"

2015-06-12 22:45:55 +10:00

ic_coins_s.png

Add install confirm+perms screen to SystemInstaller

2015-05-20 21:59:24 +02:00

ic_delete_white.png

Added material icons from CC licensed "Google material icons" set.

2015-06-15 21:19:14 +02:00

ic_do_not_disturb_white.png

Added material icons from CC licensed "Google material icons" set.

2015-06-15 21:19:14 +02:00

ic_dogecoin.png

fix link icons

2015-06-16 20:15:01 +02:00

ic_donate.png

fix link icons

2015-06-16 20:15:01 +02:00

ic_edit_white.png

Added material icons from CC licensed "Google material icons" set.

2015-06-15 21:19:14 +02:00

ic_expand_less_grey600.png

improve AppDetails

2015-06-10 15:48:11 +02:00

ic_expand_more_grey600.png

improve AppDetails

2015-06-10 15:48:11 +02:00

ic_fdroid_grey.png

WIP: I18n of start swap screen, colouring of text, add header.

2015-06-22 08:54:23 +10:00

ic_flattr.png

fix link icons

2015-06-16 20:15:01 +02:00

ic_help_white.png

Added material icons from CC licensed "Google material icons" set.

2015-06-15 21:19:14 +02:00

ic_info_white.png

Added material icons from CC licensed "Google material icons" set.

2015-05-12 01:26:31 +10:00

ic_issues.png

fix link icons

2015-06-16 20:15:01 +02:00

ic_launcher.png

Update raster icons

2015-07-04 21:29:16 +03:00

ic_litecoin.png

fix link icons

2015-06-16 20:15:01 +02:00

ic_menu_refresh.png

Move F-Droid project into subdir, keeping a root gradle project

2014-12-09 15:36:07 +01:00

ic_network_wifi_white.png

WIP: More work on UI for initial swap screen.

2015-06-21 10:05:38 +10:00

ic_nfc_white.png

Added material icons from CC licensed "Google material icons" set.

2015-06-15 21:19:14 +02:00

ic_play_arrow_white.png

Added material icons from CC licensed "Google material icons" set.

2015-06-15 21:19:14 +02:00

ic_qr_grey.png

WIP: I18n of start swap screen, colouring of text, add header.

2015-06-22 08:54:23 +10:00

ic_refresh_white.png

Added material icons from CC licensed "Google material icons" set.

2015-06-15 21:19:14 +02:00

ic_repo_app_default.png

Update raster icons

2015-07-04 21:29:16 +03:00

ic_search_white.png

Added material icons from CC licensed "Google material icons" set.

2015-06-15 21:19:14 +02:00

ic_settings_white.png

Added material icons from CC licensed "Google material icons" set.

2015-06-15 21:19:14 +02:00

ic_share_white.png

Added material icons from CC licensed "Google material icons" set.

2015-06-15 21:19:14 +02:00

ic_source_code.png

improve AppDetails

2015-06-10 15:48:11 +02:00

ic_stat_notify_updates.png

Update raster icons

2015-07-04 21:29:16 +03:00

ic_stat_notify.png

Update raster icons

2015-07-04 21:29:16 +03:00

ic_swap.png

Run optipng -o9 on all png images

2015-03-11 23:35:03 +01:00

ic_view_headline_white.png

Added material icons from CC licensed "Google material icons" set.

2015-06-15 21:19:14 +02:00

ic_website.png

update icons

2015-06-14 14:57:15 +02:00

nfc_touch.png

Run optipng -o9 on all png images

2015-03-11 23:35:03 +01:00

swap_start_header.png

WIP: I18n of start swap screen, colouring of text, add header.

2015-06-22 08:54:23 +10:00

swap_success.png

Run optipng -o9 on all png images

2015-03-11 23:35:03 +01:00

tab_unselected_holo.9.png

Add install confirm+perms screen to SystemInstaller

2015-05-20 21:59:24 +02:00

wifi_ap_personal.png

Move F-Droid project into subdir, keeping a root gradle project

2014-12-09 15:36:07 +01:00

wifi_ap_private.png

Move F-Droid project into subdir, keeping a root gradle project

2014-12-09 15:36:07 +01:00

wifi_ap_public.png

Move F-Droid project into subdir, keeping a root gradle project

2014-12-09 15:36:07 +01:00

wifi.png

Move F-Droid project into subdir, keeping a root gradle project

2014-12-09 15:36:07 +01:00