From ba80646e4e31a6c19d4ef8b60ea0e30cf3bd00cc Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Mon, 17 Aug 2015 15:58:03 +0200 Subject: [PATCH] Fix for 4.0 file action context menu (re-implement it via DialogFragment) --- res/layout/file_actions.xml | 14 ++ res/layout/simple_dialog_list_item.xml | 12 ++ res/values/colors.xml | 1 + res/values/styles.xml | 4 +- .../ui/dialog/FileActionsDialogFragment.java | 146 +++++++++++++ .../ui/dialog/parcel/MenuItemParcelable.java | 64 ++++++ .../android/ui/dialog/parcel/MenuParcelable.java | 51 +++++ .../android/ui/fragment/OCFileListFragment.java | 110 +++++++--- src/com/owncloud/android/utils/DialogMenuItem.java | 227 +++++++++++++++++++++ 9 files changed, 603 insertions(+), 26 deletions(-) create mode 100644 res/layout/file_actions.xml create mode 100644 res/layout/simple_dialog_list_item.xml create mode 100644 src/com/owncloud/android/ui/dialog/FileActionsDialogFragment.java create mode 100644 src/com/owncloud/android/ui/dialog/parcel/MenuItemParcelable.java create mode 100644 src/com/owncloud/android/ui/dialog/parcel/MenuParcelable.java create mode 100644 src/com/owncloud/android/utils/DialogMenuItem.java diff --git a/res/layout/file_actions.xml b/res/layout/file_actions.xml new file mode 100644 index 00000000..abc42fb4 --- /dev/null +++ b/res/layout/file_actions.xml @@ -0,0 +1,14 @@ + + + + + + + \ No newline at end of file diff --git a/res/layout/simple_dialog_list_item.xml b/res/layout/simple_dialog_list_item.xml new file mode 100644 index 00000000..96020eb6 --- /dev/null +++ b/res/layout/simple_dialog_list_item.xml @@ -0,0 +1,12 @@ + + \ No newline at end of file diff --git a/res/values/colors.xml b/res/values/colors.xml index c931a36d..f755a1c5 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -38,6 +38,7 @@ @color/owncloud_blue_accent + #1F1F1F @color/owncloud_blue diff --git a/res/values/styles.xml b/res/values/styles.xml index 981fdb05..8d9a2754 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -59,9 +59,7 @@ @color/primary - +