summaryrefslogtreecommitdiff
path: root/res
diff options
context:
space:
mode:
authorSarmad Hashmi <mhashmi@google.com>2016-03-07 19:18:58 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-03-07 19:18:58 +0000
commite924ab425ba6e5afc2ae3754fb12317fdb6b2438 (patch)
tree2d96eeac18406a0473f23f9d05dfda7d56f4ade6 /res
parent1d806d0ca72320ea35db1cf3698ae4f3e47e30c3 (diff)
parent3696bc443fcabf8e5fb8af6a99ed2f547dad050d (diff)
Merge "Disable voicemail archive by default." into nyc-dev
am: 3696bc443f * commit '3696bc443fcabf8e5fb8af6a99ed2f547dad050d': Disable voicemail archive by default.
Diffstat (limited to 'res')
-rw-r--r--res/layout/voicemail_playback_layout.xml8
-rw-r--r--res/menu/dialtacts_options.xml3
2 files changed, 7 insertions, 4 deletions
diff --git a/res/layout/voicemail_playback_layout.xml b/res/layout/voicemail_playback_layout.xml
index 4d5f74f2d..984a52bf1 100644
--- a/res/layout/voicemail_playback_layout.xml
+++ b/res/layout/voicemail_playback_layout.xml
@@ -102,16 +102,18 @@
android:tint="@color/voicemail_icon_tint"
android:contentDescription="@string/call_log_trash_voicemail" />
- <Space
+ <Space android:id="@+id/space_before_archive_voicemail"
android:layout_width="0dp"
android:layout_height="match_parent"
- android:layout_weight="1"/>
+ android:layout_weight="1"
+ android:visibility="gone" />
<ImageButton android:id="@+id/archive_voicemail"
style="@style/VoicemailPlaybackLayoutButtonStyle"
android:src="@drawable/ic_archive_white_24dp"
android:tint="@color/voicemail_icon_tint"
- android:contentDescription="@string/call_log_archive_voicemail" />
+ android:contentDescription="@string/call_log_archive_voicemail"
+ android:visibility="gone" />
<Space
android:layout_width="0dp"
diff --git a/res/menu/dialtacts_options.xml b/res/menu/dialtacts_options.xml
index 8e31026a7..0f068f505 100644
--- a/res/menu/dialtacts_options.xml
+++ b/res/menu/dialtacts_options.xml
@@ -21,7 +21,8 @@
android:title="@string/action_menu_call_history_description" />
<item
android:id="@+id/menu_archive"
- android:title="@string/voicemail_archive_activity_title" />
+ android:title="@string/voicemail_archive_activity_title"
+ android:visible="false" />
<item
android:id="@+id/menu_import_export"
android:title="@string/menu_import_export" />