diff options
Diffstat (limited to 'res/layout-sw600dp')
| -rw-r--r-- | res/layout-sw600dp/feeds.xml | 19 | ||||
| -rw-r--r-- | res/layout-sw600dp/headlines.xml | 34 |
2 files changed, 18 insertions, 35 deletions
diff --git a/res/layout-sw600dp/feeds.xml b/res/layout-sw600dp/feeds.xml index 5f37b900..bc176a89 100644 --- a/res/layout-sw600dp/feeds.xml +++ b/res/layout-sw600dp/feeds.xml @@ -5,22 +5,13 @@ android:background="?headlinesBackgroundSolid"
android:orientation="vertical" >
- <LinearLayout
- android:id="@+id/loading_container"
+ <FrameLayout
+ android:id="@+id/sw600dp_anchor"
android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:background="?loadingBackground"
- android:gravity="center"
- android:orientation="vertical" >
+ android:layout_height="wrap_content"
+ android:visibility="gone" >
- <TextView
- android:id="@+id/loading_message"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:gravity="center_horizontal"
- android:text="@string/loading_message"
- android:textAppearance="?android:attr/textAppearanceLarge" />
- </LinearLayout>
+ </FrameLayout>
<LinearLayout
android:id="@+id/fragment_container"
diff --git a/res/layout-sw600dp/headlines.xml b/res/layout-sw600dp/headlines.xml index b6cb1c38..bc176a89 100644 --- a/res/layout-sw600dp/headlines.xml +++ b/res/layout-sw600dp/headlines.xml @@ -1,48 +1,40 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@+id/headlines"
+ android:id="@+id/main"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
+ android:background="?headlinesBackgroundSolid"
android:orientation="vertical" >
- <LinearLayout
- android:id="@+id/loading_container"
+ <FrameLayout
+ android:id="@+id/sw600dp_anchor"
android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:background="?loadingBackground"
- android:gravity="center"
- android:orientation="vertical"
- android:visibility="visible" >
+ android:layout_height="wrap_content"
+ android:visibility="gone" >
- <TextView
- android:id="@+id/loading_message"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:gravity="center_horizontal"
- android:text="@string/loading_message"
- android:textAppearance="?android:attr/textAppearanceLarge" />
- </LinearLayout>
+ </FrameLayout>
<LinearLayout
android:id="@+id/fragment_container"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:baselineAligned="false"
+ android:weightSum="1.05"
android:orientation="horizontal" >
<FrameLayout
- android:id="@+id/headlines_fragment"
+ android:id="@+id/feeds_fragment"
android:layout_width="0dp"
android:layout_height="match_parent"
- android:layout_weight="0.4"
+ android:layout_weight="1"
android:background="?feedlistBackground" >
</FrameLayout>
<FrameLayout
- android:id="@+id/article_fragment"
+ android:id="@+id/headlines_fragment"
android:layout_width="0dp"
android:layout_height="match_parent"
- android:layout_weight="0.6"
- android:background="?articleBackground" >
+ android:layout_weight="2"
+ android:background="?headlinesBackground" >
</FrameLayout>
</LinearLayout>
|