diff options
| author | Andrew Dolgov <[email protected]> | 2011-12-04 10:50:49 +0300 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2011-12-04 10:50:49 +0300 |
| commit | ea51e68b5b3845a206df1d95d10769ea3740f611 (patch) | |
| tree | 329c4475f85d9a7c73ae567001b527676def0458 /res | |
| parent | e057f881b154fc51052eb53f8d2d36a29f5863b1 (diff) | |
rework combined mode to use textviews to prevent graphical glitches
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout-port/headlines_row.xml | 2 | ||||
| -rw-r--r-- | res/layout-port/headlines_row_selected.xml | 3 | ||||
| -rw-r--r-- | res/layout-port/headlines_row_unread.xml | 2 | ||||
| -rw-r--r-- | res/layout-xlarge/headlines_row.xml | 4 | ||||
| -rw-r--r-- | res/layout-xlarge/headlines_row_selected.xml | 4 | ||||
| -rw-r--r-- | res/layout-xlarge/headlines_row_unread.xml | 4 | ||||
| -rw-r--r-- | res/layout/headlines_row.xml | 4 | ||||
| -rw-r--r-- | res/layout/headlines_row_selected.xml | 4 | ||||
| -rw-r--r-- | res/layout/headlines_row_unread.xml | 4 | ||||
| -rw-r--r-- | res/values/strings.xml | 2 |
10 files changed, 17 insertions, 16 deletions
diff --git a/res/layout-port/headlines_row.xml b/res/layout-port/headlines_row.xml index cb58bb26..833a1397 100644 --- a/res/layout-port/headlines_row.xml +++ b/res/layout-port/headlines_row.xml @@ -95,7 +95,7 @@ </LinearLayout>
</LinearLayout>
- <WebView
+ <TextView
android:id="@+id/content"
android:layout_width="match_parent"
android:layout_height="match_parent"
diff --git a/res/layout-port/headlines_row_selected.xml b/res/layout-port/headlines_row_selected.xml index 85e53116..abdb188b 100644 --- a/res/layout-port/headlines_row_selected.xml +++ b/res/layout-port/headlines_row_selected.xml @@ -98,8 +98,9 @@ </LinearLayout>
- <WebView
+ <TextView
android:id="@+id/content"
+ android:text="Article content"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1" />
diff --git a/res/layout-port/headlines_row_unread.xml b/res/layout-port/headlines_row_unread.xml index 28eb47ed..6510535c 100644 --- a/res/layout-port/headlines_row_unread.xml +++ b/res/layout-port/headlines_row_unread.xml @@ -98,7 +98,7 @@ </LinearLayout>
- <WebView
+ <TextView
android:id="@+id/content"
android:layout_width="match_parent"
android:layout_height="match_parent"
diff --git a/res/layout-xlarge/headlines_row.xml b/res/layout-xlarge/headlines_row.xml index 8b51030d..9b5832c9 100644 --- a/res/layout-xlarge/headlines_row.xml +++ b/res/layout-xlarge/headlines_row.xml @@ -100,12 +100,12 @@ </LinearLayout>
</LinearLayout>
- <WebView
+ <TextView
android:id="@+id/content"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:padding="3dip" >
- </WebView>
+ </TextView>
</LinearLayout>
\ No newline at end of file diff --git a/res/layout-xlarge/headlines_row_selected.xml b/res/layout-xlarge/headlines_row_selected.xml index a8d8d8bd..916e2634 100644 --- a/res/layout-xlarge/headlines_row_selected.xml +++ b/res/layout-xlarge/headlines_row_selected.xml @@ -98,12 +98,12 @@ </LinearLayout>
</LinearLayout>
- <WebView
+ <TextView
android:id="@+id/content"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:padding="3dip" >
- </WebView>
+ </TextView>
</LinearLayout>
\ No newline at end of file diff --git a/res/layout-xlarge/headlines_row_unread.xml b/res/layout-xlarge/headlines_row_unread.xml index 65f4a5f4..84fcd33f 100644 --- a/res/layout-xlarge/headlines_row_unread.xml +++ b/res/layout-xlarge/headlines_row_unread.xml @@ -98,12 +98,12 @@ </LinearLayout>
</LinearLayout>
- <WebView
+ <TextView
android:id="@+id/content"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:padding="3dip" >
- </WebView>
+ </TextView>
</LinearLayout>
\ No newline at end of file diff --git a/res/layout/headlines_row.xml b/res/layout/headlines_row.xml index 8b51030d..9b5832c9 100644 --- a/res/layout/headlines_row.xml +++ b/res/layout/headlines_row.xml @@ -100,12 +100,12 @@ </LinearLayout>
</LinearLayout>
- <WebView
+ <TextView
android:id="@+id/content"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:padding="3dip" >
- </WebView>
+ </TextView>
</LinearLayout>
\ No newline at end of file diff --git a/res/layout/headlines_row_selected.xml b/res/layout/headlines_row_selected.xml index a8d8d8bd..916e2634 100644 --- a/res/layout/headlines_row_selected.xml +++ b/res/layout/headlines_row_selected.xml @@ -98,12 +98,12 @@ </LinearLayout>
</LinearLayout>
- <WebView
+ <TextView
android:id="@+id/content"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:padding="3dip" >
- </WebView>
+ </TextView>
</LinearLayout>
\ No newline at end of file diff --git a/res/layout/headlines_row_unread.xml b/res/layout/headlines_row_unread.xml index 65f4a5f4..84fcd33f 100644 --- a/res/layout/headlines_row_unread.xml +++ b/res/layout/headlines_row_unread.xml @@ -98,12 +98,12 @@ </LinearLayout>
</LinearLayout>
- <WebView
+ <TextView
android:id="@+id/content"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:padding="3dip" >
- </WebView>
+ </TextView>
</LinearLayout>
\ No newline at end of file diff --git a/res/values/strings.xml b/res/values/strings.xml index a7fb96a9..af36a5c1 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -88,6 +88,6 @@ <string name="error_api_unknown">Error: unknown API error (see log)</string> <string name="error_login_failed">Error: username or password incorrect</string> <string name="error_invalid_api_url">Error: invalid API URL</string> - <string name="combined_mode_summary">Displays articles inline, instead of a separate panel</string> + <string name="combined_mode_summary">Displays full article text inline, instead of a separate panel</string> <string name="combined_mode">Combined mode</string> </resources>
\ No newline at end of file |