diff options
| author | Andrew Lee <anwlee@google.com> | 2014-08-18 19:24:34 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-08-18 19:24:34 +0000 |
| commit | 59268f17f74c859a48da5629d8ac94bbbcd59503 (patch) | |
| tree | fcee809ad1219a61f35b8b4a3cf3946253df3ba8 | |
| parent | cb21f780ba6fc07506607f7eac9f3cffb8b29145 (diff) | |
| parent | c789c6bf4b4f9aae943d024e90647e81f7e30fc4 (diff) | |
am c789c6bf: Merge "Tweak FAB tints and positioning." into lmp-dev
* commit 'c789c6bf4b4f9aae943d024e90647e81f7e30fc4':
Tweak FAB tints and positioning.
| -rw-r--r-- | res/drawable/floating_action_button.xml | 2 | ||||
| -rw-r--r-- | res/values/colors.xml | 4 | ||||
| -rw-r--r-- | src/com/android/dialer/DialtactsActivity.java | 11 |
3 files changed, 4 insertions, 13 deletions
diff --git a/res/drawable/floating_action_button.xml b/res/drawable/floating_action_button.xml index 347e9d490..cbbfb8542 100644 --- a/res/drawable/floating_action_button.xml +++ b/res/drawable/floating_action_button.xml @@ -16,6 +16,6 @@ --> <ripple xmlns:android="http://schemas.android.com/apk/res/android" - android:color="@color/dialer_accent_color"> + android:color="@color/floating_action_button_touch_tint"> <item android:drawable="@drawable/fab_blue" /> </ripple> diff --git a/res/values/colors.xml b/res/values/colors.xml index 448d1e6c1..a3fd3f923 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -19,7 +19,6 @@ <color name="dialtacts_primary_text_color">#333</color> <!-- Secondary text color in the Dialer --> <color name="dialtacts_secondary_text_color">#737373</color> - <color name="dialer_accent_color">#eeff41</color> <color name="dialer_red_highlight_color">#ff1744</color> <color name="dialer_green_highlight_color">#00c853</color> @@ -100,7 +99,8 @@ <!-- Color for icons in the actionbar --> <color name="actionbar_icon_color">#ffffff</color> - <color name="dialer_dialpad_touch_tint">#331dc7db</color> + <color name="dialer_dialpad_touch_tint">#330288d1</color> + <color name="floating_action_button_touch_tint">#80ffffff</color> </resources> 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); } } |