From b986bdda46211abf7348997ce85dc56df99bebf1 Mon Sep 17 00:00:00 2001 From: Moses Kim Date: Tue, 13 Jan 2015 16:59:11 +0900 Subject: [PATCH] modified for android studio --- build.gradle | 3 +- res/layout/fragment_navigation.xml | 18 +++++----- res/layout/fragment_tabbar.xml | 58 +++++++++++++++--------------- 3 files changed, 40 insertions(+), 39 deletions(-) diff --git a/build.gradle b/build.gradle index cec88ec..66067c4 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,8 @@ apply plugin: 'android-library' dependencies { - compile fileTree(dir: 'libs', include: '*.jar') + compile fileTree(dir: 'libs', include: '*.jar', exclude: 'android-support-v4.jar') + compile 'com.android.support:support-v4:21.0.+' } android { diff --git a/res/layout/fragment_navigation.xml b/res/layout/fragment_navigation.xml index 6898981..298e819 100644 --- a/res/layout/fragment_navigation.xml +++ b/res/layout/fragment_navigation.xml @@ -1,12 +1,12 @@ - - + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:orientation="vertical" + android:background="@android:color/transparent"> + + diff --git a/res/layout/fragment_tabbar.xml b/res/layout/fragment_tabbar.xml index 2c5d1b0..f74a778 100644 --- a/res/layout/fragment_tabbar.xml +++ b/res/layout/fragment_tabbar.xml @@ -1,31 +1,31 @@ - - - - - - - - - - \ No newline at end of file + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:orientation="vertical" + android:background="@android:color/transparent"> + + + + + + + + + +