Merge remote-tracking branch 'origin/master'

Author: Yanndroid

app/src/main/res/layout/fragment_first.xml

@@ -8,7 +8,7 @@
     <de.dlyt.yanndroid.oneui.view.TabLayout
         android:id="@+id/tabLayout"
         android:layout_width="match_parent"
-        android:layout_height="60dp" />
+        android:layout_height="60.0dip" />
 
     <de.dlyt.yanndroid.oneui.layout.RoundLinearLayout
         android:layout_width="match_parent"
@@ -19,7 +19,8 @@
         <de.dlyt.yanndroid.oneui.view.ViewPager
             android:id="@+id/viewPager"
             android:layout_width="match_parent"
-            android:layout_height="match_parent" />
+            android:layout_height="match_parent"
+            android:overScrollMode="never" />
 
     </de.dlyt.yanndroid.oneui.layout.RoundLinearLayout>
 

yanndroid/oneui/src/main/java/de/dlyt/yanndroid/oneui/layout/ToolbarLayout.java

@@ -838,7 +838,10 @@ private void showOverflowMenuButtonBadge(int count) {
                 lp.width = width;
                 lp.height = (int) getResources().getDimension(R.dimen.sesl_menu_item_badge_size);
                 lp.setMargins(0, getResources().getDimensionPixelSize(R.dimen.sesl_menu_item_badge_top_margin), 0, 0);
-                lp.setMarginEnd(getResources().getDimensionPixelSize(R.dimen.sesl_menu_item_badge_end_margin) - (int) getDIPForPX(4));
+                if (count > 9)
+                    lp.setMarginEnd(getResources().getDimensionPixelSize(R.dimen.sesl_menu_item_badge_end_margin) - (int) getDIPForPX(4));
+                else
+                    lp.setMarginEnd(getResources().getDimensionPixelSize(R.dimen.sesl_menu_item_badge_end_margin));
                 moreOverflowBadgeBackground.setLayoutParams(lp);
                 moreOverflowBadgeBackground.setVisibility(View.VISIBLE);
             } else if (count == N_BADGE) {