diff options
author | Yorke Lee <yorkelee@google.com> | 2013-09-09 09:55:14 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-09-09 09:55:14 -0700 |
commit | 11678cb8b4757e73c9918d253258ffee2165adce (patch) | |
tree | 1a2d904be70cb22271937e7e75e056ead763acbe | |
parent | 7dcbff7401310b272e547f974bb11b6254209101 (diff) | |
parent | 1844696b43bb0d0b6e9bd7145027599c6762ec32 (diff) |
am 1844696b: am 7bac419c: Merge "Tweak CallDetailActivity redlines" into klp-dev
* commit '1844696b43bb0d0b6e9bd7145027599c6762ec32':
Tweak CallDetailActivity redlines
-rw-r--r-- | res/layout/call_detail.xml | 6 | ||||
-rw-r--r-- | src/com/android/dialer/CallDetailActivity.java | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/res/layout/call_detail.xml b/res/layout/call_detail.xml index c9cc7d915..53f6b8ddb 100644 --- a/res/layout/call_detail.xml +++ b/res/layout/call_detail.xml @@ -73,10 +73,10 @@ </view> <LinearLayout - android:id="@+id/blue_separator" + android:id="@+id/separator" android:layout_width="match_parent" android:layout_height="1dip" - android:background="@android:color/holo_blue_light" + android:background="@color/background_dialer_light" android:layout_below="@+id/contact_background_sizer" /> <View @@ -126,7 +126,7 @@ android:id="@+id/voicemail_container" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_below="@id/blue_separator" + android:layout_below="@id/separator" android:paddingBottom="@dimen/call_detail_button_spacing"> <!-- The voicemail fragment will be put here. --> </LinearLayout> diff --git a/src/com/android/dialer/CallDetailActivity.java b/src/com/android/dialer/CallDetailActivity.java index 05c1e7fdc..1f41ac43c 100644 --- a/src/com/android/dialer/CallDetailActivity.java +++ b/src/com/android/dialer/CallDetailActivity.java @@ -567,7 +567,7 @@ public class CallDetailActivity extends Activity implements ProximitySensorAware private View mControls = findViewById(R.id.controls); private View mPhoto = findViewById(R.id.contact_background_sizer); private View mHeader = findViewById(R.id.photo_text_bar); - private View mSeparator = findViewById(R.id.blue_separator); + private View mSeparator = findViewById(R.id.separator); @Override public void setOffset(int offset) { |