Import translations. DO NOT MERGE am: 386239e -s ours am: bf5690c -s ours am: 163240e -s ours am: 769cc4c -s ours am: 635f303 -s ours
am: 8ca8802 -s ours
* commit '8ca88028808d9c290106d6c74058292cf7afb8db':
Import translations. DO NOT MERGE
diff --git a/res/values-be-rBY/strings.xml b/res/values-be-rBY/strings.xml
deleted file mode 100644
index dea4000..0000000
--- a/res/values-be-rBY/strings.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2010-2011 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="app_name" msgid="5717136097222561957">"MusicFX"</string>
- <string name="no_effects" msgid="5067916002004255814">"Эфекты недаступныя."</string>
- <string name="eq_dialog_title" msgid="2020244436368289652">"Эквалайзер"</string>
- <string name="headset_plug" msgid="4505819850289423141">"Каб праслухаць гэтыя эфекты, падключыце навушнікі."</string>
- <string name="bass_boost_strength" msgid="882301530007752270">"Bass Boost"</string>
- <string name="virtualizer_strength" msgid="106561253469770096">"Аб\'ёмны гук"</string>
- <string name="setup" msgid="1103677904576339192">"Наладзiць"</string>
- <string name="ci_extreme" msgid="1736938429763948084">"Паскаральнiк FX"</string>
- <string name="user" msgid="3949460956502898057">"Карыстальнік"</string>
- <string name="picker_title" msgid="8464126693702817261">"Панэль кірав. музыч. эфектамі"</string>
-</resources>
diff --git a/src/com/android/musicfx/ActivityMusic.java b/src/com/android/musicfx/ActivityMusic.java
index 328a923..f8daa1d 100644
--- a/src/com/android/musicfx/ActivityMusic.java
+++ b/src/com/android/musicfx/ActivityMusic.java
@@ -447,20 +447,21 @@
reverbSpinnerInit((Spinner)findViewById(R.id.prSpinner));
}
+ ActionBar ab = getActionBar();
+ final int padding = getResources().getDimensionPixelSize(
+ R.dimen.action_bar_switch_padding);
+ mToggleSwitch.setPadding(0,0, padding, 0);
+ ab.setCustomView(mToggleSwitch, new ActionBar.LayoutParams(
+ ActionBar.LayoutParams.WRAP_CONTENT,
+ ActionBar.LayoutParams.WRAP_CONTENT,
+ Gravity.CENTER_VERTICAL | Gravity.RIGHT));
+ ab.setDisplayOptions(ActionBar.DISPLAY_SHOW_TITLE | ActionBar.DISPLAY_SHOW_CUSTOM);
+
} else {
viewGroup.setVisibility(View.GONE);
((TextView) findViewById(R.id.noEffectsTextView)).setVisibility(View.VISIBLE);
}
- ActionBar ab = getActionBar();
- final int padding = getResources().getDimensionPixelSize(
- R.dimen.action_bar_switch_padding);
- mToggleSwitch.setPadding(0,0, padding, 0);
- ab.setCustomView(mToggleSwitch, new ActionBar.LayoutParams(
- ActionBar.LayoutParams.WRAP_CONTENT,
- ActionBar.LayoutParams.WRAP_CONTENT,
- Gravity.CENTER_VERTICAL | Gravity.RIGHT));
- ab.setDisplayOptions(ActionBar.DISPLAY_SHOW_TITLE | ActionBar.DISPLAY_SHOW_CUSTOM);
}
/*
@@ -501,7 +502,10 @@
// Unregister for broadcast intents. (These affect the visible UI,
// so we only care about them while we're in the foreground.)
- unregisterReceiver(mReceiver);
+ if ((mVirtualizerSupported) || (mBassBoostSupported) || (mEqualizerSupported)
+ || (mPresetReverbSupported)) {
+ unregisterReceiver(mReceiver);
+ }
}
private void reverbSpinnerInit(Spinner spinner) {
