Skip to content

Commit

Permalink
Merge branch 'cyanogen' into gingerbread
Browse files Browse the repository at this point in the history
  • Loading branch information
@tpruvot
tpruvot committed May 24, 2012
2 parents 3e92533 + b5aa750 commit b03f3dd
Show file tree
Hide file tree
Showing 6 changed files with 101 additions and 54 deletions.
83 changes: 58 additions & 25 deletions DefyParts/res/values-pt/strings.xml
100644 → 100755
View file
Original file line number Diff line number Diff line change
@@ -1,25 +1,58 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>

<string name="app_name">Definições do Defy</string>

<string name="charge_led_mode_title">Modo LED carregamento</string>
<string name="charge_led_mode_summary">Ajustar o comportamento da LED de notificação durante o carregamento</string>
<string name="charge_led_mode_white">LED Branca</string>
<string name="charge_led_mode_rgb">LED Mista (vermelho/verde)</string>
<string name="charge_led_mode_off">Desligado</string>

<string name="touch_points_title">Pontos de Multi-Toque</string>
<string name="touch_points_summary">Ajustar o número de pontos simultâneos de toque a serem reconhecidos pelo sistema</string>
<string name="touch_point_entry_2points">2 pontos (omissão)</string>
<string name="touch_point_entry_3points">3 pontos</string>
<string name="touch_point_entry_4points">4 pontos</string>
<string name="touch_point_entry_5points">5 pontos</string>
<string name="touch_point_entry_8points">8 pontos</string>

<string name="touch_point_warning_title">Advertência</string>
<string name="touch_point_warning_message">Aumentar o número de pontos de toque pode degradar o tempo de resposta do ecrã. Tem a certeza que pretende continuar?</string>

<string name="audio_effects">Filtros de áudio</string>

</resources>
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="app_name">Definições do Defy</string>
<string name="charge_led_mode_title">Modo LED carregamento</string>
<string name="charge_led_mode_summary">Ajustar o comportamento da LED de notificação durante o carregamento</string>
<string name="charge_led_mode_white">LED Branca</string>
<string name="charge_led_mode_rgb">LED Mista (vermelho/verde)</string>
<string name="charge_led_mode_off">Desligado</string>
<string name="touch_points_title">Pontos de Multi-Toque</string>
<string name="touch_points_summary">Ajustar o número de pontos simultâneos de toque a serem reconhecidos pelo sistema</string>
<string name="touch_point_entry_2points">2 pontos (omissão)</string>
<string name="touch_point_entry_3points">3 pontos</string>
<string name="touch_point_entry_4points">4 pontos</string>
<string name="touch_point_entry_5points">5 pontos</string>
<string name="touch_point_entry_8points">8 pontos</string>
<string name="touch_point_warning_title">Advertência</string>
<string name="touch_point_warning_message">Aumentar o número de pontos de toque pode degradar o tempo de resposta do ecrã. Tem a certeza que pretende continuar?</string>
<string name="audio_effects">Filtros de áudio</string>
<string name="general_settings_title">Configurações gerais</string>
<string name="button_brightness_scale_title">Brilho do botão</string>
<string name="button_brightness_scale_summary">Permite reduzir o brilho do botão, especialmente útil quando se usa brilho manual</string>
<string name="audio_settings_title">Configurações de Áudio</string>
<string name="other_settings_title">Outras configurações</string>
<string name="compass_calibrate">Calibrador de compasso</string>
<string name="baseband_selection">Seleção de baseband</string>
<string name="kineto_support">Suporte a ligação via Wi-Fi</string>
<string name="kineto_support_summary">Ativar ligação Wi-Fi via aplicação T-Mobile</string>
<string name="reboot_prompt_title">Requer reinicialização</string>
<string name="reboot_prompt_message">Para aplicar as mudanças de configuração, é requerido reinicialização.\n\nVocê deseja reiniciar agora?</string>
<string name="yes">Sim</string>
<string name="no">Não</string>
<string name="region_europe">Europa</string>
<string name="region_america">América</string>
<string name="region_asia">Ásia</string>
<string name="region_africa">África</string>
<string name="region_australia">Australia</string>
<string name="country_central_europe">Europa Central</string>
<string name="country_france">França</string>
<string name="country_great_britain">Grâ-Bretanha</string>
<string name="country_italy">Itália</string>
<string name="country_poland">Polônia</string>
<string name="country_usa">EUA</string>
<string name="country_brasil">Brasil</string>
<string name="country_argentina">Argentina</string>
<string name="country_colombia">Colômbia</string>
<string name="country_china">China</string>
<string name="country_south_korea">Coréia do Sul</string>
<string name="country_hongkong_taiwan">Hong Kong, Taiwan</string>
<string name="country_south_east_asia">Oriente Médio</string>
<string name="country_arabia">Arábia</string>
<string name="country_south_africa">África do Sul</string>
<string name="baseband_selection_summary">Selecione a banda base adequeda para seu país\nAtualmente selecionada: %1$s %2$s</string>
<string name="baseband_region">Região</string>
<string name="baseband_country">País</string>
<string name="baseband_version">Versão</string>
<string name="baseband_frequencies">Frequências: %1$s MHz</string>
<string name="unknown">Desconhecido</string>
</resources>
17 changes: 5 additions & 12 deletions bootmenu/script/2nd-boot.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,18 +17,11 @@ killall ueventd
ADBD_RUNNING=`ps | grep adbd | grep -v grep`
if [ -z "$ADB_RUNNING" ]; then
rm -f /tmp/usbd_current_state
#delete if is a symlink
[ -L "/tmp" ] && rm -f /tmp
mkdir -p /tmp
else
# well, not beautiful but do the work
# to keep current usbd state (if present)
if [ -L "/tmp" ]; then
mv /tmp/usbd_current_state / 2>/dev/null
rm -f /tmp
mkdir -p /tmp
mv /usbd_current_state /tmp/ 2>/dev/null
fi
fi

