diff options
author | Tyler Gunn <tgunn@google.com> | 2015-08-13 15:12:20 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-08-13 15:12:20 +0000 |
commit | 3faa80822a4f0a205568f660bf8de09913b86e01 (patch) | |
tree | f6a11ddaa03ed916f87ea27f6a87e9aa11ccb8cf /AndroidManifest.xml | |
parent | f7483e59b389716a8e34ae419f03c687ca7ac480 (diff) | |
parent | 71d1a967eb611ab5a9708ad9de3c425d56353ed4 (diff) | |
download | packages_apps_Contacts-3faa80822a4f0a205568f660bf8de09913b86e01.tar.gz packages_apps_Contacts-3faa80822a4f0a205568f660bf8de09913b86e01.tar.bz2 packages_apps_Contacts-3faa80822a4f0a205568f660bf8de09913b86e01.zip |
Merge "Consolidate CallSubject history and dialog." into mnc-dr-dev
Diffstat (limited to 'AndroidManifest.xml')
-rw-r--r-- | AndroidManifest.xml | 5 |
1 files changed, 3 insertions, 2 deletions
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> |