diff options
author | John Reck <jreck@google.com> | 2011-07-19 16:10:23 -0700 |
---|---|---|
committer | John Reck <jreck@google.com> | 2011-07-19 16:10:23 -0700 |
commit | 86374729c42dae85147d207d03903a949b27ef43 (patch) | |
tree | 5701e2cdbe1955a06f4a9cf1fd2f403f64658a54 | |
parent | e57c709438aec9d64e3de7eefd87f333fcd2ae7c (diff) | |
download | packages_apps_browser-86374729c42dae85147d207d03903a949b27ef43.zip packages_apps_browser-86374729c42dae85147d207d03903a949b27ef43.tar.gz packages_apps_browser-86374729c42dae85147d207d03903a949b27ef43.tar.bz2 |
Remove size from phone snapshot layout
Bug: 5045575
Change-Id: Ibb15cf18214d3fd2b7ddcb4b3dceebf9ba43104c
-rw-r--r-- | res/layout-sw600dp/snapshot_item.xml | 77 | ||||
-rw-r--r-- | res/layout/snapshot_item.xml | 11 | ||||
-rw-r--r-- | src/com/android/browser/BrowserSnapshotPage.java | 6 |
3 files changed, 81 insertions, 13 deletions
diff --git a/res/layout-sw600dp/snapshot_item.xml b/res/layout-sw600dp/snapshot_item.xml new file mode 100644 index 0000000..2fc6ca8 --- /dev/null +++ b/res/layout-sw600dp/snapshot_item.xml @@ -0,0 +1,77 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2011 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<RelativeLayout + xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:padding="@dimen/combo_horizontalSpacing"> + <ImageView + android:id="@+id/thumb" + android:src="@drawable/thumbnail_bookmarks_widget_no_bookmark_holo" + android:layout_width="@dimen/bookmarkThumbnailWidth" + android:layout_height="@dimen/bookmarkThumbnailHeight" + android:scaleType="centerCrop" + android:cropToPadding="true" + android:background="@drawable/border_thumb_bookmarks_widget_holo" /> + <TextView + android:id="@+id/title" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignBottom="@id/thumb" + android:layout_alignLeft="@id/thumb" + android:layout_alignRight="@id/thumb" + android:background="@drawable/overlay_url_bookmark_widget_holo" + android:singleLine="true" + android:ellipsize="end" + android:textSize="12sp" + android:typeface="sans" + android:textColor="@android:color/white" + android:paddingLeft="6dip" + android:paddingRight="2dip" + android:gravity="center_vertical" /> + <ImageView + android:id="@+id/divider" + android:src="?android:attr/dividerVertical" + android:layout_width="wrap_content" + android:layout_height="24dip" + android:layout_below="@+id/thumb" + android:layout_alignLeft="@+id/thumb" + android:scaleType="fitXY" + android:layout_marginTop="12dip" /> + <TextView android:id="@+id/date" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_toRightOf="@id/divider" + android:layout_alignTop="@id/divider" + android:layout_alignBottom="@id/divider" + android:paddingLeft="8dip" + android:gravity="center_vertical" + android:typeface="sans" + android:textSize="14sp" + android:textColor="#AAAAAA" /> + <TextView android:id="@+id/size" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignTop="@id/divider" + android:layout_alignBottom="@id/divider" + android:layout_alignRight="@+id/thumb" + android:paddingRight="2dip" + android:gravity="center_vertical" + android:typeface="sans" + android:textSize="14sp" + android:textColor="#AAAAAA" /> +</RelativeLayout> diff --git a/res/layout/snapshot_item.xml b/res/layout/snapshot_item.xml index 2fc6ca8..128dedf 100644 --- a/res/layout/snapshot_item.xml +++ b/res/layout/snapshot_item.xml @@ -63,15 +63,4 @@ android:typeface="sans" android:textSize="14sp" android:textColor="#AAAAAA" /> - <TextView android:id="@+id/size" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignTop="@id/divider" - android:layout_alignBottom="@id/divider" - android:layout_alignRight="@+id/thumb" - android:paddingRight="2dip" - android:gravity="center_vertical" - android:typeface="sans" - android:textSize="14sp" - android:textColor="#AAAAAA" /> </RelativeLayout> diff --git a/src/com/android/browser/BrowserSnapshotPage.java b/src/com/android/browser/BrowserSnapshotPage.java index a0ec5e9..0953879 100644 --- a/src/com/android/browser/BrowserSnapshotPage.java +++ b/src/com/android/browser/BrowserSnapshotPage.java @@ -218,8 +218,10 @@ public class BrowserSnapshotPage extends Fragment implements TextView title = (TextView) view.findViewById(R.id.title); title.setText(cursor.getString(SNAPSHOT_TITLE)); TextView size = (TextView) view.findViewById(R.id.size); - int stateLen = cursor.getInt(SNAPSHOT_VIEWSTATE_LENGTH); - size.setText(String.format("%.2fMB", stateLen / 1024f / 1024f)); + if (size != null) { + int stateLen = cursor.getInt(SNAPSHOT_VIEWSTATE_LENGTH); + size.setText(String.format("%.2fMB", stateLen / 1024f / 1024f)); + } long timestamp = cursor.getLong(SNAPSHOT_DATE_CREATED); TextView date = (TextView) view.findViewById(R.id.date); DateFormat dateFormat = DateFormat.getDateInstance(DateFormat.SHORT); |