Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
986c2e7493
3 changed files with 3 additions and 2 deletions
|
|
@ -159,7 +159,7 @@ public class MainActivity extends AbsFabActivity
|
|||
}
|
||||
|
||||
private void setToolBarTransparent(boolean transparent) {
|
||||
float alpha = transparent ? 0.97f : 1f;
|
||||
float alpha = transparent ? 0.9f : 1f;
|
||||
final int colorPrimary = PreferenceUtils.getInstance(this).getThemeColorPrimary();
|
||||
ViewUtil.setBackgroundAlpha(toolbar, alpha, colorPrimary);
|
||||
ViewUtil.setBackgroundAlpha(slidingTabLayout, alpha, colorPrimary);
|
||||
|
|
|
|||
|
|
@ -2,4 +2,5 @@
|
|||
<resources>
|
||||
<dimen name="statusMargin">25dp</dimen>
|
||||
<dimen name="navigation_drawer_image_height">165dp</dimen>
|
||||
<dimen name="main_toolbar_padding_top">@dimen/statusMargin</dimen>
|
||||
</resources>
|
||||
|
|
@ -14,7 +14,7 @@
|
|||
<dimen name="header_image_height">360dp</dimen>
|
||||
|
||||
<dimen name="statusMargin">0dp</dimen>
|
||||
<dimen name="main_toolbar_padding_top">@dimen/statusMargin</dimen>
|
||||
<dimen name="main_toolbar_padding_top">0dp</dimen>
|
||||
|
||||
<!-- Notification template -->
|
||||
<dimen name="notification_big_icon_height">64.0dip</dimen>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue