summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--AriesParts/res/values-pt/arrays.xml45
-rw-r--r--AriesParts/res/values-pt/strings.xml27
-rw-r--r--AriesParts/src/com/cyanogenmod/AriesParts/TvOutService.java4
-rw-r--r--libaudio/AudioHardware.cpp55
-rw-r--r--libaudio/AudioHardware.h3
5 files changed, 116 insertions, 18 deletions
diff --git a/AriesParts/res/values-pt/arrays.xml b/AriesParts/res/values-pt/arrays.xml
new file mode 100644
index 0000000..75233fa
--- /dev/null
+++ b/AriesParts/res/values-pt/arrays.xml
@@ -0,0 +1,45 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string-array name="backlight_timeout_entries">
+ <item>Padrão (1.6 segundos)</item>
+ <item>0.5 segundos</item>
+ <item>2 segundos</item>
+ <item>5 segundos</item>
+ <item>10 segundos</item>
+ <item>15 segundos</item>
+ <item>30 segundos</item>
+ <item>Nunca</item>
+ </string-array>
+
+ <string-array name="backlight_timeout_entries_values" translatable="false">
+ <item>1600</item>
+ <item>500</item>
+ <item>2000</item>
+ <item>5000</item>
+ <item>10000</item>
+ <item>15000</item>
+ <item>30000</item>
+ <item>-1</item>
+ </string-array>
+
+ <string-array name="hspa_entries">
+ <item>UMTS Apenas</item>
+ <item>HSDPA Apenas</item>
+ <item>HSDPA + HSUPA</item>
+ </string-array>
+
+ <string-array name="hspa_entries_values" translatable="false">
+ <item>21</item>
+ <item>22</item>
+ <item>23</item>
+ </string-array>
+
+ <string-array name="tvout_system_entries">
+ <item>NTSC</item>
+ <item>PAL</item>
+ </string-array>
+
+ <string-array name="tvout_system_entries_values" translatable="false">
+ <item>1</item>
+ <item>2</item>
+ </string-array>
+</resources>
diff --git a/AriesParts/res/values-pt/strings.xml b/AriesParts/res/values-pt/strings.xml
new file mode 100644
index 0000000..d7f63be
--- /dev/null
+++ b/AriesParts/res/values-pt/strings.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+ <string name="app_name">Configurações do Galaxy S</string>
+
+ <string name="category_screen_title">Tela</string>
+ <string name="color_tuning_title_head">Ajuste de Cor</string>
+ <string name="color_tuning_summary_head">Calibrar as cores da tela</string>
+ <string name="color_red_title">Vermelho</string>
+ <string name="color_green_title">Verde</string>
+ <string name="color_blue_title">Azul</string>
+
+ <string name="category_touchkey_title">Botões Touch</string>
+ <string name="backlight_timeout_title_head">Tempo Limite da Iluminação</string>
+ <string name="backlight_timeout_summary_head">Ajuste o tempo para desligar a iluminação dos Botões Touch</string>
+
+ <string name="category_radio_title">Radio</string>
+ <string name="hspa_title_head">HSPA</string>
+ <string name="hspa_summary_head">Ativar HSDPA/HSUPA</string>
+
+ <string name="category_tvout_title">Saída de TV</string>
+ <string name="tvout_enable_head">Saída de TV</string>
+ <string name="tvout_enable_summary_nocable">Cabo para Saída de TV não conectado</string>
+ <string name="tvout_enable_summary">Cabo para Saída de TV conectado, ative para usar</string>
+ <string name="tvout_enable_summary_on">Saída de TV ativada</string>
+ <string name="tvout_system_head">Sistema de TV</string>
+ <string name="tvout_system_summary">Ajuste seu sistema de TV para a Saída de TV</string>
+</resources>
diff --git a/AriesParts/src/com/cyanogenmod/AriesParts/TvOutService.java b/AriesParts/src/com/cyanogenmod/AriesParts/TvOutService.java
index 5812ac6..3f6216f 100644
--- a/AriesParts/src/com/cyanogenmod/AriesParts/TvOutService.java
+++ b/AriesParts/src/com/cyanogenmod/AriesParts/TvOutService.java
@@ -46,14 +46,14 @@ public class TvOutService extends Service {
}
else if (Intent.ACTION_SCREEN_ON.equals(action)) {
if (mWasOn) {
- enable();
+ SystemProperties.set("ctl.start", "tvouthack");
mWasOn = false;
}
}
else if (Intent.ACTION_SCREEN_OFF.equals(action)) {
if (mTvOut._isEnabled()) {
mWasOn = true;
- disable();
+ SystemProperties.set("ctl.stop", "tvouthack");
}
}
}
diff --git a/libaudio/AudioHardware.cpp b/libaudio/AudioHardware.cpp
index 3e28448..771fa5e 100644
--- a/libaudio/AudioHardware.cpp
+++ b/libaudio/AudioHardware.cpp
@@ -90,6 +90,7 @@ AudioHardware::AudioHardware() :
mPcmOpenCnt(0),
mMixerOpenCnt(0),
mInCallAudioMode(false),
+ mVoiceVol(1.0f),
mInputSource(AUDIO_SOURCE_DEFAULT),
mBluetoothNrec(true),
mTTYMode(TTY_MODE_OFF),
@@ -370,8 +371,10 @@ status_t AudioHardware::setMode(int mode)
status = AudioHardwareBase::setMode(mode);
LOGV("setMode() : new %d, old %d", mMode, prevMode);
if (status == NO_ERROR) {
+ bool modeNeedsCPActive = mMode == AudioSystem::MODE_IN_CALL ||
+ mMode == AudioSystem::MODE_RINGTONE;
// activate call clock in radio when entering in call or ringtone mode
- if (prevMode == AudioSystem::MODE_NORMAL)
+ if (modeNeedsCPActive)
{
if ((!mActivatedCP) && (mSecRilLibHandle) && (connectRILDIfRequired() == OK)) {
setCallClockSync(mRilClient, SOUND_CLOCK_START);
@@ -393,9 +396,10 @@ status_t AudioHardware::setMode(int mode)
openPcmOut_l();
openMixer_l();
setInputSource_l(AUDIO_SOURCE_DEFAULT);
+ setVoiceVolume_l(mVoiceVol);
mInCallAudioMode = true;
}
- if (mMode == AudioSystem::MODE_NORMAL && mInCallAudioMode) {
+ if (mMode != AudioSystem::MODE_IN_CALL && mInCallAudioMode) {
setInputSource_l(mInputSource);
if (mMixer != NULL) {
TRACE_DRIVER_IN(DRV_MIXER_GET)
@@ -424,7 +428,7 @@ status_t AudioHardware::setMode(int mode)
mInCallAudioMode = false;
}
- if (mMode == AudioSystem::MODE_NORMAL) {
+ if (!modeNeedsCPActive) {
if(mActivatedCP)
mActivatedCP = false;
}
@@ -573,12 +577,21 @@ size_t AudioHardware::getInputBufferSize(uint32_t sampleRate, int format, int ch
return AudioStreamInALSA::getBufferSize(sampleRate, channelCount);
}
-
status_t AudioHardware::setVoiceVolume(float volume)
{
- LOGD("### setVoiceVolume");
-
AutoMutex lock(mLock);
+
+ setVoiceVolume_l(volume);
+
+ return NO_ERROR;
+}
+
+void AudioHardware::setVoiceVolume_l(float volume)
+{
+ LOGD("### setVoiceVolume_l");
+
+ mVoiceVol = volume;
+
if ( (AudioSystem::MODE_IN_CALL == mMode) && (mSecRilLibHandle) &&
(connectRILDIfRequired() == OK) ) {
@@ -622,7 +635,6 @@ status_t AudioHardware::setVoiceVolume(float volume)
setCallVolume(mRilClient, type, int_volume);
}
- return NO_ERROR;
}
status_t AudioHardware::setMasterVolume(float volume)
@@ -1302,12 +1314,16 @@ status_t AudioHardware::AudioStreamOutALSA::standby()
{
if (mHardware == NULL) return NO_INIT;
- AutoMutex lock(mLock);
+ mSleepReq = true;
+ {
+ AutoMutex lock(mLock);
+ mSleepReq = false;
- { // scope for the AudioHardware lock
- AutoMutex hwLock(mHardware->lock());
+ { // scope for the AudioHardware lock
+ AutoMutex hwLock(mHardware->lock());
- doStandby_l();
+ doStandby_l();
+ }
}
return NO_ERROR;
@@ -1420,9 +1436,10 @@ status_t AudioHardware::AudioStreamOutALSA::setParameters(const String8& keyValu
if (mHardware == NULL) return NO_INIT;
+ mSleepReq = true;
{
AutoMutex lock(mLock);
-
+ mSleepReq = false;
if (param.getInt(String8(AudioParameter::keyRouting), device) == NO_ERROR)
{
if (device != 0) {
@@ -1669,12 +1686,16 @@ status_t AudioHardware::AudioStreamInALSA::standby()
{
if (mHardware == NULL) return NO_INIT;
- AutoMutex lock(mLock);
+ mSleepReq = true;
+ {
+ AutoMutex lock(mLock);
+ mSleepReq = false;
- { // scope for AudioHardware lock
- AutoMutex hwLock(mHardware->lock());
+ { // scope for AudioHardware lock
+ AutoMutex hwLock(mHardware->lock());
- doStandby_l();
+ doStandby_l();
+ }
}
return NO_ERROR;
}
@@ -1806,8 +1827,10 @@ status_t AudioHardware::AudioStreamInALSA::setParameters(const String8& keyValue
if (mHardware == NULL) return NO_INIT;
+ mSleepReq = true;
{
AutoMutex lock(mLock);
+ mSleepReq = false;
if (param.getInt(String8(AudioParameter::keyInputSource), value) == NO_ERROR) {
AutoMutex hwLock(mHardware->lock());
diff --git a/libaudio/AudioHardware.h b/libaudio/AudioHardware.h
index 8a781bf..0fa368c 100644
--- a/libaudio/AudioHardware.h
+++ b/libaudio/AudioHardware.h
@@ -128,6 +128,8 @@ public:
status_t setInputSource_l(audio_source source);
+ void setVoiceVolume_l(float volume);
+
static uint32_t getInputSampleRate(uint32_t sampleRate);
sp <AudioStreamInALSA> getActiveInput_l();
@@ -163,6 +165,7 @@ private:
uint32_t mPcmOpenCnt;
uint32_t mMixerOpenCnt;
bool mInCallAudioMode;
+ float mVoiceVol;
audio_source mInputSource;
bool mBluetoothNrec;
generated by cgit v1.1 at 2024-05-19 03:27:58 +0000