summaryrefslogtreecommitdiffstats
path: root/src/com/android/car/dialer/ui/dialpad/DialpadFragment.java
diff options
context:
space:
mode:
authorCole Faust <colefaust@google.com>2019-05-14 14:51:23 -0700
committerCole Faust <colefaust@google.com>2019-05-22 11:44:31 -0700
commit47803eb9fd62995c65095dbf657a044ad9fbca25 (patch)
tree44271bbc14dcc33ff8dd6ebbe4be26ff1c7856f6 /src/com/android/car/dialer/ui/dialpad/DialpadFragment.java
parent1dac49103a130c84e676ddd31ee16f126eccc1aa (diff)
downloadplatform_packages_apps_Car_Dialer-47803eb9fd62995c65095dbf657a044ad9fbca25.tar.gz
platform_packages_apps_Car_Dialer-47803eb9fd62995c65095dbf657a044ad9fbca25.tar.bz2
platform_packages_apps_Car_Dialer-47803eb9fd62995c65095dbf657a044ad9fbca25.zip
Add timestamp to ongoing call when dialpad is open
Also vertically center the dialed numbers on the landscape mode in call dialpad. Bug: 132246986 Test: Manually Change-Id: Ic962b8e7b813d10c7dca236804f0ea2f4a95b638
Diffstat (limited to 'src/com/android/car/dialer/ui/dialpad/DialpadFragment.java')
-rw-r--r--src/com/android/car/dialer/ui/dialpad/DialpadFragment.java24
1 files changed, 22 insertions, 2 deletions
diff --git a/src/com/android/car/dialer/ui/dialpad/DialpadFragment.java b/src/com/android/car/dialer/ui/dialpad/DialpadFragment.java
index 6b137f8e..fd13e99e 100644
--- a/src/com/android/car/dialer/ui/dialpad/DialpadFragment.java
+++ b/src/com/android/car/dialer/ui/dialpad/DialpadFragment.java
@@ -36,6 +36,8 @@ import android.widget.ImageButton;
import android.widget.TextView;
import androidx.annotation.Nullable;
+import androidx.constraintlayout.widget.ConstraintLayout;
+import androidx.constraintlayout.widget.Guideline;
import androidx.lifecycle.ViewModelProviders;
import com.android.car.dialer.R;
@@ -107,6 +109,7 @@ public class DialpadFragment extends DialerBaseFragment implements
private TextView mTitleView;
private TextView mDisplayName;
+ private TextView mCallStateView;
private ImageButton mDeleteButton;
private int mMode;
private StringBuffer mNumber = new StringBuffer(MAX_DIAL_NUMBER);
@@ -171,17 +174,34 @@ 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);
+ mCallStateView = rootView.findViewById(R.id.call_state);
+
View callButton = rootView.findViewById(R.id.call_button);
mDeleteButton = rootView.findViewById(R.id.delete_button);
if (mMode == MODE_IN_CALL) {
+ Guideline guideLine = rootView.findViewById(R.id.dialpad_info_guideline);
+ // The guideline doesn't exist on portrait
+ if (guideLine != null) {
+ ConstraintLayout.LayoutParams params =
+ (ConstraintLayout.LayoutParams) guideLine.getLayoutParams();
+ params.guidePercent = getContext().getResources().getFloat(
+ R.dimen.dialpad_info_guideline_in_call);
+ guideLine.setLayoutParams(params);
+ }
mDeleteButton.setVisibility(View.GONE);
callButton.setVisibility(View.GONE);
- mActiveCall = ViewModelProviders.of(getActivity()).get(
- InCallViewModel.class).getPrimaryCall().getValue();
+ mCallStateView.setVisibility(View.VISIBLE);
+
+ InCallViewModel viewModel = ViewModelProviders.of(getActivity()).get(
+ InCallViewModel.class);
+ mActiveCall = viewModel.getPrimaryCall().getValue();
+ viewModel.getCallStateDescription().observe(this,
+ (state) -> mCallStateView.setText(state));
} else {
callButton.setVisibility(View.VISIBLE);
mDeleteButton.setVisibility(View.GONE);
+ mCallStateView.setVisibility(View.GONE);
Context context = getContext();
callButton.setOnClickListener((unusedView) -> {
if (!TextUtils.isEmpty(mNumber.toString())) {