diff options
| author | Brandon Maxwell <maxwelb@google.com> | 2016-03-16 00:13:56 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-03-16 00:13:56 +0000 |
| commit | e1473ca3cafa69f9c51031a9cfeb1aebb6821d2c (patch) | |
| tree | 480902846469d5f4f9d7af6bffa378e63aa815e1 | |
| parent | 724ee71dbb1e7b1fcb8cd332663772c215eb7e63 (diff) | |
| parent | 22375e147e1a4e3b7479ed7c60ef84ef77fb652d (diff) | |
Updating GreatWall to use modifiable flag
am: 22375e147e
* commit '22375e147e1a4e3b7479ed7c60ef84ef77fb652d':
Updating GreatWall to use modifiable flag
| -rw-r--r-- | src/com/android/dialer/compat/FilteredNumberCompat.java | 10 | ||||
| -rw-r--r-- | src/com/android/dialerbind/ObjectFactory.java | 5 |
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) { |