55da547141
Conflicts: src/java/android-filechooser/code/project.properties src/java/android-filechooser/code/res/drawable-hdpi/afc_ic_menu_bookmarks.png src/java/android-filechooser/code/res/drawable-hdpi/afc_ic_menu_bookmarks_dark.png src/java/android-filechooser/code/res/drawable-hdpi/afc_ic_menu_bookmarks_light.png src/java/android-filechooser/code/res/drawable-mdpi/afc_ic_menu_bookmarks.png src/java/android-filechooser/code/res/drawable-mdpi/afc_ic_menu_bookmarks_dark.png src/java/android-filechooser/code/res/drawable-mdpi/afc_ic_menu_bookmarks_light.png src/java/android-filechooser/code/res/drawable-xhdpi/afc_ic_menu_bookmarks.png src/java/android-filechooser/code/res/drawable-xhdpi/afc_ic_menu_bookmarks_dark.png src/java/android-filechooser/code/res/drawable-xhdpi/afc_ic_menu_bookmarks_light.png src/java/android-filechooser/code/res/drawable-xxhdpi/afc_ic_menu_bookmarks_dark.png src/java/android-filechooser/code/res/drawable-xxhdpi/afc_ic_menu_bookmarks_light.png src/java/android-filechooser/code/res/values-v11/themes_light.xml src/java/android-filechooser/code/res/values-v7/themes_light.xml src/java/android-filechooser/code/res/values/env.xml src/java/android-filechooser/code/src/group/pals/android/lib/ui/filechooser/FragmentFiles.java src/java/android-filechooser/code/src/group/pals/android/lib/ui/filechooser/providers/BaseFileProviderUtils.java src/java/android-filechooser/code/src/group/pals/android/lib/ui/filechooser/providers/bookmark/BookmarkContract.java src/java/android-filechooser/code/src/group/pals/android/lib/ui/filechooser/providers/bookmark/BookmarkHelper.java src/java/android-filechooser/code/src/group/pals/android/lib/ui/filechooser/providers/bookmark/BookmarkProvider.java src/java/android-filechooser/code/src/group/pals/android/lib/ui/filechooser/utils/Sys.java src/java/android-filechooser/code/src/group/pals/android/lib/ui/filechooser/utils/Utils.java src/java/android-filechooser/code/src/group/pals/android/lib/ui/filechooser/utils/ui/LoadingDialog.java src/java/android-filechooser/code/src/group/pals/android/lib/ui/filechooser/utils/ui/bookmark/BookmarkCursorAdapter.java src/java/android-filechooser/code/src/group/pals/android/lib/ui/filechooser/utils/ui/bookmark/BookmarkFragment.java src/java/android-filechooser/code/src/group/pals/android/lib/ui/filechooser/utils/ui/history/HistoryCursorAdapter.java src/java/android-filechooser/code/src/group/pals/android/lib/ui/filechooser/utils/ui/history/HistoryFragment.java