Merge "Added optional uses-feature telephony to enable tablet installs (1/3)"
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 5525236..5dd56dc 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -16,8 +16,8 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.android.contacts"
- android:versionCode="10505"
- android:versionName="1.5.5">
+ android:versionCode="10506"
+ android:versionName="1.5.6">
<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="24" />
diff --git a/res/layout-land/people_activity_toolbar.xml b/res/layout-land/people_activity_toolbar.xml
index c110133..8fb0dc1 100644
--- a/res/layout-land/people_activity_toolbar.xml
+++ b/res/layout-land/people_activity_toolbar.xml
@@ -29,7 +29,7 @@
android:id="@+id/toolbar_frame"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
- android:background="@color/actionbar_background_color">
+ android:background="?attr/colorPrimary">
<!-- the attribute padding removes the gap between this Toolbar and its parent FrameLayout on tablet -->
<android.support.v7.widget.Toolbar
diff --git a/res/layout/people_activity_toolbar.xml b/res/layout/people_activity_toolbar.xml
index 3826242..edca3ba 100644
--- a/res/layout/people_activity_toolbar.xml
+++ b/res/layout/people_activity_toolbar.xml
@@ -25,7 +25,7 @@
android:id="@+id/toolbar_frame"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
- android:background="@color/actionbar_background_color">
+ android:background="?attr/colorPrimary">
<!-- the attribute padding removes the gap between this Toolbar and its parent FrameLayout on tablet -->
<android.support.v7.widget.Toolbar