mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-24 06:05:42 +03:00
Code Issues Projects Releases Packages Wiki Activity
nextcloud-android/res/layout
History
David A. Velasco 5665d9c306 Merge tag 'oc-android-1-3-22' into oauth_login 
Conflicts:
	AndroidManifest.xml
	src/com/owncloud/android/authenticator/AuthenticationRunnable.java
	src/com/owncloud/android/authenticator/OnAuthenticationResultListener.java
	src/com/owncloud/android/authenticator/OnConnectCheckListener.java
	src/com/owncloud/android/files/services/FileOperation.java
	src/com/owncloud/android/files/services/InstantUploadService.java
	src/com/owncloud/android/ui/activity/AuthenticatorActivity.java
2013-03-18 14:28:49 +01:00
..
account_setup.xml Merge tag 'oc-android-1-3-22' into oauth_login 2013-03-18 14:28:49 +01:00
action_item.xml Replaced GPL v3 with GPL v2; PLEASE, note that GPL v2 still allows the code is used under the terms of later versions of GPL, depending upon the will of the user, so no right is being diminished 2013-02-08 09:22:46 +01:00
authenticator_getting_started_fragment.xml Replaced GPL v3 with GPL v2; PLEASE, note that GPL v2 still allows the code is used under the terms of later versions of GPL, depending upon the will of the user, so no right is being diminished 2013-02-08 09:22:46 +01:00
edit_box_dialog.xml Replaced GPL v3 with GPL v2; PLEASE, note that GPL v2 still allows the code is used under the terms of later versions of GPL, depending upon the will of the user, so no right is being diminished 2013-02-08 09:22:46 +01:00
extensions_available_dialog.xml Replaced GPL v3 with GPL v2; PLEASE, note that GPL v2 still allows the code is used under the terms of later versions of GPL, depending upon the will of the user, so no right is being diminished 2013-02-08 09:22:46 +01:00
file_activity_details.xml Replaced GPL v3 with GPL v2; PLEASE, note that GPL v2 still allows the code is used under the terms of later versions of GPL, depending upon the will of the user, so no right is being diminished 2013-02-08 09:22:46 +01:00
file_details_empty.xml Replaced GPL v3 with GPL v2; PLEASE, note that GPL v2 still allows the code is used under the terms of later versions of GPL, depending upon the will of the user, so no right is being diminished 2013-02-08 09:22:46 +01:00
file_details_fragment.xml Replaced GPL v3 with GPL v2; PLEASE, note that GPL v2 still allows the code is used under the terms of later versions of GPL, depending upon the will of the user, so no right is being diminished 2013-02-08 09:22:46 +01:00
file_display_action_list_element.xml Replaced GPL v3 with GPL v2; PLEASE, note that GPL v2 still allows the code is used under the terms of later versions of GPL, depending upon the will of the user, so no right is being diminished 2013-02-08 09:22:46 +01:00
files.xml Replaced GPL v3 with GPL v2; PLEASE, note that GPL v2 still allows the code is used under the terms of later versions of GPL, depending upon the will of the user, so no right is being diminished 2013-02-08 09:22:46 +01:00
fragment_changelog.xml Updated copyright in source files 2013-02-07 18:45:10 +01:00
generic_explanation.xml Replaced GPL v3 with GPL v2; PLEASE, note that GPL v2 still allows the code is used under the terms of later versions of GPL, depending upon the will of the user, so no right is being diminished 2013-02-08 09:22:46 +01:00
landing_page_fragment.xml Replaced GPL v3 with GPL v2; PLEASE, note that GPL v2 still allows the code is used under the terms of later versions of GPL, depending upon the will of the user, so no right is being diminished 2013-02-08 09:22:46 +01:00
landing_page_item.xml Replaced GPL v3 with GPL v2; PLEASE, note that GPL v2 still allows the code is used under the terms of later versions of GPL, depending upon the will of the user, so no right is being diminished 2013-02-08 09:22:46 +01:00
list_fragment.xml Replaced GPL v3 with GPL v2; PLEASE, note that GPL v2 still allows the code is used under the terms of later versions of GPL, depending upon the will of the user, so no right is being diminished 2013-02-08 09:22:46 +01:00
list_item.xml Replaced GPL v3 with GPL v2; PLEASE, note that GPL v2 still allows the code is used under the terms of later versions of GPL, depending upon the will of the user, so no right is being diminished 2013-02-08 09:22:46 +01:00
main.xml Replaced GPL v3 with GPL v2; PLEASE, note that GPL v2 still allows the code is used under the terms of later versions of GPL, depending upon the will of the user, so no right is being diminished 2013-02-08 09:22:46 +01:00
no_account_available.xml Replaced GPL v3 with GPL v2; PLEASE, note that GPL v2 still allows the code is used under the terms of later versions of GPL, depending upon the will of the user, so no right is being diminished 2013-02-08 09:22:46 +01:00
pick_account_layout.xml Replaced GPL v3 with GPL v2; PLEASE, note that GPL v2 still allows the code is used under the terms of later versions of GPL, depending upon the will of the user, so no right is being diminished 2013-02-08 09:22:46 +01:00
pincodelock.xml Replaced GPL v3 with GPL v2; PLEASE, note that GPL v2 still allows the code is used under the terms of later versions of GPL, depending upon the will of the user, so no right is being diminished 2013-02-08 09:22:46 +01:00
popup.xml Replaced GPL v3 with GPL v2; PLEASE, note that GPL v2 still allows the code is used under the terms of later versions of GPL, depending upon the will of the user, so no right is being diminished 2013-02-08 09:22:46 +01:00
progressbar_layout.xml Replaced GPL v3 with GPL v2; PLEASE, note that GPL v2 still allows the code is used under the terms of later versions of GPL, depending upon the will of the user, so no right is being diminished 2013-02-08 09:22:46 +01:00
selected_account_element.xml Replaced GPL v3 with GPL v2; PLEASE, note that GPL v2 still allows the code is used under the terms of later versions of GPL, depending upon the will of the user, so no right is being diminished 2013-02-08 09:22:46 +01:00
ssl_validator_layout.xml Replaced GPL v3 with GPL v2; PLEASE, note that GPL v2 still allows the code is used under the terms of later versions of GPL, depending upon the will of the user, so no right is being diminished 2013-02-08 09:22:46 +01:00
upload_files_layout.xml Replaced GPL v3 with GPL v2; PLEASE, note that GPL v2 still allows the code is used under the terms of later versions of GPL, depending upon the will of the user, so no right is being diminished 2013-02-08 09:22:46 +01:00
uploader_layout.xml Replaced GPL v3 with GPL v2; PLEASE, note that GPL v2 still allows the code is used under the terms of later versions of GPL, depending upon the will of the user, so no right is being diminished 2013-02-08 09:22:46 +01:00
uploader_list_item_layout.xml Replaced GPL v3 with GPL v2; PLEASE, note that GPL v2 still allows the code is used under the terms of later versions of GPL, depending upon the will of the user, so no right is being diminished 2013-02-08 09:22:46 +01:00