nextcloud-android/res/layout
Luke Owncloud 2d0c347bc4 Merge remote-tracking branch 'upstream/develop' into HEAD
Conflicts:
	owncloud-android-library
	src/com/owncloud/android/datamodel/OCFile.java
	src/com/owncloud/android/files/InstantUploadBroadcastReceiver.java
	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/adapter/FileListListAdapter.java
	src/com/owncloud/android/ui/fragment/ExtendedListFragment.java
	src/com/owncloud/android/ui/fragment/OCFileListFragment.java
2014-12-08 16:24:10 +01:00
..
account_setup.xml Internal refactorization of AccountAuthenticatorActivity (and related dependencies) 2014-04-04 14:18:42 +02:00
action_item.xml Copyright note fixes 2013-04-17 12:26:13 +02:00
activity_row.xml Added filtered chooser dialog for activities that can receive a link 2014-02-03 14:24:28 +01:00
edit_box_dialog.xml Copyright note fixes 2013-04-17 12:26:13 +02:00
errorhandling_showerror.xml added first draft of uploadListActivity 2014-11-07 15:26:21 +01:00
file_details_empty.xml REFACTORING: fix layout problems in orientation changes after removing FileDetailActivity 2013-06-04 14:30:29 +02:00
file_details_fragment.xml Cancel button for downloads in progress replaceed with 'x' icon 2013-06-05 11:08:33 +02:00
file_download_fragment.xml Fixed bug. When downloading two files, it is not possible to come back to the file list. Bars does not appear. 2014-09-18 09:36:35 +02:00
file_preview.xml Update packageName 2013-10-29 14:10:42 +01:00
files.xml OC-1670: owncloud_white --> background_color 2013-10-11 15:08:32 +02:00
files_folder_picker.xml Create FolderPickerActivity from which MoveActivity and UploadPathActivity extend 2014-11-18 14:51:49 +01:00
generic_explanation.xml Update images. New Styles for Buttons, Dropdown and Progress 2013-10-30 18:37:05 +01:00
list_footer.xml - minor design changes 2014-10-19 08:56:57 +02:00
list_fragment.xml Merge remote-tracking branch 'upstream/develop' into fileCount 2014-10-24 18:18:06 +02:00
list_fragment_expandable.xml add ExpandableListFragment which is inherits from ExtendedListFragment 2014-11-27 11:56:24 +01:00
list_item.xml Adjust the thumbnails size to the size used on screen 2014-11-03 11:27:51 +01:00
loading_dialog.xml OC-1129: Add LoadingDialog.java 2013-09-18 18:13:24 +02:00
log_item.xml Cleaned stuff , add a history delete button and renamed 2013-04-01 10:26:40 +02:00
log_send_file.xml Changes after CR 2014-09-17 16:46:11 +02:00
media_control.xml Fixed units in media control view 2013-10-02 18:19:20 +02:00
notification_with_progress_bar.xml Fixed contrast of text in notifications for Android 2.x and 3.x 2014-03-20 12:56:44 +01:00
pincodelock.xml Remove custom_buttons option from setup.xml. Review account_setup and pincodelock 2013-10-31 16:59:38 +01:00
popup.xml Copyright note fixes 2013-04-17 12:26:13 +02:00
preview_image_activity.xml Use Extended view pager and set onTouchListener into image forshow/hide the action bar 2014-07-29 08:26:10 +02:00
preview_image_fragment.xml Add customize Imageview and TouchImageView for fixing problem of seeing big pictures on nexus 7 2014-09-22 09:27:23 +02:00
ssl_untrusted_cert_layout.xml OC-3212: Show appropiate error messages for SslError in SSL error dialog shown by WebViewClient 2014-03-10 10:53:11 +01:00
ssl_validator_layout.xml OC-3208: Unify both SSL dialogs taking information from X509Certificate in just one 2014-03-07 14:48:42 +01:00
sso_dialog.xml Fixed wrong reload of SAML web dialog after rotation when the SSL-error dialog is visible over it 2014-03-12 10:32:05 +01:00
upload_files_layout.xml undo unintended change 2014-11-07 15:32:41 +01:00
upload_list_group.xml git added filesize 2014-11-30 20:18:27 +01:00
upload_list_item.xml git added filesize 2014-11-30 20:18:27 +01:00
upload_list_layout.xml consistently use UploadList (instead UploadsList) 2014-11-07 15:38:21 +01:00
uploader_layout.xml Update images. New Styles for Buttons, Dropdown and Progress 2013-10-30 18:37:05 +01:00
uploader_list_item_layout.xml Copyright note fixes 2013-04-17 12:26:13 +02:00
video_layout.xml - use match_parent instead 2014-11-10 20:14:45 +01:00