From 264f287c9495a8e34ea0e28fee0f74d1fdcb6bc8 Mon Sep 17 00:00:00 2001
From: calderwoodra <calderwoodra@google.com>
Date: Fri, 16 Mar 2018 16:11:58 -0700
Subject: Make MainActivity the default activity for AOSP.

This also finishes moving all of the old tests over from
Dialtacts to Main. The only 2 tests that fail are:
 - searchBoxClosedWhenHandlingNotificationIntent
 - openSearchFragment_fabGoneInRegularSearchAfterRotation

I will fix these in a follow up CL.

Bug: 72525887
Test: dialer_aosp build target launches MainActivity, TAP
PiperOrigin-RevId: 189408987
Change-Id: Ice30191d95c19c62bcd89503e89f66440f30beac
---
 .../android/dialer/app/manifests/activities/AndroidManifest.xml    | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'java/com/android/dialer/app')

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>
 
-- 
cgit v1.2.3