summaryrefslogtreecommitdiff
path: root/java/com/android/dialer/constants
diff options
context:
space:
mode:
authorEric Erfanian <erfanian@google.com>2017-10-24 14:05:52 -0700
committerEric Erfanian <erfanian@google.com>2017-10-24 14:05:52 -0700
commit938468da6f5c225ebb161a68bd949c9cf3261892 (patch)
tree232533fa35dc9d140fdfe0dac82b2bd21ad1b5c4 /java/com/android/dialer/constants
parent958b292fc04ad15879fff47df929d6d1a826615c (diff)
Rename the new bubble package name from "bubble" to "newbubble".
It fixes AOSP for package name conflict. Test: manual PiperOrigin-RevId: 173298696 Change-Id: Id10ebe0bcf029e61f65cf6580c7198abd8395081
Diffstat (limited to 'java/com/android/dialer/constants')
-rw-r--r--java/com/android/dialer/constants/Constants.java3
-rw-r--r--java/com/android/dialer/constants/aospdialer/ConstantsImpl.java6
-rw-r--r--java/com/android/dialer/constants/googledialer/ConstantsImpl.java6
3 files changed, 15 insertions, 0 deletions
diff --git a/java/com/android/dialer/constants/Constants.java b/java/com/android/dialer/constants/Constants.java
index f9d07e31d..a0c11f5a8 100644
--- a/java/com/android/dialer/constants/Constants.java
+++ b/java/com/android/dialer/constants/Constants.java
@@ -59,5 +59,8 @@ public abstract class Constants {
public abstract String getUserAgent(Context context);
+ @NonNull
+ public abstract String getSettingsActivity();
+
protected Constants() {}
}
diff --git a/java/com/android/dialer/constants/aospdialer/ConstantsImpl.java b/java/com/android/dialer/constants/aospdialer/ConstantsImpl.java
index 38fd24b8a..c332e8281 100644
--- a/java/com/android/dialer/constants/aospdialer/ConstantsImpl.java
+++ b/java/com/android/dialer/constants/aospdialer/ConstantsImpl.java
@@ -46,4 +46,10 @@ public class ConstantsImpl extends Constants {
public String getUserAgent(Context context) {
return null;
}
+
+ @NonNull
+ @Override
+ public String getSettingsActivity() {
+ return "com.android.dialer.app.settings.DialerSettingsActivity";
+ }
}
diff --git a/java/com/android/dialer/constants/googledialer/ConstantsImpl.java b/java/com/android/dialer/constants/googledialer/ConstantsImpl.java
index e151344ba..003f748af 100644
--- a/java/com/android/dialer/constants/googledialer/ConstantsImpl.java
+++ b/java/com/android/dialer/constants/googledialer/ConstantsImpl.java
@@ -58,4 +58,10 @@ public class ConstantsImpl extends Constants {
return userAgent.toString();
}
+
+ @NonNull
+ @Override
+ public String getSettingsActivity() {
+ return "com.google.android.apps.dialer.settings.GoogleDialerSettingsActivity";
+ }
}