diff options
author | Andrew Lee <anwlee@google.com> | 2014-08-14 17:43:04 -0700 |
---|---|---|
committer | Andrew Lee <anwlee@google.com> | 2014-08-15 17:26:17 -0700 |
commit | f43b32f1b227c043bc7d7af0d66dfc0c9aa5a2e8 (patch) | |
tree | 8ec3e49835c6ba88bdcefee8b5d753a97f4fdd23 /src/com | |
parent | e4ea104a18417115f35983bd4872bfe22a66bdfd (diff) |
Tweak FAB tints and positioning.
+ Change FAB tint so that it's not 100% opacity.
+ Change dialpad touch tints to new theme color.
- Don't translate FAB downwards when opening dialpad.
Bug: 16399233
Change-Id: I7d5e0015e0d7d436ce3e2780f3048dfb792d13c0
Diffstat (limited to 'src/com')
-rw-r--r-- | src/com/android/dialer/DialtactsActivity.java | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/src/com/android/dialer/DialtactsActivity.java b/src/com/android/dialer/DialtactsActivity.java index 12c52da9c..e5e708bc5 100644 --- a/src/com/android/dialer/DialtactsActivity.java +++ b/src/com/android/dialer/DialtactsActivity.java @@ -230,10 +230,6 @@ public class DialtactsActivity extends TransactionSafeActivity implements View.O private String mActionMenuDialpadButtonStr; private ImageButton mFloatingActionButton; private FloatingActionButtonController mFloatingActionButtonController; - /** - * Additional offset for FAB to be lowered when dialpad is open. - */ - private int mFloatingActionButtonDialpadMarginBottomOffset; private int mActionBarHeight; @@ -393,8 +389,6 @@ public class DialtactsActivity extends TransactionSafeActivity implements View.O mFloatingActionButton.setOnTouchListener(this); mFloatingActionButtonController = new FloatingActionButtonController(this, floatingActionButtonContainer); - mFloatingActionButtonDialpadMarginBottomOffset = resources.getDimensionPixelOffset( - R.dimen.floating_action_button_dialpad_margin_bottom_offset); ImageButton optionsMenuButton = (ImageButton) searchEditTextLayout.findViewById(R.id.dialtacts_options_menu_button); @@ -1207,9 +1201,6 @@ public class DialtactsActivity extends TransactionSafeActivity implements View.O align = FloatingActionButtonController.ALIGN_END; } } - mFloatingActionButtonController.align(align, - 0 /* offsetX */, - mIsDialpadShown ? mFloatingActionButtonDialpadMarginBottomOffset : 0 /* offsetY */, - animate); + mFloatingActionButtonController.align(align, 0 /* offsetX */, 0 /* offsetY */, animate); } } |