diff options
-rw-r--r-- | res/layout-land/call_button_fragment.xml | 12 | ||||
-rw-r--r-- | res/layout/call_button_fragment.xml | 4 | ||||
-rw-r--r-- | src/com/android/incallui/CallButtonFragment.java | 9 | ||||
-rw-r--r-- | src/com/android/incallui/CallRecordingButton.java | 3 |
4 files changed, 27 insertions, 1 deletions
diff --git a/res/layout-land/call_button_fragment.xml b/res/layout-land/call_button_fragment.xml index 354badde..5b9c4c12 100644 --- a/res/layout-land/call_button_fragment.xml +++ b/res/layout-land/call_button_fragment.xml @@ -87,6 +87,18 @@ <!-- Separator between 4th (or 5th) button and right padding --> <View style="@style/VerticalSeparator" /> + <com.android.incallui.CallRecordingButton + android:id="@+id/recordButton" + style="@style/InCallButton" + android:src="@drawable/ic_record_holo_dark" + android:contentDescription="@string/onscreenRecordText" + android:visibility="gone" + /> + + <View android:id="@+id/recordSpacer" + style="@style/VerticalSeparator" + android:visibility="gone" /> + <!-- "Blacklist" --> <!-- The button used for toggling blackist. --> <ImageButton android:id="@+id/addBlacklistButton" diff --git a/res/layout/call_button_fragment.xml b/res/layout/call_button_fragment.xml index 831fade9..a517de13 100644 --- a/res/layout/call_button_fragment.xml +++ b/res/layout/call_button_fragment.xml @@ -197,6 +197,10 @@ android:contentDescription="@string/onscreenBlacklistText" /> + <View android:id="@+id/recordSpacer" + style="@style/VerticalSeparator" + android:visibility="gone" /> + <com.android.incallui.CallRecordingButton android:id="@+id/recordButton" style="@style/InCallButton" diff --git a/src/com/android/incallui/CallButtonFragment.java b/src/com/android/incallui/CallButtonFragment.java index 368cae20..ba5ea8e4 100644 --- a/src/com/android/incallui/CallButtonFragment.java +++ b/src/com/android/incallui/CallButtonFragment.java @@ -59,6 +59,9 @@ public class CallButtonFragment private ImageButton mModifyCallButton; private CallRecordingButton mRecordButton; + private View mBlacklistSpacer; + private View mRecordSpacer; + private PopupMenu mAudioModePopup; private boolean mAudioModePopupVisible; private View mEndCallButton; @@ -158,18 +161,21 @@ public class CallButtonFragment // "Add to black list" button mBlacklistButton = (ImageButton) parent.findViewById(R.id.addBlacklistButton); + mBlacklistSpacer = parent.findViewById(R.id.blacklistSpacer); if (BlacklistUtils.isBlacklistEnabled(getActivity())) { mBlacklistButton.setVisibility(View.VISIBLE); mBlacklistButton.setOnClickListener(this); + mBlacklistSpacer.setVisibility(View.VISIBLE); } else { mBlacklistButton.setVisibility(View.GONE); + mBlacklistSpacer.setVisibility(View.GONE); } mModifyCallButton = (ImageButton) parent.findViewById(R.id.modifyCallButton); mModifyCallButton.setOnClickListener(this); mRecordButton = (CallRecordingButton) parent.findViewById(R.id.recordButton); - mRecordButton.setOnClickListener(mRecordButton); + mRecordSpacer = parent.findViewById(R.id.recordSpacer); return parent; } @@ -285,6 +291,7 @@ public class CallButtonFragment @Override public void showRecording(boolean show) { mRecordButton.setVisibility(show ? View.VISIBLE : View.GONE); + mRecordSpacer.setVisibility(show ? View.VISIBLE : View.GONE); } @Override diff --git a/src/com/android/incallui/CallRecordingButton.java b/src/com/android/incallui/CallRecordingButton.java index 1abef3d9..7cad4751 100644 --- a/src/com/android/incallui/CallRecordingButton.java +++ b/src/com/android/incallui/CallRecordingButton.java @@ -28,14 +28,17 @@ public class CallRecordingButton extends ImageButton public CallRecordingButton(Context context) { super(context); + setOnClickListener(this); } public CallRecordingButton(Context context, AttributeSet attrs) { super(context, attrs); + setOnClickListener(this); } public CallRecordingButton(Context context, AttributeSet attrs, int defStyle) { super(context, attrs, defStyle); + setOnClickListener(this); } @Override |