diff options
author | Sagar Dhawan <sdhawan@codeaurora.org> | 2015-07-31 18:46:35 -0700 |
---|---|---|
committer | jrizzoli <joey@cyanogenmoditalia.it> | 2015-08-28 13:15:47 +0200 |
commit | 3776553208fc80690e281f325d93d7bc6a779be4 (patch) | |
tree | 324461cbcd971e5721884a9ce7c5bc28b15145d9 /src/com/android/browser | |
parent | 32bc29c4ae832cbe42091242da00fc63ff38fd9e (diff) | |
download | android_packages_apps_Gello-3776553208fc80690e281f325d93d7bc6a779be4.tar.gz android_packages_apps_Gello-3776553208fc80690e281f325d93d7bc6a779be4.tar.bz2 android_packages_apps_Gello-3776553208fc80690e281f325d93d7bc6a779be4.zip |
Fix crash when viewing pages offline on Tablets
Fixed multiple issues with Snapshot tabs on
tablets.
Diffstat (limited to 'src/com/android/browser')
-rw-r--r-- | src/com/android/browser/BrowserSnapshotPage.java | 5 | ||||
-rw-r--r-- | src/com/android/browser/SnapshotBar.java | 11 | ||||
-rw-r--r-- | src/com/android/browser/TabBar.java | 3 |
3 files changed, 10 insertions, 9 deletions
diff --git a/src/com/android/browser/BrowserSnapshotPage.java b/src/com/android/browser/BrowserSnapshotPage.java index afa02693..c01691ff 100644 --- a/src/com/android/browser/BrowserSnapshotPage.java +++ b/src/com/android/browser/BrowserSnapshotPage.java @@ -303,11 +303,6 @@ 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); - if (size != null) { - int stateLen = cursor.getInt(SNAPSHOT_VIEWSTATE_SIZE); - 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); diff --git a/src/com/android/browser/SnapshotBar.java b/src/com/android/browser/SnapshotBar.java index cdaf3ef0..eeb300bb 100644 --- a/src/com/android/browser/SnapshotBar.java +++ b/src/com/android/browser/SnapshotBar.java @@ -82,6 +82,8 @@ public class SnapshotBar extends LinearLayout implements OnClickListener { new Observable.Observer() { @Override public void onChange(Object... params) { + if (mTabText == null) + return; if ((Integer) params[0] > 9) { mTabText.setTextSize(TypedValue.COMPLEX_UNIT_PX, mTabSwitcherCompressedTextSize); } else { @@ -133,7 +135,7 @@ public class SnapshotBar extends LinearLayout implements OnClickListener { resetAnimation(); } - if (mTabSwitcherInitialTextSize == 0) { + if (mTabSwitcherInitialTextSize == 0 && mTabText != null) { mTabSwitcherInitialTextSize = mTabText.getTextSize(); mTabSwitcherCompressedTextSize = (float) (mTabSwitcherInitialTextSize / 1.2); } @@ -203,6 +205,9 @@ public class SnapshotBar extends LinearLayout implements OnClickListener { if (navBar instanceof NavigationBarPhone) { ((NavigationBarPhone)navBar).showMenu(mOverflowMenu); } + else if (navBar instanceof NavigationBarTablet) { + ((NavigationBarTablet)navBar).showMenu(mOverflowMenu); + } } else if (mToggleContainer == v && !mIsAnimating) { mIsAnimating = true; showDate(); @@ -250,13 +255,13 @@ public class SnapshotBar extends LinearLayout implements OnClickListener { } public void setReadericonVisibility(int visibility) { - if (mReadericon.getVisibility() != visibility) { + if (mReadericon != null && mReadericon.getVisibility() != visibility) { mReadericon.setVisibility(visibility); } } public void setFaviconVisibility(int visibility) { - if (mFavicon.getVisibility() != visibility) { + if (mFavicon != null && mFavicon.getVisibility() != visibility) { mFavicon.setVisibility(visibility); } } diff --git a/src/com/android/browser/TabBar.java b/src/com/android/browser/TabBar.java index e446145f..378557e2 100644 --- a/src/com/android/browser/TabBar.java +++ b/src/com/android/browser/TabBar.java @@ -290,7 +290,8 @@ public class TabBar extends LinearLayout implements OnClickListener { public void setActivated(boolean selected) { mSelected = selected; mClose.setVisibility(mSelected ? View.VISIBLE : View.GONE); - mFaviconView.setVisibility(mSelected ? View.GONE : View.VISIBLE); + mFaviconView.setVisibility((mSelected || mTab.isSnapshot()) ? + View.GONE : View.VISIBLE); mTitle.setTextAppearance(mActivity, mSelected ? R.style.TabTitleSelected : R.style.TabTitleUnselected); setHorizontalFadingEdgeEnabled(!mSelected); |