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

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

Add flag to enable NUI shortcut. 

Bug: 64655802
Test: n/a
PiperOrigin-RevId: 183149638
Change-Id: Idc58efced8f70311eccd67f403bc5bd98f3f8518
parent 662830e8

java/com/android/dialer/calllog/CallLogFramework.java

+2 −2
Original line number Diff line number Diff line
@@ -21,11 +21,11 @@ import android.content.SharedPreferences; 
import android.support.annotation.MainThread;

import android.support.annotation.Nullable;

import android.support.annotation.VisibleForTesting;

import com.android.dialer.buildtype.BuildType;

import com.android.dialer.calllog.datasources.CallLogDataSource;

import com.android.dialer.calllog.datasources.DataSources;

import com.android.dialer.common.Assert;

import com.android.dialer.common.LogUtil;

import com.android.dialer.configprovider.ConfigProviderBindings;

import com.android.dialer.storage.Unencrypted;

import javax.inject.Inject;

import javax.inject.Singleton;
@@ -61,7 +61,7 @@ public final class CallLogFramework implements CallLogDataSource.ContentObserver 
    // users will have "new call log" content observers firing. These observers usually do simple

    // things like writing shared preferences.

    // TODO(zachh): Find a way to access Main#isNewUiEnabled without creating a circular dependency.

    if (BuildType.get() == BuildType.BUGFOOD || LogUtil.isDebugEnabled()) {

    if (ConfigProviderBindings.get(appContext).getBoolean("is_nui_shortcut_enabled", false)) {

      for (CallLogDataSource dataSource : dataSources.getDataSourcesIncludingSystemCallLog()) {

        dataSource.registerContentObservers(appContext, this);

      }

java/com/android/dialer/main/impl/MainImpl.java

+2 −3
Original line number Diff line number Diff line
@@ -26,8 +26,7 @@ import android.os.Build.VERSION_CODES; 
import android.support.v4.content.pm.ShortcutInfoCompat;

import android.support.v4.content.pm.ShortcutManagerCompat;

import android.support.v4.graphics.drawable.IconCompat;

import com.android.dialer.buildtype.BuildType;

import com.android.dialer.common.LogUtil;

import com.android.dialer.configprovider.ConfigProviderBindings;

import com.android.dialer.main.Main;

import javax.inject.Inject;
@@ -40,7 +39,7 @@ final class MainImpl implements Main { 


  @Override

  public boolean isNewUiEnabled(Context context) {

    return BuildType.get() == BuildType.BUGFOOD || LogUtil.isDebugEnabled();

    return ConfigProviderBindings.get(context).getBoolean("is_nui_shortcut_enabled", false);

  }



  @Override

java/com/android/incallui/PhoneLookupHistoryRecorder.java

+2 −2
Original line number Diff line number Diff line
@@ -20,10 +20,10 @@ import android.content.Context; 
import android.support.annotation.Nullable;

import android.telecom.Call;

import com.android.dialer.DialerPhoneNumber;

import com.android.dialer.buildtype.BuildType;

import com.android.dialer.common.Assert;

import com.android.dialer.common.LogUtil;

import com.android.dialer.common.concurrent.DialerExecutorComponent;

import com.android.dialer.configprovider.ConfigProviderBindings;

import com.android.dialer.phonelookup.PhoneLookupComponent;

import com.android.dialer.phonelookup.PhoneLookupInfo;

import com.android.dialer.phonelookup.database.contract.PhoneLookupHistoryContract.PhoneLookupHistory;
@@ -48,7 +48,7 @@ final class PhoneLookupHistoryRecorder { 
   * writes it to the PhoneLookupHistory. Otherwise does nothing.

   */

  static void recordPhoneLookupInfo(Context appContext, Call call) {

    if (!(BuildType.get() == BuildType.BUGFOOD || LogUtil.isDebugEnabled())) {

    if (!(ConfigProviderBindings.get(appContext).getBoolean("is_nui_shortcut_enabled", false))) {

      return;

    }