summaryrefslogtreecommitdiff
path: root/java/com/android/dialer
diff options
context:
space:
mode:
authorcalderwoodra <calderwoodra@google.com>2018-03-23 11:46:08 -0700
committerCopybara-Service <copybara-piper@google.com>2018-03-26 22:18:57 -0700
commitfc70dda73c9e2967b427912919d7454745b9d133 (patch)
tree47ee776c262bcedb5d14a687252ab6bdb5f3f7e5 /java/com/android/dialer
parentd74e72e59795d39836a893afb60447acce9e9886 (diff)
Cleaned up the AndroidManifest Intent Filters.
Bug: 75962274,75967273,75972847 Test: manual PiperOrigin-RevId: 190251834 Change-Id: I3673a6b20a886ded86dc4e1a8f75a82e5e0bb199
Diffstat (limited to 'java/com/android/dialer')
-rw-r--r--java/com/android/dialer/app/manifests/activities/AndroidManifest.xml25
-rw-r--r--java/com/android/dialer/main/impl/AndroidManifest.xml72
2 files changed, 7 insertions, 90 deletions
diff --git a/java/com/android/dialer/app/manifests/activities/AndroidManifest.xml b/java/com/android/dialer/app/manifests/activities/AndroidManifest.xml
index b9e5f6201..31960c979 100644
--- a/java/com/android/dialer/app/manifests/activities/AndroidManifest.xml
+++ b/java/com/android/dialer/app/manifests/activities/AndroidManifest.xml
@@ -37,16 +37,11 @@
<!-- The entrance point for Phone UI.
stateAlwaysHidden is set to suppress keyboard show up on
dialpad screen. -->
- <activity
- android:enabled="false"
- android:clearTaskOnLaunch="true"
- android:directBootAware="true"
- android:label="@string/launcherActivityLabel"
- android:launchMode="singleTask"
- android:name="com.android.dialer.app.DialtactsActivity"
- android:resizeableActivity="true"
- android:theme="@style/DialtactsActivityTheme"
- android:windowSoftInputMode="stateAlwaysHidden|adjustNothing">
+ <activity-alias
+ android:exported="true"
+ android:name="com.android.dialer.app.DialtactsActivity"
+ android:targetActivity="com.android.dialer.main.impl.MainActivity">
+
<intent-filter>
<action android:name="android.intent.action.DIAL"/>
@@ -106,23 +101,17 @@
<category android:name="android.intent.category.DEFAULT"/>
<category android:name="android.intent.category.TAB"/>
</intent-filter>
- <intent-filter android:label="@string/callHistoryIconLabel">
+ <intent-filter android:label="@string/main_call_history_tab_description">
<action android:name="com.android.phone.action.RECENT_CALLS"/>
<category android:name="android.intent.category.DEFAULT"/>
<category android:name="android.intent.category.TAB"/>
</intent-filter>
-
- <meta-data
- android:name="com.android.keyguard.layout"
- android:resource="@layout/keyguard_preview"/>
- </activity>
+ </activity-alias>
<activity-alias
android:exported="true"
android:name="com.android.dialer.DialtactsActivity"
android:targetActivity="com.android.dialer.main.impl.MainActivity"/>
-
</application>
-
</manifest>
diff --git a/java/com/android/dialer/main/impl/AndroidManifest.xml b/java/com/android/dialer/main/impl/AndroidManifest.xml
index b3d916bee..4608e4299 100644
--- a/java/com/android/dialer/main/impl/AndroidManifest.xml
+++ b/java/com/android/dialer/main/impl/AndroidManifest.xml
@@ -22,8 +22,6 @@
<activity
android:clearTaskOnLaunch="true"
android:directBootAware="true"
- android:exported="true"
- android:icon="@drawable/nui_launcher_icon"
android:label="@string/main_activity_label"
android:launchMode="singleTask"
android:name="com.android.dialer.main.impl.MainActivity"
@@ -31,79 +29,9 @@
android:theme="@style/NuiActivityTheme"
android:windowSoftInputMode="stateAlwaysHidden|adjustNothing">
-
- <intent-filter>
- <action android:name="android.intent.action.DIAL"/>
-
- <category android:name="android.intent.category.DEFAULT"/>
- <category android:name="android.intent.category.BROWSABLE"/>
-
- <data android:mimeType="vnd.android.cursor.item/phone"/>
- <data android:mimeType="vnd.android.cursor.item/person"/>
- </intent-filter>
- <intent-filter>
- <action android:name="android.intent.action.DIAL"/>
-
- <category android:name="android.intent.category.DEFAULT"/>
- <category android:name="android.intent.category.BROWSABLE"/>
-
- <data android:scheme="voicemail"/>
- </intent-filter>
- <intent-filter>
- <action android:name="android.intent.action.DIAL"/>
- <category android:name="android.intent.category.DEFAULT"/>
- </intent-filter>
- <intent-filter>
- <action android:name="android.intent.action.MAIN"/>
-
- <category android:name="android.intent.category.DEFAULT"/>
- <category android:name="android.intent.category.LAUNCHER"/>
- <category android:name="android.intent.category.BROWSABLE"/>
- </intent-filter>
- <intent-filter>
- <action android:name="android.intent.action.VIEW"/>
- <action android:name="android.intent.action.DIAL"/>
-
- <category android:name="android.intent.category.DEFAULT"/>
- <category android:name="android.intent.category.BROWSABLE"/>
-
- <data android:scheme="tel"/>
- </intent-filter>
- <intent-filter>
- <action android:name="android.intent.action.VIEW"/>
-
- <category android:name="android.intent.category.DEFAULT"/>
- <category android:name="android.intent.category.BROWSABLE"/>
-
- <data android:mimeType="vnd.android.cursor.dir/calls"/>
- </intent-filter>
- <intent-filter>
- <action android:name="android.intent.action.CALL_BUTTON"/>
-
- <category android:name="android.intent.category.DEFAULT"/>
- <category android:name="android.intent.category.BROWSABLE"/>
- </intent-filter>
- <!-- This was never intended to be public, but is here for backward
- compatibility. Use Intent.ACTION_DIAL instead. -->
- <intent-filter>
- <action android:name="com.android.phone.action.TOUCH_DIALER"/>
-
- <category android:name="android.intent.category.DEFAULT"/>
- <category android:name="android.intent.category.TAB"/>
- </intent-filter>
- <intent-filter android:label="@string/main_call_history_tab_description">
- <action android:name="com.android.phone.action.RECENT_CALLS"/>
-
- <category android:name="android.intent.category.DEFAULT"/>
- <category android:name="android.intent.category.TAB"/>
- </intent-filter>
-
-
<meta-data
android:name="com.android.keyguard.layout"
android:resource="@layout/keyguard_preview"/>
</activity>
-
</application>
-
</manifest>