diff options
author | calderwoodra <calderwoodra@google.com> | 2018-01-24 15:15:45 -0800 |
---|---|---|
committer | Copybara-Service <copybara-piper@google.com> | 2018-01-24 19:08:04 -0800 |
commit | c8dfaf1ea5a3b10a0592493b5138b9d29652fc50 (patch) | |
tree | 68ef7ceec9e3952dcc8e031ed918c541a9cf5610 /java | |
parent | 662830e85b188d0220a6faaa1736f824eadf24c7 (diff) |
Add flag to enable NUI shortcut.
Bug: 64655802
Test: n/a
PiperOrigin-RevId: 183149638
Change-Id: Idc58efced8f70311eccd67f403bc5bd98f3f8518
Diffstat (limited to 'java')
-rw-r--r-- | java/com/android/dialer/calllog/CallLogFramework.java | 4 | ||||
-rw-r--r-- | java/com/android/dialer/main/impl/MainImpl.java | 5 | ||||
-rw-r--r-- | java/com/android/incallui/PhoneLookupHistoryRecorder.java | 4 |
3 files changed, 6 insertions, 7 deletions
diff --git a/java/com/android/dialer/calllog/CallLogFramework.java b/java/com/android/dialer/calllog/CallLogFramework.java index c9d5f0907..440055de6 100644 --- a/java/com/android/dialer/calllog/CallLogFramework.java +++ b/java/com/android/dialer/calllog/CallLogFramework.java @@ -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); } diff --git a/java/com/android/dialer/main/impl/MainImpl.java b/java/com/android/dialer/main/impl/MainImpl.java index 675533c04..e6d9a43ef 100644 --- a/java/com/android/dialer/main/impl/MainImpl.java +++ b/java/com/android/dialer/main/impl/MainImpl.java @@ -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 diff --git a/java/com/android/incallui/PhoneLookupHistoryRecorder.java b/java/com/android/incallui/PhoneLookupHistoryRecorder.java index abbf934f0..017e6f43c 100644 --- a/java/com/android/incallui/PhoneLookupHistoryRecorder.java +++ b/java/com/android/incallui/PhoneLookupHistoryRecorder.java @@ -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; } |