Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7f8c577b authored by Mark Harman's avatar Mark Harman
Browse files

Replace beep sound effects (new ones created by me).

parent ef46d3d7
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -292,7 +292,6 @@ Also see <i>"Can I use the Open Camera source code in my app?"</i> under the <a
    white_balance_unlocked.png (modified from baseline_lock_open_white_48).
    <br>Modified versions of some of these icons are also used on this website.
    <br>Open Camera's app icon/logo also makes use of ic_photo_camera_white_48dp by Google (also Apache license version 2.0).</li>
    <li>beep.ogg, beep_hi.ogg - from <a href="http://opengameart.org/content/interface-beeps">http://opengameart.org/&#8203;content/interface-beeps</a> , by bart, under <a href="http://creativecommons.org/publicdomain/zero/1.0/">CC0 (public domain)</a>.</li>
</ul>

<p>Note that old versions of Open Camera also used the following:</p>
@@ -306,6 +305,7 @@ of old versions; but no need to mention CC0 media which doesn't require attribut
<!--<li>Icon is from <a href="http://commons.wikimedia.org/wiki/File:Camera2_mgx.svg">http://commons.wikimedia.org/&#8203;wiki/File:Camera2_mgx.svg</a> , by AlphaZeta, under CC0 (public domain).</li>-->
<!--<li>Icon/logo is from <a href="http://aboutfoto.wordpress.com/2014/09/20/a-logo-for-open-camera/">http://aboutfoto.wordpress.com/&#8203;2014/09/20/&#8203;a-logo-for-open-camera/</a> , by Cosmin Saveanu, under CC0 (public domain).</li>-->
<!--<li>earth.png, earth_off.png from <a href="http://commons.wikimedia.org/wiki/File:NASA_Earth_America_2010.jpg">http://commons.wikimedia.org/&#8203;wiki/&#8203;File:NASA_Earth_America_2010.jpg</a> , public domain.</li>-->
<!--<li>beep.ogg, beep_hi.ogg - from <a href="http://opengameart.org/content/interface-beeps">http://opengameart.org/&#8203;content/interface-beeps</a> , by bart, under <a href="http://creativecommons.org/publicdomain/zero/1.0/">CC0 (public domain)</a>.</li>-->
<li>exposure_locked.png, focus_mode_locked.png, white_balance_locked.png modified from https://www.iconfinder.com/&#8203;icons/128411/&#8203;antivirus_close_forbid_hide_&#8203;lock_locked_password_privacy_&#8203;private_protection_restriction&#8203;_safe_secure_security_icon#&#8203;size=64 , by Aha-Soft, under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a> (no need to credit me).</li>
<li>exposure_unlocked.png, white_balance_unlocked.png modified from https://www.iconfinder.com/&#8203;icons/128416/&#8203;free_freedom_hack_lock_open_&#8203;padlock_password_secure_&#8203;security_unlock_unlocked_icon#&#8203;size=64 , by Aha-Soft, under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a> (no need to credit me).</li>
<li>flash_off.png, flash_auto.png, flash_on.png from https://www.iconfinder.com/&#8203;icons/62201/flash_icon#size=64, by The Working Group, under <a href="http://creativecommons.org/licenses/by-sa/3.0/">CC BY-SA 3.0</a>.</li>
+2 −2
Original line number Diff line number Diff line
@@ -1018,8 +1018,8 @@ public class MainActivity extends Activity {
        initLocation();
        initGyroSensors();
        soundPoolManager.initSound();
        soundPoolManager.loadSound(R.raw.beep);
        soundPoolManager.loadSound(R.raw.beep_hi);
        soundPoolManager.loadSound(R.raw.mybeep);
        soundPoolManager.loadSound(R.raw.mybeep_hi);

        mainUI.layoutUI();

+1 −1
Original line number Diff line number Diff line
@@ -2360,7 +2360,7 @@ public class MyApplicationInterface extends BasicApplicationInterface {
            if( MyDebug.LOG )
                Log.d(TAG, "play beep!");
            boolean is_last = remaining_time <= 1000;
            main_activity.getSoundPoolManager().playSound(is_last ? R.raw.beep_hi : R.raw.beep);
            main_activity.getSoundPoolManager().playSound(is_last ? R.raw.mybeep_hi : R.raw.mybeep);
        }
        if( sharedPreferences.getBoolean(PreferenceKeys.getTimerSpeakPreferenceKey(), false) ) {
            if( MyDebug.LOG )
+0 −2
Original line number Diff line number Diff line
@@ -840,8 +840,6 @@ public class MyPreferenceFragment extends PreferenceFragment implements OnShared
            });
        }

        // don't bother doing anything for preference_licence_beep - not required since it's CC0

        {
            final Preference pref = findPreference("preference_licence_online");
            pref.setOnPreferenceClickListener(new OnPreferenceClickListener() {

app/src/main/res/raw/beep.ogg

deleted100644 → 0
−7.45 KiB

File deleted.

Loading