summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--res/values-am/filtershow_strings.xml2
-rw-r--r--res/values-hi/filtershow_strings.xml12
-rw-r--r--res/values-km-rKH/filtershow_strings.xml2
-rw-r--r--res/values-kn-rIN/filtershow_strings.xml2
-rw-r--r--res/values-ml-rIN/filtershow_strings.xml4
-rw-r--r--src/com/android/gallery3d/app/MovieActivity.java13
-rw-r--r--src/com/android/gallery3d/app/MovieControllerOverlay.java4
-rwxr-xr-xsrc/com/android/gallery3d/app/MoviePlayer.java20
-rwxr-xr-xsrc/org/codeaurora/gallery3d/video/CodeauroraVideoView.java6
9 files changed, 52 insertions, 13 deletions
diff --git a/res/values-am/filtershow_strings.xml b/res/values-am/filtershow_strings.xml
index 2334d0fea..196e99cc7 100644
--- a/res/values-am/filtershow_strings.xml
+++ b/res/values-am/filtershow_strings.xml
@@ -73,7 +73,7 @@
<string name="wbalance" msgid="6346581563387083613">"ራስ-ቀለም መሙላት"</string>
<string name="hue" msgid="6231252147971086030">"የቀለም ድባብ"</string>
<string name="shadow_recovery" msgid="3928572915300287152">"ጥላዎች"</string>
- <string name="highlight_recovery" msgid="8262208470735204243">"ዋና ዋና ዜናዎች"</string>
+ <string name="highlight_recovery" msgid="8262208470735204243">"ድምቀቶች"</string>
<string name="curvesRGB" msgid="915010781090477550">"ጥምዞች"</string>
<string name="vignette" msgid="934721068851885390">"ቪኜት"</string>
<string name="vignette_main" msgid="6046495605390665423">"ቪኜት"</string>
diff --git a/res/values-hi/filtershow_strings.xml b/res/values-hi/filtershow_strings.xml
index 8ee3a9011..07b794bc3 100644
--- a/res/values-hi/filtershow_strings.xml
+++ b/res/values-hi/filtershow_strings.xml
@@ -26,7 +26,7 @@
<string name="original" msgid="3524493791230430897">"मूल"</string>
<string name="borders" msgid="2067345080568684614">"बॉर्डर"</string>
<string name="custom_border" msgid="8679893731790931871">"कस्टम"</string>
- <string name="filtershow_undo" msgid="6781743189243585101">"वापस लाएं"</string>
+ <string name="filtershow_undo" msgid="6781743189243585101">"पूर्ववत करें"</string>
<string name="filtershow_redo" msgid="4219489910543059747">"फिर से करें"</string>
<string name="show_imagestate_panel" msgid="281932769701043015">"लागू प्रभाव दिखाएं"</string>
<string name="hide_imagestate_panel" msgid="7207643485811695257">"लागू प्रभाव छिपाएं"</string>
@@ -40,7 +40,7 @@
<string name="menu_settings" msgid="6428291655769260831">"सेटिंग"</string>
<string name="unsaved" msgid="8704442449002374375">"इस चित्र में न सहेजे गए बदलाव हैं."</string>
<string name="save_before_exit" msgid="2680660633675916712">"क्या आप बाहर निकलने के पहले सहेजना चाहते हैं?"</string>
- <string name="save_and_exit" msgid="3628425023766687419">"जोड़ें और बाहर निकलें"</string>
+ <string name="save_and_exit" msgid="3628425023766687419">"सहेजें और बाहर निकलें"</string>
<string name="save_and_processing" msgid="6371565035837463194">"पूर्ण रिज़ॉल्यूशन चित्र प्रोसेस हो रहा है..."</string>
<string name="exit" msgid="242642957038770113">"बाहर निकलें"</string>
<string name="history" msgid="455767361472692409">"इतिहास"</string>
@@ -93,7 +93,7 @@
<string name="kmeans" msgid="2080952022674981541">"पोस्टराइज़ करें"</string>
<string name="downsample" msgid="3552938534146980104">"डाउनसेंपल"</string>
<string name="grad" msgid="546774853424848655">"ग्रेजुएटेड"</string>
- <string name="editor_grad_brightness" msgid="5937316734380235741">"स्क्रीन की रोशनी"</string>
+ <string name="editor_grad_brightness" msgid="5937316734380235741">"चमक"</string>
<string name="editor_grad_contrast" msgid="3454456673401803360">"कंट्रास्ट"</string>
<string name="editor_grad_saturation" msgid="3760247354109521726">"संतृप्तता"</string>
<string name="editor_chan_sat_main" msgid="4427652337797121940">"मुख्‍य"</string>
@@ -113,7 +113,7 @@
<string name="draw_size" msgid="4360005386104151209">"आकार"</string>
<string name="draw_hue" msgid="4975135843189267133">"रंग"</string>
<string name="draw_saturation" msgid="5394395648014454882">"संतृप्तता"</string>
- <string name="draw_value" msgid="6571604055161538273">"स्क्रीन की रोशनी"</string>
+ <string name="draw_value" msgid="6571604055161538273">"चमक"</string>
<string name="draw_color" msgid="2119030386987211193">"रंग"</string>
<string name="draw_style_line" msgid="9216476853904429628">"रेखाएं"</string>
<string name="draw_style_brush_spatter" msgid="7612691122932981554">"मार्कर"</string>
@@ -131,7 +131,7 @@
<string name="state_panel_result" msgid="318640531123298676">"परिणाम"</string>
<string name="filtershow_notification_label" msgid="1653168445525855247">"चित्र सहेजा जा रहा है"</string>
<string name="filtershow_notification_message" msgid="2661871765484036286">"प्रोसस हो रहा है..."</string>
- <string name="filtershow_save_preset" msgid="3933550455577927439">"वर्तमान प्रीसेट जोड़ें"</string>
+ <string name="filtershow_save_preset" msgid="3933550455577927439">"वर्तमान प्रीसेट सहेजें"</string>
<string name="filtershow_manage_preset" msgid="3872896753708921286">"उपयोगकर्ता प्रीसेट प्रबंधित करें"</string>
<string name="filtershow_new_preset" msgid="8923930134923416617">"नया प्रीसेट"</string>
<string name="filtershow_preset_name" msgid="7015939727047649866">"नाम प्रीसेट करें"</string>
@@ -141,7 +141,7 @@
<string name="filtershow_show_info_panel_histogram" msgid="2669188469897955809">"हिस्टोग्राम"</string>
<string name="filtershow_show_info_panel_exif" msgid="4965486882625125154">"EXIF डेटा"</string>
<string name="filtershow_add_button_looks" msgid="8630823661416925426">"प्रीसेट"</string>
- <string name="filtershow_add_button_versions" msgid="7620107266685809612">"वर्शन"</string>
+ <string name="filtershow_add_button_versions" msgid="7620107266685809612">"संस्करण"</string>
<string name="filtershow_version_original" msgid="1413894292200912828">"मूल"</string>
<string name="filtershow_version_current" msgid="6609334422797468952">"वर्तमान"</string>
<string name="filtershow_exif_model" msgid="3543206476046267466">"मॉडल"</string>
diff --git a/res/values-km-rKH/filtershow_strings.xml b/res/values-km-rKH/filtershow_strings.xml
index e613c8d10..4150e7567 100644
--- a/res/values-km-rKH/filtershow_strings.xml
+++ b/res/values-km-rKH/filtershow_strings.xml
@@ -41,7 +41,7 @@
<string name="unsaved" msgid="8704442449002374375">"មាន​ការ​ផ្លាស់ប្ដូរ​​​មិន​បាន​រក្សាទុក​លើ​​រូបភាព​នេះ​។"</string>
<string name="save_before_exit" msgid="2680660633675916712">"តើ​អ្នក​ចង់​រក្សា​ទុក​មុន​ពេល​ចេញ?"</string>
<string name="save_and_exit" msgid="3628425023766687419">"រក្សា​ទុក​​ ហើយ​ចេញ"</string>
- <string name="save_and_processing" msgid="6371565035837463194">"កំពុង​ដំណើរការ​រូបភាព​មាន​គុណភាព​បង្ហាញ​​ពេញលេញ..."</string>
+ <string name="save_and_processing" msgid="6371565035837463194">"កំពុង​ដំណើរការ​គុណភាព​បង្ហាញ​រូបភាព​ពេញលេញ..."</string>
<string name="exit" msgid="242642957038770113">"ចេញ"</string>
<string name="history" msgid="455767361472692409">"ប្រវត្តិ"</string>
<string name="reset" msgid="9013181350779592937">"កំណត់​ឡើងវិញ"</string>
diff --git a/res/values-kn-rIN/filtershow_strings.xml b/res/values-kn-rIN/filtershow_strings.xml
index c37ef5f84..171d99514 100644
--- a/res/values-kn-rIN/filtershow_strings.xml
+++ b/res/values-kn-rIN/filtershow_strings.xml
@@ -124,7 +124,7 @@
<string name="color_border_color" msgid="8765458414425980711">"ಬಣ್ಣ"</string>
<string name="color_border_clear" msgid="4418261191091091722">"ತೆರವುಗೊಳಿಸು"</string>
<string name="color_pick_select" msgid="734312818059057394">"ಕಸ್ಟಮ್ ಬಣ್ಣವನ್ನು ಆರಿಸಿ"</string>
- <string name="color_pick_title" msgid="6195567431995308876">"ಬಣ್ಣ ಆಯ್ಕೆಮಾಡಿ"</string>
+ <string name="color_pick_title" msgid="6195567431995308876">"ಬಣ್ಣವನ್ನು ಆಯ್ಕೆಮಾಡಿ"</string>
<string name="draw_size_title" msgid="3121649039610273977">"ಗಾತ್ರವನ್ನು ಆಯ್ಕೆಮಾಡಿ"</string>
<string name="draw_size_accept" msgid="6781529716526190028">"ಸರಿ"</string>
<string name="state_panel_original" msgid="9069584409934164419">"ಮೂಲ ಚಿತ್ರ"</string>
diff --git a/res/values-ml-rIN/filtershow_strings.xml b/res/values-ml-rIN/filtershow_strings.xml
index 777519afd..68a4111e9 100644
--- a/res/values-ml-rIN/filtershow_strings.xml
+++ b/res/values-ml-rIN/filtershow_strings.xml
@@ -103,13 +103,13 @@
<string name="editor_chan_sat_cyan" msgid="1367634650172508288">"സിയാൻ"</string>
<string name="editor_chan_sat_blue" msgid="384409736863387895">"നീല"</string>
<string name="editor_chan_sat_magenta" msgid="6689215719351415546">"മജന്ത"</string>
- <string name="editor_grad_style" msgid="2168414479007745179">"സ്റ്റൈൽ"</string>
+ <string name="editor_grad_style" msgid="2168414479007745179">"ശൈലി"</string>
<string name="editor_grad_new" msgid="4857265951369377379">"പുതിയത്"</string>
<string name="curves_channel_rgb" msgid="7909209509638333690">"RGB"</string>
<string name="curves_channel_red" msgid="4199710104162111357">"ചുവപ്പ്"</string>
<string name="curves_channel_green" msgid="3733003466905031016">"പച്ച"</string>
<string name="curves_channel_blue" msgid="9129211507395079371">"നീല"</string>
- <string name="draw_style" msgid="2036125061987325389">"സ്റ്റൈൽ"</string>
+ <string name="draw_style" msgid="2036125061987325389">"ശൈലി"</string>
<string name="draw_size" msgid="4360005386104151209">"വലുപ്പം"</string>
<string name="draw_hue" msgid="4975135843189267133">"ഹ്യൂ"</string>
<string name="draw_saturation" msgid="5394395648014454882">"സാച്ചുറേഷൻ"</string>
diff --git a/src/com/android/gallery3d/app/MovieActivity.java b/src/com/android/gallery3d/app/MovieActivity.java
index 5c857d412..0b0341ad1 100644
--- a/src/com/android/gallery3d/app/MovieActivity.java
+++ b/src/com/android/gallery3d/app/MovieActivity.java
@@ -18,6 +18,7 @@ package com.android.gallery3d.app;
import android.annotation.TargetApi;
import android.app.ActionBar;
+import android.app.ActionBar.OnMenuVisibilityListener;
import android.app.Activity;
import android.app.AlertDialog;
import android.app.KeyguardManager;
@@ -265,6 +266,18 @@ public class MovieActivity extends Activity {
ActionBar.DISPLAY_HOME_AS_UP | ActionBar.DISPLAY_SHOW_TITLE,
ActionBar.DISPLAY_HOME_AS_UP | ActionBar.DISPLAY_SHOW_TITLE);
+ actionBar.addOnMenuVisibilityListener(new OnMenuVisibilityListener() {
+ @Override
+ public void onMenuVisibilityChanged(boolean isVisible) {
+ if (mPlayer != null) {
+ if (isVisible) {
+ mPlayer.cancelHidingController();
+ } else {
+ mPlayer.restartHidingController();
+ }
+ }
+ }
+ });
String title = intent.getStringExtra(Intent.EXTRA_TITLE);
if (title != null) {
actionBar.setTitle(title);
diff --git a/src/com/android/gallery3d/app/MovieControllerOverlay.java b/src/com/android/gallery3d/app/MovieControllerOverlay.java
index 93fc3cf79..bb25882c8 100644
--- a/src/com/android/gallery3d/app/MovieControllerOverlay.java
+++ b/src/com/android/gallery3d/app/MovieControllerOverlay.java
@@ -196,7 +196,7 @@ public class MovieControllerOverlay extends CommonControllerOverlay implements
maybeStartHiding();
}
- private void maybeStartHiding() {
+ public void maybeStartHiding() {
cancelHiding();
if (mState == State.PLAYING) {
handler.postDelayed(startHidingRunnable, 2500);
@@ -221,7 +221,7 @@ public class MovieControllerOverlay extends CommonControllerOverlay implements
}
}
- private void cancelHiding() {
+ public void cancelHiding() {
handler.removeCallbacks(startHidingRunnable);
if (mOverlayExt.canHidePanel()) {
mBackground.setAnimation(null);
diff --git a/src/com/android/gallery3d/app/MoviePlayer.java b/src/com/android/gallery3d/app/MoviePlayer.java
index 713b32d6c..03c1ad0a4 100755
--- a/src/com/android/gallery3d/app/MoviePlayer.java
+++ b/src/com/android/gallery3d/app/MoviePlayer.java
@@ -1357,6 +1357,12 @@ public class MoviePlayer implements
}
})
+ .setOnCancelListener(new OnCancelListener() {
+ public void onCancel(DialogInterface dialog) {
+ mController.showEnded();
+ onCompletion();
+ }
+ })
.create();
mServerTimeoutDialog.setOnDismissListener(new OnDismissListener() {
@@ -1364,6 +1370,7 @@ public class MoviePlayer implements
if (LOG) {
Log.v(TAG, "mServerTimeoutDialog.onDismiss()");
}
+ mVideoView.setDialogShowState(false);
mIsShowDialog = false;
}
@@ -1374,6 +1381,7 @@ public class MoviePlayer implements
if (LOG) {
Log.v(TAG, "mServerTimeoutDialog.onShow()");
}
+ mVideoView.setDialogShowState(true);
mIsShowDialog = true;
}
@@ -1576,6 +1584,18 @@ public class MoviePlayer implements
videoPlayerData, 0);
return (mPrefs.getInt(slectedStepOption, stepOptionThreeSeconds) + 1) * stepBase;
}
+
+ public void restartHidingController() {
+ if (mController != null) {
+ mController.maybeStartHiding();
+ }
+ }
+
+ public void cancelHidingController() {
+ if (mController != null) {
+ mController.cancelHiding();
+ }
+ }
}
class Bookmarker {
diff --git a/src/org/codeaurora/gallery3d/video/CodeauroraVideoView.java b/src/org/codeaurora/gallery3d/video/CodeauroraVideoView.java
index 20d14f900..41fd09c53 100755
--- a/src/org/codeaurora/gallery3d/video/CodeauroraVideoView.java
+++ b/src/org/codeaurora/gallery3d/video/CodeauroraVideoView.java
@@ -94,6 +94,7 @@ public class CodeauroraVideoView extends SurfaceView implements MediaPlayerContr
private boolean mNeedWaitLayout = false;
private boolean mHasGotMetaData = false;
private boolean mOnResumed;
+ private boolean mIsShowDialog = false;
private final Handler mHandler = new Handler() {
public void handleMessage(final Message msg) {
@@ -746,8 +747,13 @@ public class CodeauroraVideoView extends SurfaceView implements MediaPlayerContr
}
}
+ public void setDialogShowState(boolean isDialogShow) {
+ mIsShowDialog = isDialogShow;
+ }
+
@Override
public void start() {
+ if (mIsShowDialog) return;
if (isInPlaybackState()) {
mMediaPlayer.start();
mCurrentState = STATE_PLAYING;
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-30 19:15:29 +0000