From 8116f36039f20fa4b96ee57e855109cb2fcf6112 Mon Sep 17 00:00:00 2001 From: Lukasz Kozakiewicz Date: Mon, 5 Feb 2018 16:19:13 +0100 Subject: [PATCH] Re-saved all projects. --- .../AnalyticsCollection.java | 36 ++++++++++++++++++- .../main/java/com/roli/jucedemo/JuceDemo.java | 36 ++++++++++++++++++- .../InAppPurchase.java | 36 ++++++++++++++++++- .../com/yourcompany/miditest/MidiTest.java | 36 ++++++++++++++++++- .../JUCENetworkGraphicsDemo.java | 36 ++++++++++++++++++- .../yourcompany/oscreceiver/OSCReceiver.java | 36 ++++++++++++++++++- .../com/yourcompany/oscsender/OSCSender.java | 36 ++++++++++++++++++- .../PushNotificationsDemo.java | 36 ++++++++++++++++++- .../juce/jucedemoplugin/JuceDemoPlugin.java | 36 ++++++++++++++++++- .../AudioPerformanceTest.java | 36 ++++++++++++++++++- 10 files changed, 350 insertions(+), 10 deletions(-) diff --git a/examples/AnalyticsCollection/Builds/Android/app/src/main/java/com/yourcompany/analyticscollection/AnalyticsCollection.java b/examples/AnalyticsCollection/Builds/Android/app/src/main/java/com/yourcompany/analyticscollection/AnalyticsCollection.java index 91192aea8f..e8552048e5 100644 --- a/examples/AnalyticsCollection/Builds/Android/app/src/main/java/com/yourcompany/analyticscollection/AnalyticsCollection.java +++ b/examples/AnalyticsCollection/Builds/Android/app/src/main/java/com/yourcompany/analyticscollection/AnalyticsCollection.java @@ -322,6 +322,32 @@ public class AnalyticsCollection extends Activity getApplicationInfo().dataDir); } + // Need to override this as the default implementation always finishes the activity. + @Override + public void onBackPressed() + { + ComponentPeerView focusedView = getViewWithFocusOrDefaultView(); + + if (focusedView == null) + return; + + focusedView.backButtonPressed(); + } + + private ComponentPeerView getViewWithFocusOrDefaultView() + { + for (int i = 0; i < viewHolder.getChildCount(); ++i) + { + if (viewHolder.getChildAt (i).hasFocus()) + return (ComponentPeerView) viewHolder.getChildAt (i); + } + + if (viewHolder.getChildCount() > 0) + return (ComponentPeerView) viewHolder.getChildAt (0); + + return null; + } + //============================================================================== private void hideActionBar() { @@ -777,6 +803,14 @@ public class AnalyticsCollection extends Activity } } + public void backButtonPressed() + { + if (host == 0) + return; + + handleBackButton (host); + } + @Override public boolean onKeyDown (int keyCode, KeyEvent event) { @@ -790,7 +824,7 @@ public class AnalyticsCollection extends Activity return super.onKeyDown (keyCode, event); case KeyEvent.KEYCODE_BACK: { - handleBackButton (host); + ((Activity) getContext()).onBackPressed(); return true; } diff --git a/examples/Demo/Builds/Android/app/src/main/java/com/roli/jucedemo/JuceDemo.java b/examples/Demo/Builds/Android/app/src/main/java/com/roli/jucedemo/JuceDemo.java index eb4ed1cc4b..6a1ca3bb44 100644 --- a/examples/Demo/Builds/Android/app/src/main/java/com/roli/jucedemo/JuceDemo.java +++ b/examples/Demo/Builds/Android/app/src/main/java/com/roli/jucedemo/JuceDemo.java @@ -322,6 +322,32 @@ public class JuceDemo extends Activity getApplicationInfo().dataDir); } + // Need to override this as the default implementation always finishes the activity. + @Override + public void onBackPressed() + { + ComponentPeerView focusedView = getViewWithFocusOrDefaultView(); + + if (focusedView == null) + return; + + focusedView.backButtonPressed(); + } + + private ComponentPeerView getViewWithFocusOrDefaultView() + { + for (int i = 0; i < viewHolder.getChildCount(); ++i) + { + if (viewHolder.getChildAt (i).hasFocus()) + return (ComponentPeerView) viewHolder.getChildAt (i); + } + + if (viewHolder.getChildCount() > 0) + return (ComponentPeerView) viewHolder.getChildAt (0); + + return null; + } + //============================================================================== private void hideActionBar() { @@ -777,6 +803,14 @@ public class JuceDemo extends Activity } } + public void backButtonPressed() + { + if (host == 0) + return; + + handleBackButton (host); + } + @Override public boolean onKeyDown (int keyCode, KeyEvent event) { @@ -790,7 +824,7 @@ public class JuceDemo extends Activity return super.onKeyDown (keyCode, event); case KeyEvent.KEYCODE_BACK: { - handleBackButton (host); + ((Activity) getContext()).onBackPressed(); return true; } diff --git a/examples/InAppPurchase/Builds/Android/app/src/main/java/com/roli/juceinapppurchasesample/InAppPurchase.java b/examples/InAppPurchase/Builds/Android/app/src/main/java/com/roli/juceinapppurchasesample/InAppPurchase.java index 4fa4675c69..6fc70e80c6 100644 --- a/examples/InAppPurchase/Builds/Android/app/src/main/java/com/roli/juceinapppurchasesample/InAppPurchase.java +++ b/examples/InAppPurchase/Builds/Android/app/src/main/java/com/roli/juceinapppurchasesample/InAppPurchase.java @@ -322,6 +322,32 @@ public class InAppPurchase extends Activity getApplicationInfo().dataDir); } + // Need to override this as the default implementation always finishes the activity. + @Override + public void onBackPressed() + { + ComponentPeerView focusedView = getViewWithFocusOrDefaultView(); + + if (focusedView == null) + return; + + focusedView.backButtonPressed(); + } + + private ComponentPeerView getViewWithFocusOrDefaultView() + { + for (int i = 0; i < viewHolder.getChildCount(); ++i) + { + if (viewHolder.getChildAt (i).hasFocus()) + return (ComponentPeerView) viewHolder.getChildAt (i); + } + + if (viewHolder.getChildCount() > 0) + return (ComponentPeerView) viewHolder.getChildAt (0); + + return null; + } + //============================================================================== private void hideActionBar() { @@ -777,6 +803,14 @@ public class InAppPurchase extends Activity } } + public void backButtonPressed() + { + if (host == 0) + return; + + handleBackButton (host); + } + @Override public boolean onKeyDown (int keyCode, KeyEvent event) { @@ -790,7 +824,7 @@ public class InAppPurchase extends Activity return super.onKeyDown (keyCode, event); case KeyEvent.KEYCODE_BACK: { - handleBackButton (host); + ((Activity) getContext()).onBackPressed(); return true; } diff --git a/examples/MidiTest/Builds/Android/app/src/main/java/com/yourcompany/miditest/MidiTest.java b/examples/MidiTest/Builds/Android/app/src/main/java/com/yourcompany/miditest/MidiTest.java index 3e01a9fae1..bd4c53f6eb 100644 --- a/examples/MidiTest/Builds/Android/app/src/main/java/com/yourcompany/miditest/MidiTest.java +++ b/examples/MidiTest/Builds/Android/app/src/main/java/com/yourcompany/miditest/MidiTest.java @@ -1254,6 +1254,32 @@ public class MidiTest extends Activity getApplicationInfo().dataDir); } + // Need to override this as the default implementation always finishes the activity. + @Override + public void onBackPressed() + { + ComponentPeerView focusedView = getViewWithFocusOrDefaultView(); + + if (focusedView == null) + return; + + focusedView.backButtonPressed(); + } + + private ComponentPeerView getViewWithFocusOrDefaultView() + { + for (int i = 0; i < viewHolder.getChildCount(); ++i) + { + if (viewHolder.getChildAt (i).hasFocus()) + return (ComponentPeerView) viewHolder.getChildAt (i); + } + + if (viewHolder.getChildCount() > 0) + return (ComponentPeerView) viewHolder.getChildAt (0); + + return null; + } + //============================================================================== private void hideActionBar() { @@ -1709,6 +1735,14 @@ public class MidiTest extends Activity } } + public void backButtonPressed() + { + if (host == 0) + return; + + handleBackButton (host); + } + @Override public boolean onKeyDown (int keyCode, KeyEvent event) { @@ -1722,7 +1756,7 @@ public class MidiTest extends Activity return super.onKeyDown (keyCode, event); case KeyEvent.KEYCODE_BACK: { - handleBackButton (host); + ((Activity) getContext()).onBackPressed(); return true; } diff --git a/examples/NetworkGraphicsDemo/Builds/Android/app/src/main/java/com/juce/networkgraphicsdemo/JUCENetworkGraphicsDemo.java b/examples/NetworkGraphicsDemo/Builds/Android/app/src/main/java/com/juce/networkgraphicsdemo/JUCENetworkGraphicsDemo.java index a45e571573..5ba1197341 100644 --- a/examples/NetworkGraphicsDemo/Builds/Android/app/src/main/java/com/juce/networkgraphicsdemo/JUCENetworkGraphicsDemo.java +++ b/examples/NetworkGraphicsDemo/Builds/Android/app/src/main/java/com/juce/networkgraphicsdemo/JUCENetworkGraphicsDemo.java @@ -322,6 +322,32 @@ public class JUCENetworkGraphicsDemo extends Activity getApplicationInfo().dataDir); } + // Need to override this as the default implementation always finishes the activity. + @Override + public void onBackPressed() + { + ComponentPeerView focusedView = getViewWithFocusOrDefaultView(); + + if (focusedView == null) + return; + + focusedView.backButtonPressed(); + } + + private ComponentPeerView getViewWithFocusOrDefaultView() + { + for (int i = 0; i < viewHolder.getChildCount(); ++i) + { + if (viewHolder.getChildAt (i).hasFocus()) + return (ComponentPeerView) viewHolder.getChildAt (i); + } + + if (viewHolder.getChildCount() > 0) + return (ComponentPeerView) viewHolder.getChildAt (0); + + return null; + } + //============================================================================== private void hideActionBar() { @@ -777,6 +803,14 @@ public class JUCENetworkGraphicsDemo extends Activity } } + public void backButtonPressed() + { + if (host == 0) + return; + + handleBackButton (host); + } + @Override public boolean onKeyDown (int keyCode, KeyEvent event) { @@ -790,7 +824,7 @@ public class JUCENetworkGraphicsDemo extends Activity return super.onKeyDown (keyCode, event); case KeyEvent.KEYCODE_BACK: { - handleBackButton (host); + ((Activity) getContext()).onBackPressed(); return true; } diff --git a/examples/OSCReceiver/Builds/Android/app/src/main/java/com/yourcompany/oscreceiver/OSCReceiver.java b/examples/OSCReceiver/Builds/Android/app/src/main/java/com/yourcompany/oscreceiver/OSCReceiver.java index e6f4e9abe7..de28445ffc 100644 --- a/examples/OSCReceiver/Builds/Android/app/src/main/java/com/yourcompany/oscreceiver/OSCReceiver.java +++ b/examples/OSCReceiver/Builds/Android/app/src/main/java/com/yourcompany/oscreceiver/OSCReceiver.java @@ -322,6 +322,32 @@ public class OSCReceiver extends Activity getApplicationInfo().dataDir); } + // Need to override this as the default implementation always finishes the activity. + @Override + public void onBackPressed() + { + ComponentPeerView focusedView = getViewWithFocusOrDefaultView(); + + if (focusedView == null) + return; + + focusedView.backButtonPressed(); + } + + private ComponentPeerView getViewWithFocusOrDefaultView() + { + for (int i = 0; i < viewHolder.getChildCount(); ++i) + { + if (viewHolder.getChildAt (i).hasFocus()) + return (ComponentPeerView) viewHolder.getChildAt (i); + } + + if (viewHolder.getChildCount() > 0) + return (ComponentPeerView) viewHolder.getChildAt (0); + + return null; + } + //============================================================================== private void hideActionBar() { @@ -777,6 +803,14 @@ public class OSCReceiver extends Activity } } + public void backButtonPressed() + { + if (host == 0) + return; + + handleBackButton (host); + } + @Override public boolean onKeyDown (int keyCode, KeyEvent event) { @@ -790,7 +824,7 @@ public class OSCReceiver extends Activity return super.onKeyDown (keyCode, event); case KeyEvent.KEYCODE_BACK: { - handleBackButton (host); + ((Activity) getContext()).onBackPressed(); return true; } diff --git a/examples/OSCSender/Builds/Android/app/src/main/java/com/yourcompany/oscsender/OSCSender.java b/examples/OSCSender/Builds/Android/app/src/main/java/com/yourcompany/oscsender/OSCSender.java index dd4c7b6e88..5e2567ce32 100644 --- a/examples/OSCSender/Builds/Android/app/src/main/java/com/yourcompany/oscsender/OSCSender.java +++ b/examples/OSCSender/Builds/Android/app/src/main/java/com/yourcompany/oscsender/OSCSender.java @@ -322,6 +322,32 @@ public class OSCSender extends Activity getApplicationInfo().dataDir); } + // Need to override this as the default implementation always finishes the activity. + @Override + public void onBackPressed() + { + ComponentPeerView focusedView = getViewWithFocusOrDefaultView(); + + if (focusedView == null) + return; + + focusedView.backButtonPressed(); + } + + private ComponentPeerView getViewWithFocusOrDefaultView() + { + for (int i = 0; i < viewHolder.getChildCount(); ++i) + { + if (viewHolder.getChildAt (i).hasFocus()) + return (ComponentPeerView) viewHolder.getChildAt (i); + } + + if (viewHolder.getChildCount() > 0) + return (ComponentPeerView) viewHolder.getChildAt (0); + + return null; + } + //============================================================================== private void hideActionBar() { @@ -777,6 +803,14 @@ public class OSCSender extends Activity } } + public void backButtonPressed() + { + if (host == 0) + return; + + handleBackButton (host); + } + @Override public boolean onKeyDown (int keyCode, KeyEvent event) { @@ -790,7 +824,7 @@ public class OSCSender extends Activity return super.onKeyDown (keyCode, event); case KeyEvent.KEYCODE_BACK: { - handleBackButton (host); + ((Activity) getContext()).onBackPressed(); return true; } diff --git a/examples/PushNotificationsDemo/Builds/Android/app/src/main/java/com/juce/pushnotificationsdemo/PushNotificationsDemo.java b/examples/PushNotificationsDemo/Builds/Android/app/src/main/java/com/juce/pushnotificationsdemo/PushNotificationsDemo.java index b86a27b15e..670f2b1431 100644 --- a/examples/PushNotificationsDemo/Builds/Android/app/src/main/java/com/juce/pushnotificationsdemo/PushNotificationsDemo.java +++ b/examples/PushNotificationsDemo/Builds/Android/app/src/main/java/com/juce/pushnotificationsdemo/PushNotificationsDemo.java @@ -1254,6 +1254,32 @@ public class PushNotificationsDemo extends Activity getApplicationInfo().dataDir); } + // Need to override this as the default implementation always finishes the activity. + @Override + public void onBackPressed() + { + ComponentPeerView focusedView = getViewWithFocusOrDefaultView(); + + if (focusedView == null) + return; + + focusedView.backButtonPressed(); + } + + private ComponentPeerView getViewWithFocusOrDefaultView() + { + for (int i = 0; i < viewHolder.getChildCount(); ++i) + { + if (viewHolder.getChildAt (i).hasFocus()) + return (ComponentPeerView) viewHolder.getChildAt (i); + } + + if (viewHolder.getChildCount() > 0) + return (ComponentPeerView) viewHolder.getChildAt (0); + + return null; + } + //============================================================================== private void hideActionBar() { @@ -1709,6 +1735,14 @@ public class PushNotificationsDemo extends Activity } } + public void backButtonPressed() + { + if (host == 0) + return; + + handleBackButton (host); + } + @Override public boolean onKeyDown (int keyCode, KeyEvent event) { @@ -1722,7 +1756,7 @@ public class PushNotificationsDemo extends Activity return super.onKeyDown (keyCode, event); case KeyEvent.KEYCODE_BACK: { - handleBackButton (host); + ((Activity) getContext()).onBackPressed(); return true; } diff --git a/examples/audio plugin demo/Builds/Android/app/src/main/java/com/juce/jucedemoplugin/JuceDemoPlugin.java b/examples/audio plugin demo/Builds/Android/app/src/main/java/com/juce/jucedemoplugin/JuceDemoPlugin.java index 82186065cd..9de833fd1a 100644 --- a/examples/audio plugin demo/Builds/Android/app/src/main/java/com/juce/jucedemoplugin/JuceDemoPlugin.java +++ b/examples/audio plugin demo/Builds/Android/app/src/main/java/com/juce/jucedemoplugin/JuceDemoPlugin.java @@ -1254,6 +1254,32 @@ public class JuceDemoPlugin extends Activity getApplicationInfo().dataDir); } + // Need to override this as the default implementation always finishes the activity. + @Override + public void onBackPressed() + { + ComponentPeerView focusedView = getViewWithFocusOrDefaultView(); + + if (focusedView == null) + return; + + focusedView.backButtonPressed(); + } + + private ComponentPeerView getViewWithFocusOrDefaultView() + { + for (int i = 0; i < viewHolder.getChildCount(); ++i) + { + if (viewHolder.getChildAt (i).hasFocus()) + return (ComponentPeerView) viewHolder.getChildAt (i); + } + + if (viewHolder.getChildCount() > 0) + return (ComponentPeerView) viewHolder.getChildAt (0); + + return null; + } + //============================================================================== private void hideActionBar() { @@ -1709,6 +1735,14 @@ public class JuceDemoPlugin extends Activity } } + public void backButtonPressed() + { + if (host == 0) + return; + + handleBackButton (host); + } + @Override public boolean onKeyDown (int keyCode, KeyEvent event) { @@ -1722,7 +1756,7 @@ public class JuceDemoPlugin extends Activity return super.onKeyDown (keyCode, event); case KeyEvent.KEYCODE_BACK: { - handleBackButton (host); + ((Activity) getContext()).onBackPressed(); return true; } diff --git a/extras/AudioPerformanceTest/Builds/Android/app/src/main/java/com/juce/audioperformancetest/AudioPerformanceTest.java b/extras/AudioPerformanceTest/Builds/Android/app/src/main/java/com/juce/audioperformancetest/AudioPerformanceTest.java index 8af76acf90..b462ce00cf 100644 --- a/extras/AudioPerformanceTest/Builds/Android/app/src/main/java/com/juce/audioperformancetest/AudioPerformanceTest.java +++ b/extras/AudioPerformanceTest/Builds/Android/app/src/main/java/com/juce/audioperformancetest/AudioPerformanceTest.java @@ -1254,6 +1254,32 @@ public class AudioPerformanceTest extends Activity getApplicationInfo().dataDir); } + // Need to override this as the default implementation always finishes the activity. + @Override + public void onBackPressed() + { + ComponentPeerView focusedView = getViewWithFocusOrDefaultView(); + + if (focusedView == null) + return; + + focusedView.backButtonPressed(); + } + + private ComponentPeerView getViewWithFocusOrDefaultView() + { + for (int i = 0; i < viewHolder.getChildCount(); ++i) + { + if (viewHolder.getChildAt (i).hasFocus()) + return (ComponentPeerView) viewHolder.getChildAt (i); + } + + if (viewHolder.getChildCount() > 0) + return (ComponentPeerView) viewHolder.getChildAt (0); + + return null; + } + //============================================================================== private void hideActionBar() { @@ -1709,6 +1735,14 @@ public class AudioPerformanceTest extends Activity } } + public void backButtonPressed() + { + if (host == 0) + return; + + handleBackButton (host); + } + @Override public boolean onKeyDown (int keyCode, KeyEvent event) { @@ -1722,7 +1756,7 @@ public class AudioPerformanceTest extends Activity return super.onKeyDown (keyCode, event); case KeyEvent.KEYCODE_BACK: { - handleBackButton (host); + ((Activity) getContext()).onBackPressed(); return true; }