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

..

about.xml

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

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

addrepo.xml

Fix issue 246: Rewrite process for verifying existing repos.

2015-05-10 21:56:40 +10:00

apklistitem.xml

fix #127: Add text wrapping in application view

2015-04-04 22:30:18 +02:00

app_details_header.xml

improve AppDetails

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

app_details_summary.xml

update icons

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

app_details.xml

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

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

app_permission_item_money.xml

Add install confirm+perms screen to SystemInstaller

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

app_permission_item_old.xml

Add install confirm+perms screen to SystemInstaller

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

app_permission_item.xml

Add install confirm+perms screen to SystemInstaller

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

app_perms_summary.xml

Add install confirm+perms screen to SystemInstaller

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

appinfo.xml

Remove all trailing whitespaces in source files

2014-12-30 23:48:36 +01:00

applistitem.xml

fix #168: Not enough space for version number and license

2015-04-04 22:11:10 +02:00

available_app_list.xml

Made category Spinner style correctly.

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

empty_app_list.xml

Added a message when any of the app lists are empty.

2015-03-16 21:42:10 +11:00

fdroid.xml

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

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

install_app_details.xml

Add install confirm+perms screen to SystemInstaller

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

install_confirm.xml

Add install confirm+perms screen to SystemInstaller

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

install_start.xml

Add install confirm+perms screen to SystemInstaller

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

list_content.xml

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

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

local_repo_activity.xml

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

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

permissions_list.xml

Add install confirm+perms screen to SystemInstaller

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

qr_wizard_activity.xml

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

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

repo_item.xml

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

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

repodetails.xml

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

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

repodiscoveryitem.xml

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

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

repodiscoverylist.xml

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

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

repolisticons.xml

Remove all trailing whitespaces in source files

2014-12-30 23:48:36 +01:00

searchresults.xml

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

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

select_local_apps_list_item.xml

WIP: Refactoring Bonjour from manage repos to swap.

2015-06-22 08:59:37 +10:00

simple_list_item_3.xml

Cleanup after rebase.

2015-05-13 16:54:17 +10:00

swap_activity.xml

Refactored SwapService + SwapManager into single SwapService

2015-07-09 11:43:34 +10:00

swap_app_list_item.xml

Removed SwapAppListActivity, implemented UI mockup for swap app list.

2015-07-13 22:52:51 +10:00

swap_blank.xml

WIP: Serialize bonjour peers correctly. Refactor mini-service APIs.

2015-06-30 19:04:06 +10:00

swap_bluetooth_header.xml

small UI clean-up of header display

2015-07-13 16:05:00 -04:00

swap_confirm_receive.xml

Removed ConnectSwapActivity, refactored into SwapWorkflowActivity.

2015-07-12 23:18:09 +10:00

swap_connecting.xml

WIP: More cleaning up of swap process, unbinding service, and investigating getting rid of ConnectSwapActivity.

2015-07-10 01:14:32 +10:00

swap_create_header.xml

move all text bits to strings.xml so they are translatable

2015-04-14 18:08:03 -04:00

swap_initial_loading.xml

Refactored SwapService + SwapManager into single SwapService

2015-07-09 11:43:34 +10:00

swap_join_wifi.xml

Clean up after merging swap stuff.

2015-07-18 00:08:25 +10:00

swap_learn_about_wifi.xml

move all text bits to strings.xml so they are translatable

2015-04-14 18:08:03 -04:00

swap_nfc.xml

Removed old SwapActivity + Fragments.

2015-05-25 16:07:49 +10:00

swap_peer_list_item.xml

WIP: Serialize bonjour peers correctly. Refactor mini-service APIs.

2015-06-30 19:04:06 +10:00

swap_select_apps.xml

Removed old SwapActivity + Fragments.

2015-05-25 16:07:49 +10:00

swap_success_header.xml

move all text bits to strings.xml so they are translatable

2015-04-14 18:08:03 -04:00

swap_success.xml

WIP: Serialize bonjour peers correctly. Refactor mini-service APIs.

2015-06-30 19:04:06 +10:00

swap_wifi_qr.xml

Remove bonjour preference. Separate bluetooth and wifi more clearly.

2015-07-18 01:48:56 +10:00