diff options
author | Sarmad Hashmi <mhashmi@google.com> | 2016-03-11 23:51:59 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-03-11 23:51:59 +0000 |
commit | 4dd273c86dc35397248fa6b548ed11cb369bc785 (patch) | |
tree | f5e7d9258d8d4273512e3095b4b2e53fef1e90f8 | |
parent | ab1319e179d3e54c172b7574686db5f8fa6caa98 (diff) | |
parent | cf4e90702260cc04c42c202affac7da351454058 (diff) |
Add share button to voicemail cards. am: 83f27f563c
am: cf4e907022
* commit 'cf4e90702260cc04c42c202affac7da351454058':
Add share button to voicemail cards.
-rw-r--r-- | res/drawable-hdpi/ic_share_white_24dp.png | bin | 0 -> 397 bytes | |||
-rw-r--r-- | res/drawable-mdpi/ic_share_white_24dp.png | bin | 0 -> 268 bytes | |||
-rw-r--r-- | res/drawable-xhdpi/ic_share_white_24dp.png | bin | 0 -> 496 bytes | |||
-rw-r--r-- | res/drawable-xxhdpi/ic_share_white_24dp.png | bin | 0 -> 698 bytes | |||
-rw-r--r-- | res/drawable-xxxhdpi/ic_share_white_24dp.png | bin | 0 -> 938 bytes | |||
-rw-r--r-- | res/layout/voicemail_playback_layout.xml | 13 | ||||
-rw-r--r-- | res/values/strings.xml | 3 | ||||
-rw-r--r-- | src/com/android/dialer/voicemail/VoicemailPlaybackLayout.java | 14 | ||||
-rw-r--r-- | src/com/android/dialerbind/ObjectFactory.java | 4 |
9 files changed, 34 insertions, 0 deletions
diff --git a/res/drawable-hdpi/ic_share_white_24dp.png b/res/drawable-hdpi/ic_share_white_24dp.png Binary files differnew file mode 100644 index 000000000..b09a6926d --- /dev/null +++ b/res/drawable-hdpi/ic_share_white_24dp.png diff --git a/res/drawable-mdpi/ic_share_white_24dp.png b/res/drawable-mdpi/ic_share_white_24dp.png Binary files differnew file mode 100644 index 000000000..e944fd70c --- /dev/null +++ b/res/drawable-mdpi/ic_share_white_24dp.png diff --git a/res/drawable-xhdpi/ic_share_white_24dp.png b/res/drawable-xhdpi/ic_share_white_24dp.png Binary files differnew file mode 100644 index 000000000..22a8783e7 --- /dev/null +++ b/res/drawable-xhdpi/ic_share_white_24dp.png diff --git a/res/drawable-xxhdpi/ic_share_white_24dp.png b/res/drawable-xxhdpi/ic_share_white_24dp.png Binary files differnew file mode 100644 index 000000000..a35b3cd14 --- /dev/null +++ b/res/drawable-xxhdpi/ic_share_white_24dp.png diff --git a/res/drawable-xxxhdpi/ic_share_white_24dp.png b/res/drawable-xxxhdpi/ic_share_white_24dp.png Binary files differnew file mode 100644 index 000000000..e351c7beb --- /dev/null +++ b/res/drawable-xxxhdpi/ic_share_white_24dp.png diff --git a/res/layout/voicemail_playback_layout.xml b/res/layout/voicemail_playback_layout.xml index 984a52bf1..178e888bb 100644 --- a/res/layout/voicemail_playback_layout.xml +++ b/res/layout/voicemail_playback_layout.xml @@ -102,6 +102,19 @@ android:tint="@color/voicemail_icon_tint" android:contentDescription="@string/call_log_trash_voicemail" /> + <Space android:id="@+id/space_before_share_voicemail" + android:layout_width="0dp" + android:layout_height="match_parent" + android:layout_weight="1" + android:visibility="gone" /> + + <ImageButton android:id="@+id/share_voicemail" + style="@style/VoicemailPlaybackLayoutButtonStyle" + android:src="@drawable/ic_share_white_24dp" + android:tint="@color/voicemail_icon_tint" + android:contentDescription="@string/call_log_share_voicemail" + android:visibility="gone" /> + <Space android:id="@+id/space_before_archive_voicemail" android:layout_width="0dp" android:layout_height="match_parent" diff --git a/res/values/strings.xml b/res/values/strings.xml index 830af65b8..b8f8679bc 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -87,6 +87,9 @@ <!-- Menu item used to archive a voicemail. [CHAR LIMIT=30] --> <string name="call_log_archive_voicemail">Archive voicemail</string> + <!-- Menu item used to send a voicemail through other applications [CHAR LIMIT=30] --> + <string name="call_log_share_voicemail">Share voicemail</string> + <!-- Text for snackbar to undo a voicemail delete. [CHAR LIMIT=30] --> <string name="snackbar_voicemail_deleted">Voicemail deleted</string> diff --git a/src/com/android/dialer/voicemail/VoicemailPlaybackLayout.java b/src/com/android/dialer/voicemail/VoicemailPlaybackLayout.java index 0cbe7f2c2..8c869d183 100644 --- a/src/com/android/dialer/voicemail/VoicemailPlaybackLayout.java +++ b/src/com/android/dialer/voicemail/VoicemailPlaybackLayout.java @@ -275,7 +275,11 @@ public class VoicemailPlaybackLayout extends LinearLayout private ImageButton mPlaybackSpeakerphone; private ImageButton mDeleteButton; private ImageButton mArchiveButton; + private ImageButton mShareButton; + private Space mArchiveSpace; + private Space mShareSpace; + private TextView mStateText; private TextView mPositionText; private TextView mTotalDurationText; @@ -304,6 +308,12 @@ public class VoicemailPlaybackLayout extends LinearLayout updateArchiveUI(mVoicemailUri); updateArchiveButton(mVoicemailUri); } + + if (ObjectFactory.isVoicemailShareEnabled(mContext)) { + // Show share button and space before it + mShareSpace.setVisibility(View.VISIBLE); + mShareButton.setVisibility(View.VISIBLE); + } } @Override @@ -315,7 +325,11 @@ public class VoicemailPlaybackLayout extends LinearLayout mPlaybackSpeakerphone = (ImageButton) findViewById(R.id.playback_speakerphone); mDeleteButton = (ImageButton) findViewById(R.id.delete_voicemail); mArchiveButton =(ImageButton) findViewById(R.id.archive_voicemail); + mShareButton = (ImageButton) findViewById(R.id.share_voicemail); + mArchiveSpace = (Space) findViewById(R.id.space_before_archive_voicemail); + mShareSpace = (Space) findViewById(R.id.space_before_share_voicemail); + mStateText = (TextView) findViewById(R.id.playback_state_text); mPositionText = (TextView) findViewById(R.id.playback_position_text); mTotalDurationText = (TextView) findViewById(R.id.total_duration_text); diff --git a/src/com/android/dialerbind/ObjectFactory.java b/src/com/android/dialerbind/ObjectFactory.java index 935c9f73a..9f75e3912 100644 --- a/src/com/android/dialerbind/ObjectFactory.java +++ b/src/com/android/dialerbind/ObjectFactory.java @@ -48,6 +48,10 @@ public class ObjectFactory { return false; } + public static boolean isVoicemailShareEnabled(Context context) { + return false; + } + @Nullable public static ExtendedBlockingButtonRenderer newExtendedBlockingButtonRenderer( Context context, ExtendedBlockingButtonRenderer.Listener listener) { |