Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 264f287c authored by calderwoodra's avatar calderwoodra Committed by Copybara-Service
Browse files

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
parent 33cfcb2d

java/com/android/dialer/app/manifests/activities/AndroidManifest.xml

+3 −4
Original line number Diff line number Diff line
@@ -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>

java/com/android/dialer/main/impl/AndroidManifest.xml

+0 −1
Original line number Diff line number Diff line
@@ -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"