diff options
11 files changed, 17 insertions, 10 deletions
diff --git a/res/drawable/ic_call_end_button.xml b/res/drawable/ic_call_end_button.xml index f7c5b74b..d75f6e36 100644 --- a/res/drawable/ic_call_end_button.xml +++ b/res/drawable/ic_call_end_button.xml @@ -26,4 +26,8 @@ </item> <item android:gravity="center" android:drawable="@drawable/ic_call_end"/> + <item> + <ripple android:color="@*android:color/car_card_ripple_background" + android:radius="@dimen/fab_ripple_radius"/> + </item> </layer-list> diff --git a/res/drawable/icon_call_button.xml b/res/drawable/icon_call_button.xml index c569aec2..016f9c98 100644 --- a/res/drawable/icon_call_button.xml +++ b/res/drawable/icon_call_button.xml @@ -26,4 +26,8 @@ </shape> </item> <item android:drawable="@drawable/ic_phone" android:gravity="center"/> + <item> + <ripple android:color="@*android:color/car_card_ripple_background" + android:radius="@dimen/fab_ripple_radius"/> + </item> </layer-list>
\ No newline at end of file diff --git a/res/layout-port/dialpad_fragment.xml b/res/layout-port/dialpad_fragment.xml index e5b56e80..d26ef774 100644 --- a/res/layout-port/dialpad_fragment.xml +++ b/res/layout-port/dialpad_fragment.xml @@ -66,13 +66,12 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent"/> - <ImageButton + <ImageView android:id="@+id/call_button" style="@style/DialpadPrimaryButton" android:layout_width="wrap_content" android:layout_height="@dimen/call_button_height" android:src="@drawable/icon_call_button" - android:background="@drawable/dialer_ripple_background" android:layout_marginBottom="@dimen/call_button_bottom_margin" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" diff --git a/res/layout/dialpad_info.xml b/res/layout/dialpad_info.xml index f4b9d1e4..e9636e81 100644 --- a/res/layout/dialpad_info.xml +++ b/res/layout/dialpad_info.xml @@ -55,11 +55,10 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent"/> - <ImageButton + <ImageView android:id="@+id/call_button" style="@style/DialpadPrimaryButton" android:src="@drawable/icon_call_button" - android:background="@drawable/dialer_ripple_background" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent"/> diff --git a/res/layout/on_going_call_controller_bar_fragment.xml b/res/layout/on_going_call_controller_bar_fragment.xml index 30979691..787e489a 100644 --- a/res/layout/on_going_call_controller_bar_fragment.xml +++ b/res/layout/on_going_call_controller_bar_fragment.xml @@ -47,7 +47,6 @@ limitations under the License. android:id="@+id/end_call_button" style="@style/DialpadPrimaryButton" android:src="@drawable/ic_call_end_button" - android:background="@drawable/dialer_ripple_background" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toEndOf="@+id/toggle_dialpad_button" app:layout_constraintEnd_toStartOf="@+id/voice_channel_button" diff --git a/res/values-h610dp/dimens.xml b/res/values-h610dp/dimens.xml index d2239e4f..774dd824 100644 --- a/res/values-h610dp/dimens.xml +++ b/res/values-h610dp/dimens.xml @@ -21,4 +21,5 @@ <dimen name="keypad_margin_y">@*android:dimen/car_padding_2</dimen> <dimen name="fab_outline_size">104dp</dimen> + <dimen name="fab_ripple_radius">52dp</dimen> </resources> diff --git a/res/values/dimens.xml b/res/values/dimens.xml index 9438e384..fd102449 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -120,6 +120,7 @@ <dimen name="fab_button_size">@dimen/fab_outline_size</dimen> <dimen name="fab_outline_size">84dp</dimen> <dimen name="fab_outline_thickness">4dp</dimen> + <dimen name="fab_ripple_radius">42dp</dimen> <dimen name="in_call_button_size">@dimen/touch_target_size</dimen> diff --git a/src/com/android/car/dialer/ui/activecall/OnGoingCallControllerBarFragment.java b/src/com/android/car/dialer/ui/activecall/OnGoingCallControllerBarFragment.java index 9fde3212..ede3ee89 100644 --- a/src/com/android/car/dialer/ui/activecall/OnGoingCallControllerBarFragment.java +++ b/src/com/android/car/dialer/ui/activecall/OnGoingCallControllerBarFragment.java @@ -147,7 +147,7 @@ public class OnGoingCallControllerBarFragment extends Fragment { dialPadButton.setActivated(false); mOnGoingCallControllerBarCallback.onCloseDialpad(); - ImageView endCallButton = fragmentView.findViewById(R.id.end_call_button); + View endCallButton = fragmentView.findViewById(R.id.end_call_button); endCallButton.setOnClickListener((v) -> { if (mOnGoingCallControllerBarCallback == null) { return; diff --git a/src/com/android/car/dialer/ui/dialpad/DialpadFragment.java b/src/com/android/car/dialer/ui/dialpad/DialpadFragment.java index 4b4adcd2..30bc0c79 100644 --- a/src/com/android/car/dialer/ui/dialpad/DialpadFragment.java +++ b/src/com/android/car/dialer/ui/dialpad/DialpadFragment.java @@ -170,7 +170,7 @@ public class DialpadFragment extends DialerBaseFragment implements mMode == MODE_EMERGENCY ? R.style.EmergencyDialNumber : R.style.DialNumber); mTitleView.setGravity(Gravity.CENTER); mDisplayName = rootView.findViewById(R.id.display_name); - ImageButton callButton = rootView.findViewById(R.id.call_button); + View callButton = rootView.findViewById(R.id.call_button); mDeleteButton = rootView.findViewById(R.id.delete_button); if (mMode == MODE_IN_CALL) { diff --git a/tests/robotests/src/com/android/car/dialer/ui/activecall/OnGoingCallControllerBarFragmentTest.java b/tests/robotests/src/com/android/car/dialer/ui/activecall/OnGoingCallControllerBarFragmentTest.java index 9f8914c0..b046fe74 100644 --- a/tests/robotests/src/com/android/car/dialer/ui/activecall/OnGoingCallControllerBarFragmentTest.java +++ b/tests/robotests/src/com/android/car/dialer/ui/activecall/OnGoingCallControllerBarFragmentTest.java @@ -147,7 +147,7 @@ public class OnGoingCallControllerBarFragmentTest { public void testEndCallButton() { addFragment(Call.STATE_ACTIVE); - ImageView endCallButton = mOnGoingCallControllerBarFragment.getView().findViewById( + View endCallButton = mOnGoingCallControllerBarFragment.getView().findViewById( R.id.end_call_button); assertThat(endCallButton.hasOnClickListeners()).isTrue(); // onEndCall diff --git a/tests/robotests/src/com/android/car/dialer/ui/dialpad/DialpadFragmentTest.java b/tests/robotests/src/com/android/car/dialer/ui/dialpad/DialpadFragmentTest.java index d4bad9c2..63836354 100644 --- a/tests/robotests/src/com/android/car/dialer/ui/dialpad/DialpadFragmentTest.java +++ b/tests/robotests/src/com/android/car/dialer/ui/dialpad/DialpadFragmentTest.java @@ -190,7 +190,7 @@ public class DialpadFragmentTest { startPlaceCallActivity(); mDialpadFragment.setDialedNumber(""); - ImageButton callButton = mDialpadFragment.getView().findViewById(R.id.call_button); + View callButton = mDialpadFragment.getView().findViewById(R.id.call_button); callButton.performClick(); verifyTitleText(DIAL_NUMBER); } @@ -237,7 +237,7 @@ public class DialpadFragmentTest { } private void verifyButtonVisibility(int callButtonVisibility, int deleteButtonVisibility) { - ImageButton callButton = mDialpadFragment.getView().findViewById(R.id.call_button); + View callButton = mDialpadFragment.getView().findViewById(R.id.call_button); ImageButton deleteButton = mDialpadFragment.getView().findViewById(R.id.delete_button); assertThat(callButton.getVisibility()).isEqualTo(callButtonVisibility); |