Merge "Reorganized rootcomponentgenerator package and added demo."
diff --git a/java/com/android/incallui/rtt/impl/RttChatFragment.java b/java/com/android/incallui/rtt/impl/RttChatFragment.java
index 53ad582..15baa8c 100644
--- a/java/com/android/incallui/rtt/impl/RttChatFragment.java
+++ b/java/com/android/incallui/rtt/impl/RttChatFragment.java
@@ -340,11 +340,6 @@
   }
 
   @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 d62cf18..4b03ad8 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