commit 44819eb10b04548cd0b86bb5f24ee7124568e3c0
author Cody Thomas <codyt@google.com> Thu May 12 00:09:14 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu May 12 00:09:15 2016 +0000
tree 1f6a47da0cacaa9e64a2a9ee524a171f24685af3
parent bbd0e7d3290f5eebb71f069e4444e3c241e893c8
parent f32dc990b2b5c1f743ce6d1520cc71e0fa573ebe

Merge "Remove the confirmation dialog when linking duplicates via the overflow menu and quick contact."

res/layout/people_activity.xml

diff --git a/res/layout/people_activity.xml b/res/layout/people_activity.xml
index 8b4dc18..fe51c6f 100644
--- a/res/layout/people_activity.xml
+++ b/res/layout/people_activity.xml
@@ -76,7 +76,6 @@
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
         android:layout_gravity="start"
-        android:fitsSystemWindows="true"
         app:headerLayout="@layout/nav_header_main"
         app:menu="@menu/activity_main_drawer"/>
 

src/com/android/contacts/activities/PeopleActivity.java

diff --git a/src/com/android/contacts/activities/PeopleActivity.java b/src/com/android/contacts/activities/PeopleActivity.java
index db85784..b692bde 100644
--- a/src/com/android/contacts/activities/PeopleActivity.java
+++ b/src/com/android/contacts/activities/PeopleActivity.java
@@ -64,6 +64,7 @@
 import com.android.contacts.common.ContactsUtils;
 import com.android.contacts.common.activity.RequestPermissionsActivity;
 import com.android.contacts.common.compat.BlockedNumberContractCompat;
+import com.android.contacts.common.compat.CompatUtils;
 import com.android.contacts.common.compat.TelecomManagerUtil;
 import com.android.contacts.common.interactions.ImportExportDialogFragment;
 import com.android.contacts.common.list.ContactEntryListFragment;
@@ -254,6 +255,9 @@
             Log.d(Constants.PERFORMANCE_TAG, "PeopleActivity.onCreate finish");
         }
         getWindow().setBackgroundDrawable(null);
+        if (CompatUtils.isLollipopCompatible()) {
+            getWindow().setStatusBarColor(Color.TRANSPARENT);
+        }
     }
 
     @Override