merging

2012-12-01 21:51:40 +04:00
parent c0e57175c8
commit 87254f5335
6 changed files with 45 additions and 9 deletions
--- a/android-app/res/layout/matrix_edit_fragment.xml
+++ b/android-app/res/layout/matrix_edit_fragment.xml
@@ -4,14 +4,14 @@
 <LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
              xmlns:picker="http://schemas.android.com/apk/res-auto"
              a:id="@+id/main_fragment_layout"
-              style="?fragmentLayoutStyle"
+              style="?cpp_fragment_layout_style"
              a:layout_width="match_parent"
              a:layout_height="match_parent">

    <TextView a:id="@+id/fragmentTitle"
              a:layout_height="wrap_content"
              a:layout_width="match_parent"
-              style="?fragmentTitleStyle"/>
+              style="?cpp_fragment_title_style"/>

    <include layout="@layout/ad"/>