summaryrefslogtreecommitdiff
path: root/java
diff options
context:
space:
mode:
authorwangqi <wangqi@google.com>2018-04-06 12:56:02 -0700
committerandroid-build-merger <android-build-merger@google.com>2018-04-06 12:56:02 -0700
commitb5bc32c11ab5fce846463a5f10d4043f11438f58 (patch)
treee3945ea00ca226c89052e8a78b4162799b51320a /java
parent4f2ef45edc9c9a57f32cbd32e63f075c85718cc4 (diff)
parent2dee3ea1461d501c8adcec20344e2992fea08836 (diff)
Merge "Add tests for RttChatFragment." am: c5eeb70d85
am: 2dee3ea146 Change-Id: Ib54842d91a53c6049ae28bec34b45c5064aa9a8d
Diffstat (limited to 'java')
-rw-r--r--java/com/android/incallui/rtt/impl/RttChatFragment.java5
-rw-r--r--java/com/android/incallui/rtt/impl/res/layout/rtt_banner.xml2
2 files changed, 1 insertions, 6 deletions
diff --git a/java/com/android/incallui/rtt/impl/RttChatFragment.java b/java/com/android/incallui/rtt/impl/RttChatFragment.java
index 53ad5829e..15baa8cfa 100644
--- a/java/com/android/incallui/rtt/impl/RttChatFragment.java
+++ b/java/com/android/incallui/rtt/impl/RttChatFragment.java
@@ -340,11 +340,6 @@ public class RttChatFragment extends Fragment
}
@Override
- public void onSaveInstanceState(@NonNull Bundle bundle) {
- super.onSaveInstanceState(bundle);
- }
-
- @Override
public void onStop() {
LogUtil.enterBlock("RttChatFragment.onStop");
super.onStop();
diff --git a/java/com/android/incallui/rtt/impl/res/layout/rtt_banner.xml b/java/com/android/incallui/rtt/impl/res/layout/rtt_banner.xml
index d62cf1849..4b03ad8d5 100644
--- a/java/com/android/incallui/rtt/impl/res/layout/rtt_banner.xml
+++ b/java/com/android/incallui/rtt/impl/res/layout/rtt_banner.xml
@@ -21,7 +21,7 @@
android:orientation="vertical">
<RelativeLayout
android:layout_width="match_parent"
- android:layout_height="?attr/actionBarSize"
+ android:layout_height="?android:attr/actionBarSize"
android:background="#F305228F"
android:elevation="3dp">
<ImageButton