From: Andy Scherzinger Date: Fri, 11 Sep 2015 13:03:46 +0000 (+0200) Subject: added sorting icon from material, spring cleaning in lower resolution icons and obsol... X-Git-Tag: beta-20151202~3^2~51 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/47107757552d23a10f61e89e59726c0af77fa246?ds=inline added sorting icon from material, spring cleaning in lower resolution icons and obsolete Android versions --- diff --git a/res/drawable-hdpi-v9/ic_action_download.png b/res/drawable-hdpi-v9/ic_action_download.png deleted file mode 100644 index 25476cd7..00000000 Binary files a/res/drawable-hdpi-v9/ic_action_download.png and /dev/null differ diff --git a/res/drawable-hdpi-v9/ic_action_refresh.png b/res/drawable-hdpi-v9/ic_action_refresh.png deleted file mode 100644 index a7fdc0df..00000000 Binary files a/res/drawable-hdpi-v9/ic_action_refresh.png and /dev/null differ diff --git a/res/drawable-hdpi-v9/ic_action_settings.png b/res/drawable-hdpi-v9/ic_action_settings.png deleted file mode 100644 index 86b54f4c..00000000 Binary files a/res/drawable-hdpi-v9/ic_action_settings.png and /dev/null differ diff --git a/res/drawable-ldpi-v9/ic_action_download.png b/res/drawable-ldpi-v9/ic_action_download.png deleted file mode 100644 index 41fe95a4..00000000 Binary files a/res/drawable-ldpi-v9/ic_action_download.png and /dev/null differ diff --git a/res/drawable-ldpi-v9/ic_action_refresh.png b/res/drawable-ldpi-v9/ic_action_refresh.png deleted file mode 100644 index bd611e8e..00000000 Binary files a/res/drawable-ldpi-v9/ic_action_refresh.png and /dev/null differ diff --git a/res/drawable-ldpi-v9/ic_action_settings.png b/res/drawable-ldpi-v9/ic_action_settings.png deleted file mode 100644 index e2c2d517..00000000 Binary files a/res/drawable-ldpi-v9/ic_action_settings.png and /dev/null differ diff --git a/res/drawable-mdpi-v9/ic_action_download.png b/res/drawable-mdpi-v9/ic_action_download.png deleted file mode 100644 index 2684c83f..00000000 Binary files a/res/drawable-mdpi-v9/ic_action_download.png and /dev/null differ diff --git a/res/drawable-mdpi-v9/ic_action_refresh.png b/res/drawable-mdpi-v9/ic_action_refresh.png deleted file mode 100644 index bb9d855f..00000000 Binary files a/res/drawable-mdpi-v9/ic_action_refresh.png and /dev/null differ diff --git a/res/drawable-mdpi-v9/ic_action_settings.png b/res/drawable-mdpi-v9/ic_action_settings.png deleted file mode 100644 index 47ef3f44..00000000 Binary files a/res/drawable-mdpi-v9/ic_action_settings.png and /dev/null differ diff --git a/res/drawable-xxhdpi/ic_sort_variant.png b/res/drawable-xxhdpi/ic_sort_variant.png new file mode 100644 index 00000000..2918126d Binary files /dev/null and b/res/drawable-xxhdpi/ic_sort_variant.png differ diff --git a/res/menu/main_menu.xml b/res/menu/main_menu.xml index 236bfd6e..bd218930 100644 --- a/res/menu/main_menu.xml +++ b/res/menu/main_menu.xml @@ -21,31 +21,24 @@ xmlns:app="http://schemas.android.com/apk/res-auto"> - diff --git a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java index 7d7cea1e..c2eccda0 100644 --- a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java +++ b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java @@ -480,8 +480,6 @@ public class FileDisplayActivity extends HookActivity @Override public boolean onPrepareOptionsMenu(Menu menu) { boolean drawerOpen = mDrawerLayout.isDrawerOpen(GravityCompat.START); - menu.findItem(R.id.action_upload).setVisible(!drawerOpen); - menu.findItem(R.id.action_create_dir).setVisible(!drawerOpen); menu.findItem(R.id.action_sort).setVisible(!drawerOpen); menu.findItem(R.id.action_sync_account).setVisible(!drawerOpen); @@ -492,6 +490,7 @@ public class FileDisplayActivity extends HookActivity public boolean onCreateOptionsMenu(Menu menu) { MenuInflater inflater = getMenuInflater(); inflater.inflate(R.menu.main_menu, menu); + menu.findItem(R.id.action_create_dir).setVisible(false); return true; } @@ -500,21 +499,10 @@ public class FileDisplayActivity extends HookActivity public boolean onOptionsItemSelected(MenuItem item) { boolean retval = true; switch (item.getItemId()) { - case R.id.action_create_dir: { - createFolder(); - break; - } - case R.id.action_sync_account: { startSynchronization(); break; } - case R.id.action_upload: { - UploadSourceDialogFragment dialog = - UploadSourceDialogFragment.newInstance(getAccount()); - dialog.show(getSupportFragmentManager(), DIALOG_UPLOAD_SOURCE); - break; - } case android.R.id.home: { FileFragment second = getSecondFragment(); OCFile currentDir = getCurrentDir(); diff --git a/src/com/owncloud/android/ui/activity/FolderPickerActivity.java b/src/com/owncloud/android/ui/activity/FolderPickerActivity.java index 4b558f00..574050fa 100644 --- a/src/com/owncloud/android/ui/activity/FolderPickerActivity.java +++ b/src/com/owncloud/android/ui/activity/FolderPickerActivity.java @@ -263,7 +263,6 @@ public class FolderPickerActivity extends FileActivity implements FileFragment.C public boolean onCreateOptionsMenu(Menu menu) { MenuInflater inflater = getMenuInflater(); inflater.inflate(R.menu.main_menu, menu); - menu.findItem(R.id.action_upload).setVisible(false); menu.findItem(R.id.action_sort).setVisible(false); return true; } diff --git a/src/com/owncloud/android/ui/activity/Uploader.java b/src/com/owncloud/android/ui/activity/Uploader.java index d221bc92..83b029f7 100644 --- a/src/com/owncloud/android/ui/activity/Uploader.java +++ b/src/com/owncloud/android/ui/activity/Uploader.java @@ -658,7 +658,6 @@ public class Uploader extends FileActivity public boolean onCreateOptionsMenu(Menu menu) { MenuInflater inflater = getMenuInflater(); inflater.inflate(R.menu.main_menu, menu); - menu.findItem(R.id.action_upload).setVisible(false); menu.findItem(R.id.action_sort).setVisible(false); menu.findItem(R.id.action_sync_account).setVisible(false); return true;