Merge "Remove live folders"
diff --git a/res/layout/call_log_voicemail_status.xml b/res/layout/call_log_voicemail_status.xml
index 280dfd0..191c821 100644
--- a/res/layout/call_log_voicemail_status.xml
+++ b/res/layout/call_log_voicemail_status.xml
@@ -27,15 +27,9 @@
android:layout_weight="1"
android:paddingLeft="@dimen/call_log_outer_margin"
android:paddingRight="@dimen/call_log_inner_margin"
+ android:textAppearance="?android:attr/textAppearanceMedium"
android:textColor="?attr/call_log_voicemail_status_text_color"
/>
- <View
- android:id="@+id/voicemail_status_divider"
- android:layout_width="1px"
- android:layout_height="@dimen/call_log_call_action_size"
- android:layout_gravity="center_vertical"
- android:background="@drawable/ic_divider_dashed_holo_dark"
- />
<TextView
android:id="@+id/voicemail_status_action"
android:layout_width="wrap_content"
@@ -43,7 +37,8 @@
android:gravity="center_vertical"
android:paddingLeft="@dimen/call_log_inner_margin"
android:paddingRight="@dimen/call_log_outer_margin"
- android:textColor="?attr/call_log_voicemail_status_text_color"
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ android:textColor="?attr/call_log_voicemail_status_action_text_color"
android:background="?android:attr/selectableItemBackground"
android:clickable="true"
/>
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index d79d373..a4f1b07 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -114,6 +114,7 @@
<attr name="call_log_voicemail_status_height" format="dimension" />
<attr name="call_log_voicemail_status_background_color" format="color" />
<attr name="call_log_voicemail_status_text_color" format="color" />
+ <attr name="call_log_voicemail_status_action_text_color" format="color" />
</declare-styleable>
<declare-styleable name="Favorites">
diff --git a/res/values/styles.xml b/res/values/styles.xml
index dd62594..db2e0d4 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -55,10 +55,11 @@
<item name="call_log_secondary_background_color">#333333</item>
<item name="call_log_header_color">#33b5e5</item>
<!-- VoicemailStatus -->
- <item name="call_log_voicemail_status_height">40dip</item>
- <item name="call_log_voicemail_status_background_color">#FFFFE0</item>
- <item name="call_log_voicemail_status_text_color">#000000</item>
- <!-- Favorites -->
+ <item name="call_log_voicemail_status_height">48dip</item>
+ <item name="call_log_voicemail_status_background_color">#262626</item>
+ <item name="call_log_voicemail_status_text_color">#888888</item>
+ <item name="call_log_voicemail_status_action_text_color">#33b5e5</item>
+ <!-- Favorites -->
<item name="favorites_padding_bottom">?android:attr/actionBarSize</item>
</style>
@@ -72,9 +73,10 @@
<item name="call_log_secondary_background_color">#333333</item>
<item name="call_log_header_color">#33b5e5</item>
<!-- VoicemailStatus -->
- <item name="call_log_voicemail_status_height">40dip</item>
- <item name="call_log_voicemail_status_background_color">#FFFFE0</item>
- <item name="call_log_voicemail_status_text_color">#000000</item>
+ <item name="call_log_voicemail_status_height">48dip</item>
+ <item name="call_log_voicemail_status_background_color">#262626</item>
+ <item name="call_log_voicemail_status_text_color">#888888</item>
+ <item name="call_log_voicemail_status_action_text_color">#33b5e5</item>
</style>
<style name="DetailActivityTheme" parent="@android:style/Theme.Holo.Light.DarkActionBar">
diff --git a/src/com/android/contacts/calllog/CallLogFragment.java b/src/com/android/contacts/calllog/CallLogFragment.java
index f66bbd0..79f3499 100644
--- a/src/com/android/contacts/calllog/CallLogFragment.java
+++ b/src/com/android/contacts/calllog/CallLogFragment.java
@@ -75,7 +75,6 @@
private View mStatusMessageView;
private TextView mStatusMessageText;
private TextView mStatusMessageAction;
- private View mStatusMessageDivider;
private KeyguardManager mKeyguardManager;
@Override
@@ -144,7 +143,6 @@
mStatusMessageView = view.findViewById(R.id.voicemail_status);
mStatusMessageText = (TextView) view.findViewById(R.id.voicemail_status_message);
mStatusMessageAction = (TextView) view.findViewById(R.id.voicemail_status_action);
- mStatusMessageDivider = view.findViewById(R.id.voicemail_status_divider);
return view;
}
@@ -186,7 +184,6 @@
}
if (message.actionUri != null) {
mStatusMessageAction.setVisibility(View.VISIBLE);
- mStatusMessageDivider.setVisibility(View.VISIBLE);
mStatusMessageAction.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
@@ -196,7 +193,6 @@
});
} else {
mStatusMessageAction.setVisibility(View.GONE);
- mStatusMessageDivider.setVisibility(View.GONE);
}
}
}