summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTyler Gunn <tgunn@google.com>2015-08-10 10:03:37 -0700
committerTyler Gunn <tgunn@google.com>2015-08-10 10:03:37 -0700
commit476bd2689302500835ce734812a67852c374927d (patch)
tree5c6b1e39b842ee8eda995d3b6d6effbc83d31f12
parentc72f419b18258cfc6f29590e3b97dac8b175f904 (diff)
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: Ie5200e8d925f0a58558f1adff1e7234edc1db1b9
-rw-r--r--AndroidManifest.xml5
1 files changed, 3 insertions, 2 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index ae1e3d627..493676883 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -172,8 +172,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>