diff options
| author | Richard MacGregor <rmacgregor@cyngn.com> | 2016-02-24 16:12:56 -0800 |
|---|---|---|
| committer | Richard MacGregor <rmacgregor@cyngn.com> | 2016-04-15 10:16:37 -0700 |
| commit | 51d23a136678647b68370cc24413f16363ad921b (patch) | |
| tree | b5b8eb6b1f82ff1baf233c35c87684270695fa6a | |
| parent | 150d9ff61e6cbbce7b2d849f66826a1cceb72757 (diff) | |
| download | android_packages_apps_InCallUI-51d23a136678647b68370cc24413f16363ad921b.tar.gz android_packages_apps_InCallUI-51d23a136678647b68370cc24413f16363ad921b.tar.bz2 android_packages_apps_InCallUI-51d23a136678647b68370cc24413f16363ad921b.zip | |
[2/2] Use UICommon simple SnackBar
Use UICommon simple SnackBar that doesn't rely on AppCompat
* fix DSDA Dialer FC
Ticket CD-535
Change-Id: I33c19405dee4e8c7cdc636c54f48211c643fe5bc
(cherry picked from commit 8164e8255f6ff22d49f0ecb85700a50a347414a5)
| -rw-r--r-- | res/layout/incall_screen.xml | 4 | ||||
| -rw-r--r-- | res/values/styles.xml | 2 | ||||
| -rw-r--r-- | src/com/android/incallui/InCallActivity.java | 3 |
3 files changed, 5 insertions, 4 deletions
diff --git a/res/layout/incall_screen.xml b/res/layout/incall_screen.xml index c382631f..540c7149 100644 --- a/res/layout/incall_screen.xml +++ b/res/layout/incall_screen.xml @@ -15,10 +15,10 @@ --> <!-- In-call Phone UI; see InCallActivity.java. --> -<android.support.design.widget.CoordinatorLayout +<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="match_parent" android:background="@android:color/black" android:id="@+id/main" > -</android.support.design.widget.CoordinatorLayout> +</FrameLayout> diff --git a/res/values/styles.xml b/res/values/styles.xml index 0935f332..bcd0e70a 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -74,7 +74,7 @@ circular reveal animation for a new outgoing call to work correctly. We don't just use Theme.Black.NoTitleBar directly, since we want any popups or dialogs from the InCallActivity to have the correct Material style. --> - <style name="Theme.InCallScreen" parent="style/Theme.AppCompat.Light"> + <style name="Theme.InCallScreen" parent="@android:style/Theme.Material.Light"> <item name="android:windowAnimationStyle">@null</item> <item name="android:windowIsTranslucent">true</item> <item name="android:windowBackground">@android:color/transparent</item> diff --git a/src/com/android/incallui/InCallActivity.java b/src/com/android/incallui/InCallActivity.java index baf4691e..d5c5db8f 100644 --- a/src/com/android/incallui/InCallActivity.java +++ b/src/com/android/incallui/InCallActivity.java @@ -38,7 +38,6 @@ import android.graphics.Point; import android.hardware.SensorManager; import android.os.Bundle; import android.os.Trace; -import android.support.design.widget.Snackbar; import android.telecom.DisconnectCause; import android.telecom.PhoneAccountHandle; import android.text.TextUtils; @@ -63,6 +62,8 @@ import com.android.contacts.common.widget.SelectPhoneAccountDialogFragment; import com.android.contacts.common.widget.SelectPhoneAccountDialogFragment.SelectPhoneAccountListener; import com.android.incallui.Call.State; +import com.cyngn.uicommon.view.Snackbar; + import java.util.ArrayList; import java.util.List; import java.util.Locale; |