summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBrandon Maxwell <maxwelb@google.com>2016-03-15 16:29:23 -0700
committerBrandon Maxwell <maxwelb@google.com>2016-03-15 16:33:31 -0700
commit22375e147e1a4e3b7479ed7c60ef84ef77fb652d (patch)
tree90403ae07d16298f9d90ac45b8e4cf68f4ef4549 /src
parenta98b35c260a8527dd7a952fe0dd3342fce06b89a (diff)
Updating GreatWall to use modifiable flag
+ Rather than using a runtime flag which has to be set for the build, this CL changes the GreatWall feature to be enableable at runtime. Bug: 26664600 Change-Id: Ib0e3229da41a08c67076b7bd171ebbc4b35a4c69
Diffstat (limited to 'src')
-rw-r--r--src/com/android/dialer/compat/FilteredNumberCompat.java10
-rw-r--r--src/com/android/dialerbind/ObjectFactory.java5
2 files changed, 9 insertions, 6 deletions
diff --git a/src/com/android/dialer/compat/FilteredNumberCompat.java b/src/com/android/dialer/compat/FilteredNumberCompat.java
index 232504796..08bf6c82a 100644
--- a/src/com/android/dialer/compat/FilteredNumberCompat.java
+++ b/src/com/android/dialer/compat/FilteredNumberCompat.java
@@ -14,7 +14,7 @@
* limitations under the License
*/
- package com.android.dialer.compat;
+package com.android.dialer.compat;
import com.google.common.base.Preconditions;
@@ -43,6 +43,7 @@ import com.android.dialer.filterednumber.BlockNumberDialogFragment.Callback;
import com.android.dialer.filterednumber.BlockedNumbersMigrator;
import com.android.dialer.filterednumber.BlockedNumbersSettingsActivity;
import com.android.dialer.filterednumber.MigrateBlockedNumbersDialogFragment;
+import com.android.dialerbind.ObjectFactory;
import java.util.ArrayList;
import java.util.List;
@@ -58,10 +59,6 @@ public class FilteredNumberCompat {
protected static final String HAS_MIGRATED_TO_NEW_BLOCKING_KEY = "migratedToNewBlocking";
- // Flag to enable feature.
- // TODO(maxwelb) remove when ready to enable new filtering.
- private static final boolean isNewFilteringEnabled = false;
-
private static Boolean isEnabledForTest;
/**
@@ -122,7 +119,8 @@ public class FilteredNumberCompat {
if (isEnabledForTest != null) {
return CompatUtils.isNCompatible() && isEnabledForTest;
}
- return CompatUtils.isNCompatible() && isNewFilteringEnabled;
+ return CompatUtils.isNCompatible() && ObjectFactory
+ .isNewBlockingEnabled(DialerApplication.getContext());
}
/**
diff --git a/src/com/android/dialerbind/ObjectFactory.java b/src/com/android/dialerbind/ObjectFactory.java
index 9f75e3912..875a89308 100644
--- a/src/com/android/dialerbind/ObjectFactory.java
+++ b/src/com/android/dialerbind/ObjectFactory.java
@@ -52,6 +52,11 @@ public class ObjectFactory {
return false;
}
+ public static boolean isNewBlockingEnabled(Context context) {
+ // TODO(maxwelb) - Set to true when ready to enable feature
+ return false;
+ }
+
@Nullable
public static ExtendedBlockingButtonRenderer newExtendedBlockingButtonRenderer(
Context context, ExtendedBlockingButtonRenderer.Listener listener) {