diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2018-03-17 00:44:55 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-03-17 00:44:55 +0000 |
| commit | 640c2c7cafd7f56c0c54da38402321b1250967e5 (patch) | |
| tree | 28e7160b76dadf64093d1766cdf5f1c16efc10d1 /java | |
| parent | 33cfcb2d93a8c0421b32926fb94148a8171ad944 (diff) | |
| parent | 264f287c9495a8e34ea0e28fee0f74d1fdcb6bc8 (diff) | |
Merge "Make MainActivity the default activity for AOSP."
Diffstat (limited to 'java')
| -rw-r--r-- | java/com/android/dialer/app/manifests/activities/AndroidManifest.xml | 7 | ||||
| -rw-r--r-- | java/com/android/dialer/main/impl/AndroidManifest.xml | 1 |
2 files changed, 3 insertions, 5 deletions
diff --git a/java/com/android/dialer/app/manifests/activities/AndroidManifest.xml b/java/com/android/dialer/app/manifests/activities/AndroidManifest.xml index 9e08f5f5d..b9e5f6201 100644 --- a/java/com/android/dialer/app/manifests/activities/AndroidManifest.xml +++ b/java/com/android/dialer/app/manifests/activities/AndroidManifest.xml @@ -25,7 +25,7 @@ android:exported="false" android:label="@string/dialer_settings_label" android:name="com.android.dialer.app.settings.DialerSettingsActivity" - android:parentActivityName="com.android.dialer.app.DialtactsActivity" + android:parentActivityName="com.android.dialer.main.impl.MainActivity" android:theme="@style/SettingsStyle"> <intent-filter> <action android:name="android.intent.action.VIEW" /> @@ -38,6 +38,7 @@ 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" @@ -46,7 +47,6 @@ android:resizeableActivity="true" android:theme="@style/DialtactsActivityTheme" android:windowSoftInputMode="stateAlwaysHidden|adjustNothing"> - <intent-filter> <action android:name="android.intent.action.DIAL"/> @@ -113,7 +113,6 @@ <category android:name="android.intent.category.TAB"/> </intent-filter> - <meta-data android:name="com.android.keyguard.layout" android:resource="@layout/keyguard_preview"/> @@ -122,7 +121,7 @@ <activity-alias android:exported="true" android:name="com.android.dialer.DialtactsActivity" - android:targetActivity="com.android.dialer.app.DialtactsActivity"/> + android:targetActivity="com.android.dialer.main.impl.MainActivity"/> </application> diff --git a/java/com/android/dialer/main/impl/AndroidManifest.xml b/java/com/android/dialer/main/impl/AndroidManifest.xml index 972c9d929..b3d916bee 100644 --- a/java/com/android/dialer/main/impl/AndroidManifest.xml +++ b/java/com/android/dialer/main/impl/AndroidManifest.xml @@ -22,7 +22,6 @@ <activity android:clearTaskOnLaunch="true" android:directBootAware="true" - android:enabled="false" android:exported="true" android:icon="@drawable/nui_launcher_icon" android:label="@string/main_activity_label" |