masensio c20041d157 Merge branch 'remove_ActionBarSherlock' into navigationDrawer_update ... Conflicts: res/menu/main_menu.xml src/com/owncloud/android/ui/activity/FileDisplayActivity.java src/com/owncloud/android/ui/activity/FolderPickerActivity.java src/com/owncloud/android/ui/activity/Preferences.java src/com/owncloud/android/ui/preview/PreviewImageActivity.java		2015-05-27 14:19:30 +02:00
..
account_setup.xml	Add actionBar	2015-05-25 12:39:05 +02:00
action_item.xml	Update year in license	2015-03-05 13:27:45 +01:00
activity_row.xml	Update year in license	2015-03-05 13:27:45 +01:00
drawer_account_group.xml	update	2015-01-05 19:53:40 +01:00
drawer_list_item.xml	Add content_description to Navigation Drawer options	2015-05-26 11:46:15 +02:00
drawer_radiobutton.xml	update	2015-01-05 19:53:40 +01:00
edit_box_dialog.xml	Update year in license	2015-03-05 13:27:45 +01:00
file_details_empty.xml	Update year in license	2015-03-05 13:27:45 +01:00
file_details_fragment.xml	Update year in license	2015-03-05 13:27:45 +01:00
file_download_fragment.xml	Update year in license	2015-03-05 13:27:45 +01:00
file_preview.xml	Update year in license	2015-03-05 13:27:45 +01:00
files.xml	Merge branch 'remove_ActionBarSherlock' into navigationDrawer_update	2015-05-27 14:19:30 +02:00
files_folder_picker.xml	Update year in license	2015-03-05 13:27:45 +01:00
generic_explanation.xml	Update year in license	2015-03-05 13:27:45 +01:00
grid_image.xml	Update year in license	2015-03-05 13:27:45 +01:00
grid_item.xml	Update year in license	2015-03-05 13:27:45 +01:00
list_footer.xml	- minor design changes	2014-10-19 08:56:57 +02:00
list_fragment.xml	Update year in license	2015-03-05 13:27:45 +01:00
list_item.xml	Update year in license	2015-03-05 13:27:45 +01:00
listrow_details.xml	update	2015-01-05 19:53:40 +01:00
listrow_group.xml	update	2015-01-05 19:53:40 +01:00
loading_dialog.xml	Update year in license	2015-03-05 13:27:45 +01:00
log_item.xml	Update year in license	2015-03-05 13:27:45 +01:00
log_send_file.xml	Update year in license	2015-03-05 13:27:45 +01:00
media_control.xml	Update year in license	2015-03-05 13:27:45 +01:00
notification_with_progress_bar.xml	Update year in license	2015-03-05 13:27:45 +01:00
passcodelock.xml	Prevent that input fields are maximized in landscape	2015-05-05 12:27:57 +02:00
password_dialog.xml	Create layout for password	2015-03-05 17:02:40 +01:00
popup.xml	Update year in license	2015-03-05 13:27:45 +01:00
preference_widget_radiobutton.xml	- Account list is now a radiobutton list	2014-11-25 17:42:41 +01:00
preview_image_activity.xml	Update year in license	2015-03-05 13:27:45 +01:00
preview_image_fragment.xml	Improved load of images in PreviewImageFragment - no more images in full size by default, up to 3 tries to downScale	2015-05-18 14:29:00 +02:00
ssl_untrusted_cert_layout.xml	Update year in license	2015-03-05 13:27:45 +01:00
ssl_validator_layout.xml	Update year in license	2015-03-05 13:27:45 +01:00
sso_dialog.xml	Update year in license	2015-03-05 13:27:45 +01:00
upload_files_layout.xml	Update year in license	2015-03-05 13:27:45 +01:00
uploader_layout.xml	Merge remote-tracking branch 'upstream/develop' into navigationDrawer_update	2015-05-21 21:12:44 +02:00
uploader_list_item_layout.xml	Merge remote-tracking branch 'upstream/develop' into navigationDrawer_update	2015-05-21 21:12:44 +02:00
video_layout.xml	Update year in license	2015-03-05 13:27:45 +01:00