diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2017-10-24 22:41:00 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-10-24 22:41:00 +0000 |
| commit | daa1c44c00f3c598223639c9b80a52cf41db51ba (patch) | |
| tree | e4c88a1862b157dc858abe73e52b077bf7b96948 /java/com/android/dialer/main/impl/AndroidManifest.xml | |
| parent | ef7338cf787301c573fde8129bf8880d7faba040 (diff) | |
| parent | 938468da6f5c225ebb161a68bd949c9cf3261892 (diff) | |
Merge "Rename the new bubble package name from "bubble" to "newbubble"."
Diffstat (limited to 'java/com/android/dialer/main/impl/AndroidManifest.xml')
| -rw-r--r-- | java/com/android/dialer/main/impl/AndroidManifest.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/java/com/android/dialer/main/impl/AndroidManifest.xml b/java/com/android/dialer/main/impl/AndroidManifest.xml index 8edde507c..6b7475f97 100644 --- a/java/com/android/dialer/main/impl/AndroidManifest.xml +++ b/java/com/android/dialer/main/impl/AndroidManifest.xml @@ -32,7 +32,7 @@ android:theme="@style/NuiMainActivityTheme" android:windowSoftInputMode="stateAlwaysHidden|adjustNothing"> - <!-- LINT.IfChange --> + <intent-filter> <action android:name="android.intent.action.DIAL"/> @@ -98,7 +98,7 @@ <category android:name="android.intent.category.DEFAULT"/> <category android:name="android.intent.category.TAB"/> </intent-filter> - <!-- LINT.ThenChange(//depot/google3/third_party/java_src/android_app/dialer/java/com/android/dialer/app/manifests/activities/AndroidManifest.xml) --> + <meta-data android:name="com.android.keyguard.layout" |