diff options
author | Danny Baumann <dannybaumann@web.de> | 2014-08-16 14:04:26 +0200 |
---|---|---|
committer | Danny Baumann <dannybaumann@web.de> | 2014-08-17 14:08:48 +0200 |
commit | 1e5ab915ecab69685329fe203f6f3ef90e5aa5c6 (patch) | |
tree | 8674aa277e6727d078d1e60f180ab10af629d6f3 /src | |
parent | d7ff41e6216d0d72f320e12c14f60ff709b7910f (diff) | |
download | packages_apps_InCallUI-1e5ab915ecab69685329fe203f6f3ef90e5aa5c6.tar.gz packages_apps_InCallUI-1e5ab915ecab69685329fe203f6f3ef90e5aa5c6.tar.bz2 packages_apps_InCallUI-1e5ab915ecab69685329fe203f6f3ef90e5aa5c6.zip |
Fix NPE in dock mode.
Add the call recording button also to the landscape layout. Also
properly add (and hide) button spacers.
Change-Id: Idc4c7669a78a7445a421bc28bd527f6d423f5c6a
Diffstat (limited to 'src')
-rw-r--r-- | src/com/android/incallui/CallButtonFragment.java | 9 | ||||
-rw-r--r-- | src/com/android/incallui/CallRecordingButton.java | 3 |
2 files changed, 11 insertions, 1 deletions
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 |