diff options
| author | Eric Erfanian <erfanian@google.com> | 2017-06-08 00:59:55 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-06-08 00:59:55 +0000 |
| commit | c67d658e7daa453fe9ad9fd1a37f81eaf2048c44 (patch) | |
| tree | b9bbc285430ffb5363a70eb27e382c38f5a85b7a /java/com/android/dialer/postcall | |
| parent | 75233ff03785f24789b32039ac2c208805b7e506 (diff) | |
| parent | 274b6d320edb3c33e7b3a95c43a811829486a777 (diff) | |
Update AOSP Dialer source from internal google3 repository at cl/158012278. am: 91ce7d2a47
am: 274b6d320e
Change-Id: Iecf4325f314bf6c3324187e6406c8aae4675dd63
Diffstat (limited to 'java/com/android/dialer/postcall')
| -rw-r--r-- | java/com/android/dialer/postcall/AndroidManifest.xml | 2 | ||||
| -rw-r--r-- | java/com/android/dialer/postcall/PostCall.java | 16 |
2 files changed, 2 insertions, 16 deletions
diff --git a/java/com/android/dialer/postcall/AndroidManifest.xml b/java/com/android/dialer/postcall/AndroidManifest.xml index 79ca5d5eb..22c77dd93 100644 --- a/java/com/android/dialer/postcall/AndroidManifest.xml +++ b/java/com/android/dialer/postcall/AndroidManifest.xml @@ -21,7 +21,7 @@ <activity android:name="com.android.dialer.postcall.PostCallActivity" android:exported="false" - android:theme="@style/Theme.AppCompat.NoActionBar" + android:theme="@style/DialerThemeBase.NoActionBar" android:windowSoftInputMode="adjustResize" android:screenOrientation="portrait"/> </application> diff --git a/java/com/android/dialer/postcall/PostCall.java b/java/com/android/dialer/postcall/PostCall.java index 586b47395..7eb83b133 100644 --- a/java/com/android/dialer/postcall/PostCall.java +++ b/java/com/android/dialer/postcall/PostCall.java @@ -26,8 +26,6 @@ import android.support.design.widget.Snackbar; import android.telephony.TelephonyManager; import android.view.View; import android.view.View.OnClickListener; -import com.android.dialer.buildtype.BuildType; -import com.android.dialer.common.Assert; import com.android.dialer.common.ConfigProvider; import com.android.dialer.common.ConfigProviderBindings; import com.android.dialer.common.LogUtil; @@ -203,19 +201,7 @@ public class PostCall { } private static boolean isEnabled(Context context) { - @BuildType.Type int type = BuildType.get(); - switch (type) { - case BuildType.BUGFOOD: - case BuildType.DOGFOOD: - case BuildType.FISHFOOD: - case BuildType.TEST: - return ConfigProviderBindings.get(context).getBoolean("enable_post_call", true); - case BuildType.RELEASE: - return ConfigProviderBindings.get(context).getBoolean("enable_post_call_prod", true); - default: - Assert.fail(); - return false; - } + return ConfigProviderBindings.get(context).getBoolean("enable_post_call_prod", true); } private static boolean isSimReady(Context context) { |