Gitiles
Code Review Sign In
review.blissroms.org / platform_packages_apps_Dialer / 533be9eade137cff8ad0e408c8bbe4b287811418^2..533be9eade137cff8ad0e408c8bbe4b287811418 / .
commit533be9eade137cff8ad0e408c8bbe4b287811418[log] [tgz]
authorNancy Chen <nancychen@google.com>Sat Oct 24 00:05:13 2015 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>Sat Oct 24 00:05:13 2015 +0000
tree6566a27ab955db4371a57aed12c34ccc4307114c
parent95fa53623dbde481cedb9ee2185fe1c0aaa702f3 [diff]
parent444a9f789db7db66c58d8dde4f56349f725f7483 [diff]
Merge "Fix indenting in primary_call_info.xml." into ub-contactsdialer-a-dev
diff --git a/InCallUI/res/drawable-hdpi/ab_transparent_dark_holo.9.png b/InCallUI/res/drawable-hdpi/ab_transparent_dark_holo.9.png
deleted file mode 100644
index 0eff695..0000000
--- a/InCallUI/res/drawable-hdpi/ab_transparent_dark_holo.9.png
+++ /dev/null
Binary files differ

diff --git a/InCallUI/res/drawable-hdpi/ic_lockscreen_handle_pressed.png b/InCallUI/res/drawable-hdpi/ic_lockscreen_handle_pressed.png
deleted file mode 100644
index 58a5f16..0000000
--- a/InCallUI/res/drawable-hdpi/ic_lockscreen_handle_pressed.png
+++ /dev/null
Binary files differ

diff --git a/InCallUI/res/drawable-mdpi/ab_transparent_dark_holo.9.png b/InCallUI/res/drawable-mdpi/ab_transparent_dark_holo.9.png
deleted file mode 100644
index ad980b1..0000000
--- a/InCallUI/res/drawable-mdpi/ab_transparent_dark_holo.9.png
+++ /dev/null
Binary files differ

diff --git a/InCallUI/res/drawable-mdpi/ic_lockscreen_answer_normal.png b/InCallUI/res/drawable-mdpi/ic_lockscreen_answer_normal.png
deleted file mode 100644
index da15c33..0000000
--- a/InCallUI/res/drawable-mdpi/ic_lockscreen_answer_normal.png
+++ /dev/null
Binary files differ

diff --git a/InCallUI/res/drawable-mdpi/ic_lockscreen_decline_activated.png b/InCallUI/res/drawable-mdpi/ic_lockscreen_decline_activated.png
deleted file mode 100644
index 6496626..0000000
--- a/InCallUI/res/drawable-mdpi/ic_lockscreen_decline_activated.png
+++ /dev/null
Binary files differ

diff --git a/InCallUI/res/drawable-mdpi/ic_lockscreen_decline_normal.png b/InCallUI/res/drawable-mdpi/ic_lockscreen_decline_normal.png
deleted file mode 100644
index 27fe093..0000000
--- a/InCallUI/res/drawable-mdpi/ic_lockscreen_decline_normal.png
+++ /dev/null
Binary files differ

diff --git a/InCallUI/res/drawable-mdpi/ic_lockscreen_handle_pressed.png b/InCallUI/res/drawable-mdpi/ic_lockscreen_handle_pressed.png
deleted file mode 100644
index 0187a02..0000000
--- a/InCallUI/res/drawable-mdpi/ic_lockscreen_handle_pressed.png
+++ /dev/null
Binary files differ

diff --git a/InCallUI/res/drawable-xhdpi/ab_transparent_dark_holo.9.png b/InCallUI/res/drawable-xhdpi/ab_transparent_dark_holo.9.png
deleted file mode 100644
index 719b923..0000000
--- a/InCallUI/res/drawable-xhdpi/ab_transparent_dark_holo.9.png
+++ /dev/null
Binary files differ

diff --git a/InCallUI/res/drawable-xhdpi/ic_lockscreen_answer_normal.png b/InCallUI/res/drawable-xhdpi/ic_lockscreen_answer_normal.png
deleted file mode 100644
index 983d5d9..0000000
--- a/InCallUI/res/drawable-xhdpi/ic_lockscreen_answer_normal.png
+++ /dev/null
Binary files differ

