diff options
| author | Teng-Hui Zhu <ztenghui@google.com> | 2011-04-07 14:17:52 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-04-07 14:17:52 -0700 |
| commit | bb55777be1a3231d187205dc378ca35b01e8bc65 (patch) | |
| tree | cf386819e46edbbf719a41e7b982907a0bc420be /core/java/android/webkit/HTML5VideoFullScreen.java | |
| parent | 515a08b01851a1ab9386f85dee6d9fd7b65ee7ad (diff) | |
| parent | 2fcf82aee30da977849adaaadf89d81c17afbac2 (diff) | |
| download | frameworks_base-bb55777be1a3231d187205dc378ca35b01e8bc65.zip frameworks_base-bb55777be1a3231d187205dc378ca35b01e8bc65.tar.gz frameworks_base-bb55777be1a3231d187205dc378ca35b01e8bc65.tar.bz2 | |
Merge changes Ia44d880a,Ifbf63b24 into honeycomb-mr1
* changes:
DO NOT MERGE : cherry pick of change Ieb7ae26b from master
DO NOT MERGE : cherry pick of change I0f9f2c65 from master
Diffstat (limited to 'core/java/android/webkit/HTML5VideoFullScreen.java')
| -rw-r--r-- | core/java/android/webkit/HTML5VideoFullScreen.java | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/core/java/android/webkit/HTML5VideoFullScreen.java b/core/java/android/webkit/HTML5VideoFullScreen.java index 0726266..0918683 100644 --- a/core/java/android/webkit/HTML5VideoFullScreen.java +++ b/core/java/android/webkit/HTML5VideoFullScreen.java @@ -191,8 +191,6 @@ public class HTML5VideoFullScreen extends HTML5VideoView if (mProgressView != null) { mProgressView.setVisibility(View.GONE); - mLayout.removeView(mProgressView); - mProgressView = null; } mVideoWidth = mp.getVideoWidth(); @@ -314,4 +312,13 @@ public class HTML5VideoFullScreen extends HTML5VideoView return false; } + @Override + protected void switchProgressView(boolean playerBuffering) { + if (playerBuffering) { + mProgressView.setVisibility(View.VISIBLE); + } else { + mProgressView.setVisibility(View.GONE); + } + return; + } } |