Andy Scherzinger
|
fd39e9168b
|
replaced the icons and header coloring
|
2015-08-21 17:32:24 +02:00 |
|
masensio
|
3e6bcda9a4
|
Merge branch 'develop' into reliable_uploads
Conflicts:
src/com/owncloud/android/ui/activity/ConflictsResolveActivity.java
src/com/owncloud/android/ui/activity/FileActivity.java
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
src/com/owncloud/android/ui/activity/Preferences.java
src/com/owncloud/android/ui/activity/Uploader.java
src/com/owncloud/android/ui/fragment/ExtendedListFragment.java
|
2015-08-20 16:37:10 +02:00 |
|
Andy Scherzinger
|
cbb0f8743f
|
Fix for long click menue for account management in preferences screen
|
2015-08-18 23:13:10 +02:00 |
|
Andy Scherzinger
|
da89715045
|
reverted back to light colored login
|
2015-08-18 17:48:10 +02:00 |
|
masensio
|
e5e5b3638c
|
Merge branch 'develop' into reliable_uploads
Conflicts:
SETUP.md
owncloud-android-library
res/menu/main_menu.xml
res/values/strings.xml
src/com/owncloud/android/db/DbHandler.java
src/com/owncloud/android/db/ProviderMeta.java
src/com/owncloud/android/files/FileMenuFilter.java
src/com/owncloud/android/files/FileOperationsHelper.java
src/com/owncloud/android/files/services/FileDownloader.java
src/com/owncloud/android/files/services/FileUploader.java
src/com/owncloud/android/operations/SynchronizeFileOperation.java
src/com/owncloud/android/operations/UploadFileOperation.java
src/com/owncloud/android/ui/activity/ComponentsGetter.java
src/com/owncloud/android/ui/activity/ConflictsResolveActivity.java
src/com/owncloud/android/ui/activity/FileActivity.java
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
src/com/owncloud/android/ui/activity/Preferences.java
src/com/owncloud/android/ui/activity/UploadFilesActivity.java
src/com/owncloud/android/ui/activity/Uploader.java
src/com/owncloud/android/ui/adapter/FileListListAdapter.java
src/com/owncloud/android/ui/fragment/ExtendedListFragment.java
src/com/owncloud/android/ui/fragment/FileDetailFragment.java
src/com/owncloud/android/ui/preview/PreviewImageActivity.java
|
2015-08-18 15:14:37 +02:00 |
|
Andy Scherzinger
|
ba80646e4e
|
Fix for 4.0 file action context menu (re-implement it via DialogFragment)
|
2015-08-17 15:58:03 +02:00 |
|
Andy Scherzinger
|
80e7836840
|
set back font weight on drawer list items
|
2015-08-17 09:04:37 +02:00 |
|
Andy Scherzinger
|
71f68b4c8c
|
fix for progressbars on pre lollipop and post ics for seekbar thumbs
|
2015-08-14 18:55:31 +02:00 |
|
Andy Scherzinger
|
92af92ee3b
|
merged part of the fixes from material buttons branch to fix bugs reported in PR #1076
|
2015-08-14 17:18:36 +02:00 |
|
Andy Scherzinger
|
60e0f09278
|
Fix for ssl popups padding, button style changed to borderless, fixed weight on buttons
|
2015-08-13 15:41:59 +02:00 |
|
Andy Scherzinger
|
5257af90bc
|
fixed username to be single line and ellipsized in case of lang names
|
2015-08-12 18:48:33 +02:00 |
|
Andy Scherzinger
|
4a4296a07e
|
Material Buttons (draft)
|
2015-08-07 17:09:47 +02:00 |
|
Andy Scherzinger
|
270fea6a33
|
fix for the grid footer
|
2015-08-05 15:21:05 +02:00 |
|
Andy Scherzinger
|
b276b623a9
|
added bottom padding to logo, logo slightly bigger
|
2015-08-05 14:48:04 +02:00 |
|
Andy Scherzinger
|
5ded9e818b
|
aligned account name with menu items
|
2015-08-05 14:07:00 +02:00 |
|
Andy Scherzinger
|
c2418d24d5
|
added missing progressbar
|
2015-08-05 13:43:23 +02:00 |
|
Andy Scherzinger
|
b5f8c0b087
|
changed alignment of drawer's content according to jan's suggestions
|
2015-08-04 19:02:36 +02:00 |
|
Andy Scherzinger
|
e36349f77e
|
fixing the progressbar corner glitch, bumping style of indeterminate animation to material style via appcompat, fixing progress bar for folder picker too, see comment
|
2015-08-04 18:32:33 +02:00 |
|
Andy Scherzinger
|
f7f468b578
|
extracted color values for download fragment, see comments 172c3f56a3
|
2015-08-04 17:06:27 +02:00 |
|
Andy Scherzinger
|
a329d49ddf
|
Fix for color reference in portrait 8f401a38d8 (comments)
|
2015-08-04 16:49:20 +02:00 |
|
Andy Scherzinger
|
10c5498879
|
extracted text colors for account setup to color.xml, see e72caebbce comments
|
2015-08-04 16:41:53 +02:00 |
|
AndyScherzinger
|
bfea14e876
|
setting the username on the drawer header for startup and coming back from the preferences screen for account switching
|
2015-07-27 20:20:46 +02:00 |
|
AndyScherzinger
|
8c0376229e
|
changing the leight_height in order to get the screen backround color right mentioned by @jancborchardt in #1076
|
2015-07-27 16:33:10 +02:00 |
|
AndyScherzinger
|
ff2d55cede
|
replaced hard coded background color with coresponding color-definition
|
2015-07-27 16:18:53 +02:00 |
|
AndyScherzinger
|
172c3f56a3
|
colored background black for image download #710 as proposed by @jancborchardt
|
2015-07-27 01:00:51 +02:00 |
|
AndyScherzinger
|
e72caebbce
|
fine tuning icon work on login screen, making landscape visually en par with portrait mode
|
2015-07-26 18:36:00 +02:00 |
|
AndyScherzinger
|
49b3acd2be
|
added indeterminate progress bar to show activity since this isn't supported by AppCompat anymore
|
2015-07-26 17:52:29 +02:00 |
|
AndyScherzinger
|
0c3e198e77
|
download fixing for #710
|
2015-07-26 02:54:03 +02:00 |
|
AndyScherzinger
|
8f401a38d8
|
redone color changes for login screen
|
2015-07-26 02:10:51 +02:00 |
|
AndyScherzinger
|
d474239b21
|
initial material design changes for the action bar
|
2015-07-26 01:49:27 +02:00 |
|
purigarcia
|
61e6191342
|
change the name of the method from keepInSync to favorite. Other changes commented in the review
|
2015-07-22 18:13:45 +02:00 |
|
masensio
|
84678c9903
|
Fix: Import file from other app shows all folders as TextView
|
2015-06-22 12:58:41 +02:00 |
|
David A. Velasco
|
66f3a45d05
|
Merge branch 'develop' into navigationDrawer_basic
Conflicts FIXED:
res/layout/files.xml
|
2015-06-15 13:43:17 +02:00 |
|
purigarcia
|
916bd5c6ca
|
Merge branch 'develop' into automationTest
|
2015-05-29 14:17:52 +02:00 |
|
David A. Velasco
|
41b5eb13b1
|
Merge remote-tracking branch 'origin/navigationDrawer_basic' into navigationDrawer_basic
|
2015-05-29 13:46:30 +02:00 |
|
David A. Velasco
|
27148acf16
|
Fixed style in log-in activity; should be Light, as before
|
2015-05-29 13:30:02 +02:00 |
|
masensio
|
cf535b70f1
|
Disable 'Accounts' in Navigation Drawer
|
2015-05-29 11:32:36 +02:00 |
|
masensio
|
6e2dd6b191
|
Enable fitsSystemWindows in drawer.xml
|
2015-05-28 13:18:56 +02:00 |
|
masensio
|
c83925b454
|
Add license in some files
|
2015-05-28 11:30:02 +02:00 |
|
masensio
|
db01425a07
|
Add NavigationDrawer to image preview
|
2015-05-28 11:07:14 +02:00 |
|
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 |
|
masensio
|
a9dad9e480
|
Add content_description to Navigation Drawer options
|
2015-05-26 11:46:15 +02:00 |
|
masensio
|
4f2f0ceb80
|
Add actionBar
|
2015-05-25 12:39:05 +02:00 |
|
tobiasKaminsky
|
6d4207a06b
|
Merge remote-tracking branch 'upstream/develop' into navigationDrawer_update
|
2015-05-21 21:12:44 +02:00 |
|
David A. Velasco
|
a3642ab864
|
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 |
|
purigarcia
|
6a9dfdb330
|
Merge branch 'develop' into automationTest
|
2015-05-06 19:05:03 +02:00 |
|
David A. Velasco
|
fdc1216471
|
Prevent that input fields are maximized in landscape
|
2015-05-05 12:27:57 +02:00 |
|
David A. Velasco
|
4f0cc76a12
|
Removed unneeded toggling on cursor visibility
|
2015-05-05 09:54:49 +02:00 |
|
David A. Velasco
|
510c00f66d
|
Cleaned code in PassCodeActivity
|
2015-05-05 00:07:24 +02:00 |
|
David A. Velasco
|
9593b580b7
|
Replaced 'PIN code' by 'pass code'
|
2015-05-04 11:41:09 +02:00 |
|