summaryrefslogtreecommitdiffstats
path: root/AndroidManifest.xml
diff options
context:
space:
mode:
authorTyler Gunn <tgunn@google.com>2015-08-13 15:12:19 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-08-13 15:12:19 +0000
commitd94b24bc13c12bfa10d48614f27adae54fdd6902 (patch)
tree3e3bb2d41a6a2c91ecf962ab03ba3b49101351b5 /AndroidManifest.xml
parentf88d47081b2f4a04db5018f530d26590c5f1d1c6 (diff)
parent476bd2689302500835ce734812a67852c374927d (diff)
downloadandroid_packages_apps_Dialer-d94b24bc13c12bfa10d48614f27adae54fdd6902.tar.gz
android_packages_apps_Dialer-d94b24bc13c12bfa10d48614f27adae54fdd6902.tar.bz2
android_packages_apps_Dialer-d94b24bc13c12bfa10d48614f27adae54fdd6902.zip
Merge "Consolidate CallSubject history and dialog." into mnc-dr-dev
Diffstat (limited to 'AndroidManifest.xml')
-rw-r--r--AndroidManifest.xml5
1 files changed, 3 insertions, 2 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 2bf47071f..4055b4441 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -174,8 +174,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>