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

Commit e79a22e8 authored by zachh's avatar zachh Committed by Copybara-Service
Browse files

Use an intent action to launch MainActivity instead of class reference to DialtactsActivity. 

We can't just replace DialtactsActivity with MainActivity because a circular dependency would be created. Instead create a new dialer-specific "main" intent action and use it.

Bug: 109931227
Test: manual
PiperOrigin-RevId: 199868961
Change-Id: I0ef72ed418280eeb64ea1ea854d215093b0dba27
parent 2c82dcdd

java/com/android/dialer/app/calllog/CallLogActivity.java

+1 −2
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ import android.view.MenuInflater; 
import android.view.MenuItem;

import android.view.ViewGroup;

import com.android.contacts.common.list.ViewPagerTabs;

import com.android.dialer.app.DialtactsActivity;

import com.android.dialer.app.R;

import com.android.dialer.calldetails.OldCallDetailsActivity;

import com.android.dialer.common.Assert;
@@ -157,7 +156,7 @@ public class CallLogActivity extends TransactionSafeActivity 


    if (item.getItemId() == android.R.id.home) {

      PerformanceReport.recordClick(UiAction.Type.CLOSE_CALL_HISTORY_WITH_CANCEL_BUTTON);

      final Intent intent = new Intent(this, DialtactsActivity.class);

      final Intent intent = new Intent("com.android.dialer.main.impl.MAIN");

      intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);

      startActivity(intent);

      return true;

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

+18 −12
Original line number Diff line number Diff line
@@ -21,19 +21,25 @@ 


    <!-- TODO(a bug): remove activity themes and only have application wide themes -->

    <activity

        android:name="com.android.dialer.main.impl.MainActivity"

        android:clearTaskOnLaunch="true"

      android:exported="true"

        android:directBootAware="true"

        android:exported="true"

        android:label="@string/main_activity_label"

        android:launchMode="singleTask"

      android:name="com.android.dialer.main.impl.MainActivity"

        android:resizeableActivity="true"

        android:theme="@style/MainActivityTheme"

        android:windowSoftInputMode="stateAlwaysHidden|adjustNothing">



      <intent-filter>

        <action android:name="com.android.dialer.main.impl.MAIN"/>

        <category android:name="android.intent.category.DEFAULT"/>

      </intent-filter>



      <meta-data

          android:name="com.android.keyguard.layout"

          android:resource="@layout/keyguard_preview"/>



    </activity>

  </application>

</manifest>