Commit graph

8 commits

Author SHA1 Message Date
Andy Scherzinger
2af26edb0b Merge branch 'master' of https://github.com/nextcloud/android into multiSelectNew
Conflicts:
	res/values-ca/strings.xml
	res/values-he/strings.xml
	res/values-hu-rHU/strings.xml
	res/values-ja-rJP/strings.xml
	res/values-ko/strings.xml
	res/values-lb/strings.xml
	res/values-lt-rLT/strings.xml
	res/values-pl/strings.xml
	res/values-pt-rPT/strings.xml
	res/values-th-rTH/strings.xml
	res/values-tr/strings.xml
2016-07-20 13:19:41 +02:00
tobiasKaminsky
e714707754 textPreview is selectable 2016-07-16 09:08:52 +02:00
Jorge Antonio Diaz-Benito Soriano
9a2f6c6c4b Support margins for API levels pre-17 2015-06-24 22:12:36 +02:00
Jorge Antonio Diaz-Benito Soriano
093bf4fb5c Reverted the text preview system to a single TextView 2014-10-28 19:11:31 +01:00
Jorge Antonio Diaz-Benito Soriano
0c384167c1 Added some margins. 2014-10-28 19:11:30 +01:00
Jorge Antonio Diaz-Benito Soriano
3877ddf85a Minor updates 2014-10-28 19:11:30 +01:00
Jorge Antonio Diaz-Benito Soriano
ec9f1c7eb8 Reworked the text file preview system to avoid UI freezes with large text files 2014-10-28 19:11:30 +01:00
Jorge Antonio Diaz-Benito Soriano
7cc88a22d1 Added text file preview 2014-10-28 19:11:30 +01:00