From 5f87e923b0300173ad68f73a47b0dca7348d6a1f Mon Sep 17 00:00:00 2001
From: Tyler Gunn <tgunn@google.com>
Date: Wed, 5 Aug 2015 14:24:52 -0700
Subject: Add support for "call with note" in quick contacts.

- Add "call with note" for third button (this is in place of the video call
button if it is present; mocks show a new treatment for video calls which
we can revisit in the future if need be).

Bug: 22685114
Change-Id: Idd8c17abc811720e1bca0d0a1864204dbe3610ff
---
 AndroidManifest.xml | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'AndroidManifest.xml')

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index d86d69bcf..5ed0acddc 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -490,6 +490,13 @@
             </intent-filter>
         </activity>
 
+        <activity android:name="com.android.contacts.common.dialog.CallSubjectHistory"
+                  android:theme="@style/Theme.CallSubjectSelector">
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW"/>
+            </intent-filter>
+        </activity>
+
         <!-- Service that is exclusively for the Phone application that sends out a view
              notification. This service might be removed in future versions of the app.
 
-- 
cgit v1.2.3


From 71d1a967eb611ab5a9708ad9de3c425d56353ed4 Mon Sep 17 00:00:00 2001
From: Tyler Gunn <tgunn@google.com>
Date: Mon, 10 Aug 2015 10:02:59 -0700
Subject: Consolidate CallSubject history and dialog.

- Removed CallSubjectHistory activity and put that functionality into
CallSubjectDialog.
- This was to give better control of layout and make it possible to
animate between show/hide of call subject history.

Bug: 22685114
Change-Id: I34a127b430c129c3f6333536b9da9808effa35a6
---
 AndroidManifest.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'AndroidManifest.xml')

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 5ed0acddc..68adf0f6a 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -490,8 +490,9 @@
             </intent-filter>
         </activity>
 
-        <activity android:name="com.android.contacts.common.dialog.CallSubjectHistory"
-                  android:theme="@style/Theme.CallSubjectSelector">
+        <activity android:name="com.android.contacts.common.dialog.CallSubjectDialog"
+                  android:theme="@style/Theme.CallSubjectDialogTheme"
+                  android:windowSoftInputMode="stateVisible|adjustResize">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW"/>
             </intent-filter>
-- 
cgit v1.2.3


From 3e5c8dda05966c6cb93d7137ceb51cd2f0176c66 Mon Sep 17 00:00:00 2001
From: Jay Shrauner <shrauner@google.com>
Date: Mon, 24 Aug 2015 12:22:01 -0700
Subject: Remove PinnedHeaderListDemoActivity

Remove test activity that was triggering automated test failures.

Bug:23263168
Change-Id: I44f2410fad3c11ae764b093ac109846298ff473e
---
 AndroidManifest.xml | 8 --------
 1 file changed, 8 deletions(-)

(limited to 'AndroidManifest.xml')

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 68adf0f6a..69ab23129 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -453,14 +453,6 @@
             android:exported="false" />
         <!-- end vCard related -->
 
-        <!-- Pinned header list demo -->
-        <activity android:name=".widget.PinnedHeaderListDemoActivity">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-        </activity>
-
         <!-- Intercept Dialer Intents for devices without a phone.
              This activity should have the same intent filters as the DialtactsActivity,
              so that its capturing the same events. Omit android.intent.category.LAUNCHER, because
-- 
cgit v1.2.3