Skip to content

Commit

Permalink
Merge branch 'release/v3.1.9'
Browse files Browse the repository at this point in the history
  • Loading branch information
mikepenz committed Nov 20, 2015
2 parents 8d62313 + 02387ae commit 77921bc
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 9 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ The ActionItemBadge Library is pushed to [Maven Central], so you just need to ad

```javascript
dependencies {
compile('com.mikepenz:actionitembadge:3.1.8@aar') {
compile('com.mikepenz:actionitembadge:3.1.9@aar') {
transitive = true
}
}
Expand Down
4 changes: 2 additions & 2 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ android {
applicationId "com.mikepenz.actionitembadge.sample"
minSdkVersion 14
targetSdkVersion 23
versionCode 318
versionName "3.1.8"
versionCode 319
versionName "3.1.9"
}
buildTypes {
release {
Expand Down
4 changes: 2 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
# org.gradle.parallel=true

VERSION_NAME=3.1.8
VERSION_CODE=318
VERSION_NAME=3.1.9
VERSION_CODE=319
GROUP=com.mikepenz

POM_DESCRIPTION=Android-ActionItemBadge Library
Expand Down
4 changes: 2 additions & 2 deletions library/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ android {
defaultConfig {
minSdkVersion 14
targetSdkVersion 23
versionCode 318
versionName "3.1.8"
versionCode 319
versionName "3.1.9"
}
buildTypes {
release {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import android.view.Gravity;
import android.view.MenuItem;
import android.view.View;
import android.view.Window;
import android.widget.FrameLayout;
import android.widget.ImageView;
import android.widget.TextView;
Expand Down Expand Up @@ -195,7 +196,7 @@ public void onClick(View v) {
consumed = listener.onOptionsItemSelected(menu);
}
if (!consumed) {
activity.onOptionsItemSelected(menu);
activity.onMenuItemSelected(Window.FEATURE_OPTIONS_PANEL, menu);
}
}
});
Expand Down
2 changes: 1 addition & 1 deletion library/src/main/res/values/aboutlibraries.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
Android-<b>ActionItemBadge</b> is a library which offers a simple and easy to use method to add a badge to your action item!!
]]>
</string>
<string name="library_AndroidActionItemBadge_libraryVersion">3.1.8</string>
<string name="library_AndroidActionItemBadge_libraryVersion">3.1.9</string>
<string name="library_AndroidActionItemBadge_libraryWebsite">https://github.com/mikepenz/Android-ActionItemBadge</string>
<string name="library_AndroidActionItemBadge_licenseId">apache_2_0</string>
<string name="library_AndroidActionItemBadge_isOpenSource">true</string>
Expand Down

0 comments on commit 77921bc

Please sign in to comment.