commit b75845b2844de5e967f06eb08e385bac655f17e7
author Brian Attwell <brianattwell@google.com> Wed Sep 10 23:35:33 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Sep 10 23:35:33 2014 +0000
tree 8731ca5403b1595260fbd4f1a10e071a2812209c
parent 2e6387f0bef606bb4be3facaedeafd080156d6c6
parent 00caeae698957121d00cdaaf23d087c009207015

Merge "Increase padding above contact list" into lmp-dev

src/com/android/contacts/quickcontact/ExpandingEntryCardView.java

diff --git a/src/com/android/contacts/quickcontact/ExpandingEntryCardView.java b/src/com/android/contacts/quickcontact/ExpandingEntryCardView.java
index 45d0e43..1313e24 100644
--- a/src/com/android/contacts/quickcontact/ExpandingEntryCardView.java
+++ b/src/com/android/contacts/quickcontact/ExpandingEntryCardView.java
@@ -774,6 +774,8 @@
         transitionSet.addTransition(boundsTransition);
         transitionSet.addTransition(fadeIn);
 
+        transitionSet.excludeTarget(R.id.text, /* exclude = */ true);
+
         final ViewGroup transitionViewContainer = mAnimationViewGroup == null ?
                 this : mAnimationViewGroup;
 

src/com/android/contacts/quickcontact/QuickContactActivity.java

diff --git a/src/com/android/contacts/quickcontact/QuickContactActivity.java b/src/com/android/contacts/quickcontact/QuickContactActivity.java
index 5c2522d..360ffb7 100644
--- a/src/com/android/contacts/quickcontact/QuickContactActivity.java
+++ b/src/com/android/contacts/quickcontact/QuickContactActivity.java
@@ -175,7 +175,8 @@
 
     private static final int ANIMATION_STATUS_BAR_COLOR_CHANGE_DURATION = 150;
     private static final int REQUEST_CODE_CONTACT_EDITOR_ACTIVITY = 1;
-    private static final int SCRIM_COLOR = Color.argb(0xC8, 0, 0, 0);
+    private static final int DEFAULT_SCRIM_ALPHA = 0xC8;
+    private static final int SCRIM_COLOR = Color.argb(DEFAULT_SCRIM_ALPHA, 0, 0, 0);
     private static final int REQUEST_CODE_CONTACT_SELECTION_ACTIVITY = 2;
     private static final String MIMETYPE_SMS = "vnd.android-dir/mms-sms";
 
@@ -357,6 +358,16 @@
                 }
             }
 
+            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+
+            // Force the window dim amount to the scrim value for app transition animations
+            // The scrim may be removed before the window transitions to the new activity, which
+            // can cause a flicker in the status and navigation bar. Set dim alone does not work
+            // well because the request is passed through IPC which makes it slow to animate.
+            getWindow().setFlags(WindowManager.LayoutParams.FLAG_DIM_BEHIND,
+                    WindowManager.LayoutParams.FLAG_DIM_BEHIND);
+            getWindow().setDimAmount(mWindowScrim.getAlpha() / DEFAULT_SCRIM_ALPHA);
+
             mHasIntentLaunched = true;
             startActivity(intent);
         }