summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--java/com/android/dialer/app/manifests/activities/AndroidManifest.xml7
-rw-r--r--java/com/android/dialer/main/impl/AndroidManifest.xml1
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"