Merge remote-tracking branch 'goog/master-nova' into merge

Conflicts:
	res/layout/call_card.xml
	res/values-da/strings.xml
	res/values-hi/strings.xml
	src/com/android/incallui/CallButtonPresenter.java
	src/com/android/incallui/CallCardFragment.java
	src/com/android/incallui/CallCardPresenter.java
	src/com/android/incallui/DialpadFragment.java

Change-Id: I6b3a2b063a2efd76330d4833cd95be3132f01462

1 files changed, 28 insertions, 0 deletions

diff --git a/InCallUI/res/drawable/floating_handoff_button_disabled_background.xml b/InCallUI/res/drawable/floating_handoff_button_disabled_background.xml
new file mode 100644
index 000000000..68d64b8e0
--- /dev/null
+++ b/InCallUI/res/drawable/floating_handoff_button_disabled_background.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval" >
+    <corners
+        android:radius="@dimen/floating_action_button_radius" />
+    <size
+        android:width="@dimen/floating_action_button_width"
+        android:height="@dimen/floating_action_button_height" />
+    <solid
+        android:color="@color/handoff_call_disabled_color" />
+</shape>