Tags: smartcanvas/SearchView
Tags
Merge branch 'master' into release Conflicts: build.gradle sample/build.gradle sample/src/main/AndroidManifest.xml sample/src/main/java/com/lapism/searchview/sample/FabBehavior.java sample/src/main/java/com/lapism/searchview/sample/base/BaseActivity.java sample/src/main/res/layout/activity_about.xml sample/src/main/res/values-v21/styles.xml sample/src/main/res/values/strings.xml sample/src/main/res/values/styles.xml searchview/build.gradle
Merge branch 'issue-116' into release Conflicts: sample/build.gradle sample/src/main/AndroidManifest.xml sample/src/main/java/com/lapism/searchview/sample/activity/MenuItemActivity.java sample/src/main/java/com/lapism/searchview/sample/activity/ToggleActivity.java sample/src/main/java/com/lapism/searchview/sample/activity/ToolbarActivity.java sample/src/main/java/com/lapism/searchview/sample/base/BaseActivity.java sample/src/main/res/layout/activity_toggle.xml sample/src/main/res/values/strings.xml sample/src/main/res/values/styles.xml searchview/build.gradle
Merge branch 'issue-108' into release Conflicts: sample/src/main/AndroidManifest.xml sample/src/main/java/com/lapism/searchview/sample/activity/MenuItemActivity.java sample/src/main/java/com/lapism/searchview/sample/base/BaseActivity.java sample/src/main/res/menu/nav_items.xml sample/src/main/res/values/strings.xml