# original /tmp data symlink
if [ -L /tmp.bak ]; then
rm /tmp.bak
fi

if [ -L /sdcard-ext ]; then
Expand Down
17 changes: 5 additions & 12 deletions bootmenu/script/2nd-init.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,18 +18,11 @@ killall ueventd
ADBD_RUNNING=`ps | grep adbd | grep -v grep`
if [ -z "$ADB_RUNNING" ]; then
rm -f /tmp/usbd_current_state
#delete if is a symlink
[ -L "/tmp" ] && rm -f /tmp
mkdir -p /tmp
else
# well, not beautiful but do the work
# to keep current usbd state
if [ -L "/tmp" ]; then
mv /tmp/usbd_current_state / 2>/dev/null
rm -f /tmp
mkdir -p /tmp
mv /usbd_current_state /tmp/ 2>/dev/null
fi
fi

# original /tmp data symlink
if [ -L /tmp.bak ]; then
rm /tmp.bak
fi

if [ -L /sdcard-ext ]; then
Expand Down
6 changes: 6 additions & 0 deletions bootmenu/script/pre_bootmenu.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,4 +80,10 @@ if [ -x $BM_ROOTDIR/script/overclock.sh ]; then
$BM_ROOTDIR/script/overclock.sh safe
fi

# must be restored in stock.sh
if [ -L /tmp ]; then
mv /tmp /tmp.bak
mkdir /tmp && busybox mount -t ramfs ramfs /tmp
fi

exit 0
14 changes: 10 additions & 4 deletions bootmenu/script/stock.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,16 @@ export PATH=/sbin:/system/xbin:/system/bin

######## Main Script

mount -o remount,rw /
cp -f /system/bootmenu/binary/adbd /sbin/adbd
chmod 4755 /sbin/adbd
chown root.system /sbin/adbd
busybox mount -o remount,rw /
busybox cp -f /system/bootmenu/binary/adbd /sbin/adbd
busybox chmod 4755 /sbin/adbd
busybox chown root.system /sbin/adbd

# restore original /tmp data symlink
if [ -L /tmp.bak ]; then
busybox umount /tmp
busybox mv /tmp.bak /tmp
fi

######## Cleanup

Expand Down
18 changes: 17 additions & 1 deletion libcamera/JordanCameraWrapper.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -393,6 +393,7 @@ JordanCameraWrapper::setParameters(const CameraParameters& params)
{
CameraParameters pars(params.flatten());
String8 oldFlashMode = mFlashMode;
String8 sceneMode;
status_t retval;
int width, height;
char buf[10];
Expand All @@ -415,8 +416,23 @@ JordanCameraWrapper::setParameters(const CameraParameters& params)
pars.setPreviewFrameRate(24);
}

mFlashMode = pars.get(CameraParameters::KEY_FLASH_MODE);
sceneMode = pars.get(CameraParameters::KEY_SCENE_MODE);
if (sceneMode != CameraParameters::SCENE_MODE_AUTO) {
/* The lib doesn't seem to update the flash mode correctly when a scene
mode is set, so we need to do it here. Also do focus mode, just do
be on the safe side. */
pars.set(CameraParameters::KEY_FOCUS_MODE, CameraParameters::FOCUS_MODE_AUTO);

if (sceneMode == CameraParameters::SCENE_MODE_PORTRAIT ||
sceneMode == CameraParameters::SCENE_MODE_NIGHT_PORTRAIT)
{
pars.set(CameraParameters::KEY_FLASH_MODE, CameraParameters::FLASH_MODE_AUTO);
} else {
pars.set(CameraParameters::KEY_FLASH_MODE, CameraParameters::FLASH_MODE_OFF);
}
}

mFlashMode = pars.get(CameraParameters::KEY_FLASH_MODE);
float exposure = pars.getFloat(CameraParameters::KEY_EXPOSURE_COMPENSATION);
/* exposure-compensation comes multiplied in the -9...9 range, while
we need it in the -3...3 range -> adjust for that */
Expand Down

0 comments on commit b03f3dd

Please sign in to comment.