diff --git a/InCallUI/res/drawable-xhdpi/ic_lockscreen_decline_activated.png b/InCallUI/res/drawable-xhdpi/ic_lockscreen_decline_activated.png
deleted file mode 100644
index 317b329..0000000
--- a/InCallUI/res/drawable-xhdpi/ic_lockscreen_decline_activated.png
+++ /dev/null
Binary files differ

diff --git a/InCallUI/res/drawable-xhdpi/ic_lockscreen_decline_normal.png b/InCallUI/res/drawable-xhdpi/ic_lockscreen_decline_normal.png
deleted file mode 100644
index 2cb03e7..0000000
--- a/InCallUI/res/drawable-xhdpi/ic_lockscreen_decline_normal.png
+++ /dev/null
Binary files differ

diff --git a/InCallUI/res/drawable-xhdpi/ic_lockscreen_handle_pressed.png b/InCallUI/res/drawable-xhdpi/ic_lockscreen_handle_pressed.png
deleted file mode 100644
index 2d28009..0000000
--- a/InCallUI/res/drawable-xhdpi/ic_lockscreen_handle_pressed.png
+++ /dev/null
Binary files differ

diff --git a/InCallUI/res/drawable-xxhdpi/ab_transparent_dark_holo.9.png b/InCallUI/res/drawable-xxhdpi/ab_transparent_dark_holo.9.png
deleted file mode 100644
index 84155cc..0000000
--- a/InCallUI/res/drawable-xxhdpi/ab_transparent_dark_holo.9.png
+++ /dev/null
Binary files differ

diff --git a/InCallUI/res/drawable-xxhdpi/ic_lockscreen_answer_normal.png b/InCallUI/res/drawable-xxhdpi/ic_lockscreen_answer_normal.png
deleted file mode 100644
index fcf4367..0000000
--- a/InCallUI/res/drawable-xxhdpi/ic_lockscreen_answer_normal.png
+++ /dev/null
Binary files differ

diff --git a/InCallUI/res/drawable-xxhdpi/ic_lockscreen_decline_activated.png b/InCallUI/res/drawable-xxhdpi/ic_lockscreen_decline_activated.png
deleted file mode 100644
index 74b6cf0..0000000
--- a/InCallUI/res/drawable-xxhdpi/ic_lockscreen_decline_activated.png
+++ /dev/null
Binary files differ

diff --git a/InCallUI/res/drawable-xxhdpi/ic_lockscreen_decline_normal.png b/InCallUI/res/drawable-xxhdpi/ic_lockscreen_decline_normal.png
deleted file mode 100644
index 54b7965..0000000
--- a/InCallUI/res/drawable-xxhdpi/ic_lockscreen_decline_normal.png
+++ /dev/null
Binary files differ

diff --git a/InCallUI/res/drawable-xxhdpi/ic_lockscreen_handle_pressed.png b/InCallUI/res/drawable-xxhdpi/ic_lockscreen_handle_pressed.png
deleted file mode 100644
index 7528064..0000000
--- a/InCallUI/res/drawable-xxhdpi/ic_lockscreen_handle_pressed.png
+++ /dev/null
Binary files differ

diff --git a/InCallUI/res/drawable-xxxhdpi/fab_green.png b/InCallUI/res/drawable-xxxhdpi/fab_green.png
deleted file mode 100644
index aa8849e..0000000
--- a/InCallUI/res/drawable-xxxhdpi/fab_green.png
+++ /dev/null
Binary files differ

diff --git a/InCallUI/src/com/android/incallui/CallCardFragment.java b/InCallUI/src/com/android/incallui/CallCardFragment.java
index fa4e8b4..0d63554 100644
--- a/InCallUI/src/com/android/incallui/CallCardFragment.java
+++ b/InCallUI/src/com/android/incallui/CallCardFragment.java

@@ -1156,7 +1156,7 @@
         }
         mCallButtonsContainer.setBackgroundColor(themeColors.mPrimaryColor);
         mCallSubject.setTextColor(themeColors.mPrimaryColor);
-        mCallCardContent.setBackgroundColor(themeColors.mPrimaryColor);
+        mContactContext.setBackgroundColor(themeColors.mPrimaryColor);
         //TODO: set color of message text in call context "recent messages" to be the theme color.
 
         mCurrentThemeColors = themeColors;