Skip to content

Commit

Permalink
Merge remote branch 'cyan/cm-10.1' into mr1-staging
Browse files Browse the repository at this point in the history
  • Loading branch information
@Quarx2k
Quarx2k committed Dec 20, 2012
2 parents a88dd10 + d7d4be0 commit b080c08
Show file tree
Hide file tree
Showing 13 changed files with 217 additions and 39 deletions.
50 changes: 50 additions & 0 deletions core/java/android/hardware/Camera.java
View file
Expand Up @@ -1685,6 +1685,7 @@ public class Parameters {
private static final String KEY_SCENE_MODE = "scene-mode";
private static final String KEY_FLASH_MODE = "flash-mode";
private static final String KEY_FOCUS_MODE = "focus-mode";
private static final String KEY_ISO_MODE = "iso";
private static final String KEY_FOCUS_AREAS = "focus-areas";
private static final String KEY_MAX_NUM_FOCUS_AREAS = "max-num-focus-areas";
private static final String KEY_FOCAL_LENGTH = "focal-length";
Expand Down Expand Up @@ -1778,6 +1779,22 @@ public class Parameters {
*/
public static final String FLASH_MODE_TORCH = "torch";

//Values for ISO settings
/** @hide */
public static final String ISO_AUTO = "auto";
/** @hide */
public static final String ISO_HJR = "ISO_HJR";
/** @hide */
public static final String ISO_100 = "ISO100";
/** @hide */
public static final String ISO_200 = "ISO200";
/** @hide */
public static final String ISO_400 = "ISO400";
/** @hide */
public static final String ISO_800 = "ISO800";
/** @hide */
public static final String ISO_1600 = "ISO1600";

/**
* Scene mode is off.
*/
Expand Down Expand Up @@ -3287,6 +3304,39 @@ public boolean isSmoothZoomSupported() {
return TRUE.equals(str);
}

/**
* Gets the current ISO setting.
*
* @return one of ISO_XXX string constant. null if ISO
* setting is not supported.
* @hide
*/
public String getISOValue() {
return get(KEY_ISO_MODE);
}

/**
* Sets the ISO.
*
* @param iso ISO_XXX string constant.
* @hide
*/
public void setISOValue(String iso) {
set(KEY_ISO_MODE, iso);
}

/**
* Gets the supported ISO values.
*
* @return a List of ISO_MODE_XXX string constants. null if iso mode
* setting is not supported.
* @hide
*/
public List<String> getSupportedIsoValues() {
String str = get(KEY_ISO_MODE + SUPPORTED_VALUES_SUFFIX);
return split(str);
}

/**
* <p>Gets the distances from the camera to where an object appears to be
* in focus. The object is sharpest at the optimal focus distance. The
Expand Down
74 changes: 55 additions & 19 deletions core/res/res/values-es/strings.xml
View file

Large diffs are not rendered by default.

33 changes: 33 additions & 0 deletions core/res/res/values-hu/strings.xml
View file
Expand Up @@ -139,6 +139,20 @@
<string name="turn_off_radio" msgid="8198784949987062346">"Vezeték nélküli eszköz kikapcsolása"</string>
<string name="screen_lock" msgid="799094655496098153">"Képernyő lezárása"</string>
<string name="power_off" msgid="4266614107412865048">"Kikapcsolás"</string>
<string name="reboot_system" product="tablet">Táblagép újraindítása</string>
<string name="reboot_system" product="default">Telefon újraindítása</string>
<string name="global_action_screenshot">Képernyőmentés</string>
<string name="global_actions_toggle_expanded_desktop_mode">Kiterjesztett képernyő</string>
<string name="global_actions_expanded_desktop_mode_on_status">Engedélyezve</string>
<string name="global_actions_expanded_desktop_mode_off_status">Letiltva</string>
<string name="reboot_reboot">Újraindítás</string>
<string name="reboot_recovery">Recovery</string>
<string name="reboot_bootloader">Bootloader</string>
<string name="reboot_bootmenu">Bootmenü</string>
<string name="reboot_fastboot">Fastboot</string>
<string name="reboot_download">Download</string>
<string name="reboot_progress">Újraindítás\u2026</string>
<string name="reboot_confirm">A telefon újraindul.</string>
<string name="silent_mode_silent" msgid="319298163018473078">"Csengő kikapcsolva"</string>
<string name="silent_mode_vibrate" msgid="7072043388581551395">"Csengő rezeg"</string>
<string name="silent_mode_ring" msgid="8592241816194074353">"Csengő bekapcsolva"</string>
Expand Down Expand Up @@ -374,6 +388,8 @@
<string name="permdesc_clearAppCache" product="default" msgid="2459441021956436779">"Lehetővé teszi az alkalmazás számára, hogy tárhelyet szabadítson fel a telefonon azáltal, hogy fájlokat töröl más alkalmazások gyorsítótármappáiból. Ez a többi alkalmazás lassabb elindulását okozhatja, mert azoknak újra le kell kérniük az adataikat."</string>
<string name="permlab_movePackage" msgid="3289890271645921411">"alkalmazás-erőforrások áthelyezése"</string>
<string name="permdesc_movePackage" msgid="319562217778244524">"Lehetővé teszi az alkalmazás számára alkalmazás-erőforrások áthelyezését a belső tárolóról egy külső tárolóra, és fordítva."</string>
<string name="permlab_preventpower">kikapcsológomb felülbírálata</string>
<string name="permdesc_preventpower">Lehetővé teszi egy alkalmazás számára a kikapcsológomb felülbírálatát</string>
<string name="permlab_readLogs" msgid="6615778543198967614">"érzékeny naplóadatok olvasása"</string>
<string name="permdesc_readLogs" product="tablet" msgid="82061313293455151">"Lehetővé teszi az alkalmazás számára, hogy olvassa a rendszer különböző naplófájljait. Ezáltal általános információkat deríthet ki arról, hogy mire használja a táblagépét, valamint személyes, magánjellegű adatokhoz is hozzájuthat."</string>
<string name="permdesc_readLogs" product="default" msgid="2063438140241560443">"Lehetővé teszi az alkalmazás számára, hogy olvassa a rendszer különböző naplófájljait. Ezáltal általános információkat deríthet ki arról, hogy mire használja a telefonját, valamint személyes, magánjellegű adatokhoz is hozzájuthat."</string>
Expand Down Expand Up @@ -762,6 +778,7 @@
<string name="lockscreen_password_wrong" msgid="5737815393253165301">"Újra"</string>
<string name="faceunlock_multiple_failures" msgid="754137583022792429">"Elérte az arcalapú feloldási kísérletek maximális számát"</string>
<string name="lockscreen_plugged_in" msgid="8057762828355572315">"Töltés (<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>)"</string>
<string name="lockscreen_discharging">Lemerítés, <xliff:g id="number">%d</xliff:g><xliff:g id="percent">%%</xliff:g></string>
<string name="lockscreen_charged" msgid="321635745684060624">"Feltöltve"</string>
<string name="lockscreen_battery_short" msgid="4477264849386850266">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
<string name="lockscreen_low_battery" msgid="1482873981919249740">"Csatlakoztassa a töltőt."</string>
Expand Down Expand Up @@ -1378,6 +1395,7 @@
<string name="sending" msgid="3245653681008218030">"Küldés…"</string>
<string name="launchBrowserDefault" msgid="2057951947297614725">"Böngésző indítása?"</string>
<string name="SetupCallDefault" msgid="5834948469253758575">"Fogadja a hívást?"</string>
<string name="app_killed_message">Alkalmazás leállítva</string>
<string name="activity_resolver_use_always" msgid="8017770747801494933">"Mindig"</string>
<string name="activity_resolver_use_once" msgid="2404644797149173758">"Csak egyszer"</string>
<string name="default_audio_route_name" product="tablet" msgid="4617053898167127471">"Táblagép"</string>
Expand Down Expand Up @@ -1444,4 +1462,19 @@
<string name="enable_accessibility_canceled" msgid="3833923257966635673">"Hozzáférés megszakítva."</string>
<string name="user_switched" msgid="3768006783166984410">"<xliff:g id="NAME">%1$s</xliff:g> az aktuális felhasználó."</string>
<string name="owner_name" msgid="2716755460376028154">"Tulajdonos"</string>
<string name="global_action_reboot">Újraindítás</string>
<string name="global_action_choose_profile">Profil</string>
<string name="profileNameDefault">Alapértelmezett</string>
<string name="profileNameWork">Munka</string>
<string name="profileNameHome">Otthon</string>
<string name="profileNameSilent">Néma</string>
<string name="profileNameNight">Éjszaka</string>
<string name="profileGroupPhone">Telefon</string>
<string name="profileGroupCalendar">Naptár</string>
<string name="profileGroupGmail">Gmail</string>
<string name="profileGroupEmail">E-mail</string>
<string name="profileGroupSMS">SMS</string>
<string name="wildcardProfile">Egyéb</string>
<string name="toast_rotation_unlocked">Képernyő elforgatás engedélyezve</string>
<string name="toast_rotation_locked">Képernyő elforgatás letiltva</string>
</resources>
1 change: 1 addition & 0 deletions packages/SystemUI/AndroidManifest.xml
View file
Expand Up @@ -36,6 +36,7 @@
<uses-permission android:name="android.permission.ACCESS_4G_RADIO_DISABLE" />
<uses-permission android:name="android.permission.ACCESS_4G_STATE" />
<uses-permission android:name="android.permission.CHANGE_4G_STATE" />
<uses-permission android:name="com.android.phone.CHANGE_NETWORK_MODE" />

<!-- Physical hardware -->
<uses-permission android:name="android.permission.MANAGE_USB" />
Expand Down
29 changes: 20 additions & 9 deletions packages/SystemUI/res/values-es/strings.xml
View file
Expand Up @@ -65,8 +65,8 @@
<string name="compat_mode_off" msgid="4434467572461327898">"Expandir para ajustar"</string>
<string name="compat_mode_help_header" msgid="7969493989397529910">"Zoom de compatibilidad"</string>
<string name="compat_mode_help_body" msgid="4946726776359270040">"Si la aplicación se ha diseñado para una pantalla más pequeña, aparecerá un control de zoom junto al reloj."</string>
<string name="screenshot_saving_ticker" msgid="7403652894056693515">"Guardando captura..."</string>
<string name="screenshot_saving_title" msgid="8242282144535555697">"Guardando captura..."</string>
<string name="screenshot_saving_ticker" msgid="7403652894056693515">"Guardando captura\u2026"</string>
<string name="screenshot_saving_title" msgid="8242282144535555697">"Guardando captura\u2026"</string>
<string name="screenshot_saving_text" msgid="2419718443411738818">"La captura de pantalla se está guardando."</string>
<string name="screenshot_saved_title" msgid="6461865960961414961">"Captura guardada"</string>
<string name="screenshot_saved_text" msgid="1152839647677558815">"Toca para ver la captura de pantalla"</string>
Expand Down Expand Up @@ -139,7 +139,7 @@
<string name="accessibility_notifications_button" msgid="4498000369779421892">"Notificaciones"</string>
<string name="accessibility_remove_notification" msgid="3603099514902182350">"Borrar notificación"</string>
<string name="accessibility_gps_enabled" msgid="3511469499240123019">"GPS habilitado"</string>
<string name="accessibility_gps_acquiring" msgid="8959333351058967158">"Obteniendo ubicación..."</string>
<string name="accessibility_gps_acquiring" msgid="8959333351058967158">"Obteniendo ubicación\u2026"</string>
<string name="accessibility_tty_enabled" msgid="4613200365379426561">"Teletipo habilitado"</string>
<string name="accessibility_ringer_vibrate" msgid="666585363364155055">"Modo vibración"</string>
<string name="accessibility_ringer_silent" msgid="9061243307939135383">"Modo silencio"</string>
Expand Down Expand Up @@ -205,14 +205,25 @@
<string name="status_bar_help_text" msgid="7874607155052076323">"Desliza el dedo hacia abajo para acceder al contenido."\n"Vuelve a deslizar el dedo hacia abajo para acceder a los controles del sistema."</string>

<string name="quick_settings_screen_sleep">Bloquear</string>
<string name="quick_settings_ringer_on">Sonido ON</string>
<string name="quick_settings_ringer_off">Sonido OFF</string>
<string name="quick_settings_vibration_on">Vibración ON</string>
<string name="quick_settings_vibration_off">Vibración OFF</string>
<string name="quick_settings_label_enabled">ON</string>
<string name="quick_settings_label_disabled">OFF</string>
<string name="quick_settings_ringer_on">Sonido activado</string>
<string name="quick_settings_ringer_off">Sonido desactivado</string>
<string name="quick_settings_vibration_on">Vibración activada</string>
<string name="quick_settings_vibration_off">Vibración desactivada</string>
<string name="quick_settings_label_enabled">Activado</string>
<string name="quick_settings_label_disabled">Desactivado</string>
<string name="quick_settings_ringer_normal">Sonido</string>
<string name="quick_settings_lockscreen">Pantalla Bloqueo</string>
<string name="quick_settings_network_type">Red móvil</string>
<string name="quick_settings_report_bug">Informar de error</string>

<!-- CYANOGENMOD EDITS START -->

<string name="accessibility_quick_settings_ringer">Sonido <xliff:g id="state" example="Apagado">%s</xliff:g>.</string>
<string name="accessibility_quick_settings_vibration">Vibración <xliff:g id="state" example="Apagada">%s</xliff:g>.</string>
<string name="bean_dream_settings_cid_title">Usar a CID</string>
<string name="bean_dream_settings_cid_summary">Usar el icono CID para el salvapantallas en vez del icono Jellybean</string>
<string name="powerwidget_screen_timeout_toast">Tiempo de pantalla establecido a: %1$d %2$s</string>
<string name="quick_settings_gps">GPS</string>

<!-- CYANOGENMOD ADDITIONS END -->
</resources>
19 changes: 19 additions & 0 deletions packages/SystemUI/res/values-hu/strings.xml
View file
Expand Up @@ -155,6 +155,8 @@
<string name="accessibility_quick_settings_airplane" msgid="4196876722090224753">"Repülős üzemmód <xliff:g id="STATE">%s</xliff:g>."</string>
<string name="accessibility_quick_settings_bluetooth" msgid="5749054971341882340">"Bluetooth <xliff:g id="STATE">%s</xliff:g>."</string>
<string name="accessibility_quick_settings_alarm" msgid="3959908972897295660">"Ébresztés időpontja: <xliff:g id="TIME">%s</xliff:g>."</string>
<string name="accessibility_quick_settings_ringer">Hang <xliff:g id="state" example="Off">%s</xliff:g>.</string>
<string name="accessibility_quick_settings_vibration">Rezgés <xliff:g id="state" example="Off">%s</xliff:g>.</string>
<string name="data_usage_disabled_dialog_3g_title" msgid="5257833881698644687">"2G-3G adatforgalom letiltva"</string>
<string name="data_usage_disabled_dialog_4g_title" msgid="4789143363492682629">"4G adatforgalom letiltva"</string>
<string name="data_usage_disabled_dialog_mobile_title" msgid="1046047248844821202">"Mobil adatforgalom letiltva"</string>
Expand All @@ -174,6 +176,8 @@
<string name="accessibility_rotation_lock_on_landscape" msgid="6731197337665366273">"A képernyő zárolva van fekvő tájolásban."</string>
<string name="accessibility_rotation_lock_on_portrait" msgid="5809367521644012115">"A képernyő zárolva van álló tájolásban."</string>
<string name="jelly_bean_dream_name" msgid="5992026543636816792">"BeanFlinger"</string>
<string name="bean_dream_settings_cid_title">CID fej használata</string>
<string name="bean_dream_settings_cid_summary">A képernyővédőn űrlényfejek jelennek meg a zselés cukorkák helyett</string>
<string name="start_dreams" msgid="7219575858348719790">"Álmodozás"</string>
<string name="ethernet_label" msgid="7967563676324087464">"Ethernet"</string>
<string name="quick_settings_airplane_mode_label" msgid="5510520633448831350">"Repülőgép üzemmód"</string>
Expand All @@ -199,8 +203,23 @@
<string name="quick_settings_wifi_off_label" msgid="7558778100843885864">"Wi-Fi kikapcsolva"</string>
<string name="quick_settings_wifi_display_label" msgid="6893592964463624333">"Wi-Fi kijelző"</string>
<string name="quick_settings_wifi_display_no_connection_label" msgid="2355298740765736918">"Vezeték nélküli kijelző"</string>
<string name="quick_settings_profile_label">Profil</string>
<string name="quick_settings_brightness_dialog_title" msgid="8599674057673605368">"Fényerő"</string>
<string name="quick_settings_brightness_dialog_auto_brightness_label" msgid="5064982743784071218">"automatikus"</string>
<string name="status_bar_help_title" msgid="1199237744086469217">"Az értesítések itt jelennek meg."</string>
<string name="status_bar_help_text" msgid="7874607155052076323">"Bármikor elérheti őket, ha lefelé húzza az ujját."\n"Húzza le az ujját még egyszer a rendszerbeállítások eléréséhez."</string>
<string name="powerwidget_screen_timeout_toast">Képernyő időkorlátja: %1$d %2$s</string>

<string name="quick_settings_gps">GPS</string>
<string name="quick_settings_screen_sleep">Alvó mód</string>
<string name="quick_settings_ringer_on">Hang be</string>
<string name="quick_settings_ringer_off">Hang ki</string>
<string name="quick_settings_vibration_on">Rezgés be</string>
<string name="quick_settings_vibration_off">Rezgés ki</string>
<string name="quick_settings_label_enabled">Be</string>
<string name="quick_settings_label_disabled">Ki</string>
<string name="quick_settings_ringer_normal">Hang</string>
<string name="quick_settings_lockscreen">Képernyőzár</string>
<string name="quick_settings_network_type">Hálózat típusa</string>
<string name="quick_settings_report_bug">Hibajelentés</string>
</resources>
2 changes: 1 addition & 1 deletion packages/SystemUI/src/com/android/systemui/quicksettings/MobileNetworkTypeTile.java
View file
Expand Up @@ -138,7 +138,7 @@ public void onReceive(Context context, Intent intent) {
private static int get2G3G(Context context) {
int state = 99;
try {
state = Settings.Secure.getInt(context.getContentResolver(),
state = Settings.Global.getInt(context.getContentResolver(),
Settings.Global.PREFERRED_NETWORK_MODE);
} catch (SettingNotFoundException e) {
}
Expand Down
2 changes: 1 addition & 1 deletion packages/SystemUI/src/com/android/systemui/statusbar/powerwidget/NetworkModeButton.java
View file
Expand Up @@ -156,7 +156,7 @@ protected List<Uri> getObservedUris() {
private static int get2G3G(Context context) {
int state = 99;
try {
state = Settings.Secure.getInt(context.getContentResolver(),
state = Settings.Global.getInt(context.getContentResolver(),
Settings.Global.PREFERRED_NETWORK_MODE);
} catch (SettingNotFoundException e) {
}
Expand Down
9 changes: 1 addition & 8 deletions policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
View file
Expand Up @@ -914,14 +914,7 @@ public void run() {
}
if (targetKilled) {
performHapticFeedbackLw(null, HapticFeedbackConstants.LONG_PRESS, false);
/*
TODO: Displaying a Toast
The fix for bug 7048792: Use correct WindowManager for Toast - Using
the application Context instead of the activity Context to retrieve a
WindowManager with no parent window causes a NPE and reboot in 4.2 if we
try to display the Toast below. Disable until we can figure out a solution.
*/
//Toast.makeText(mContext, R.string.app_killed_message, Toast.LENGTH_SHORT).show();
Toast.makeText(mContext, R.string.app_killed_message, Toast.LENGTH_SHORT).show();
break;
}
}
Expand Down
9 changes: 9 additions & 0 deletions services/java/com/android/server/WifiService.java
View file
Expand Up @@ -887,6 +887,15 @@ public void setCountryCode(String countryCode, boolean persist) {
mWifiStateMachine.setCountryCode(countryCode, persist);
}


/**
* Get the operational country code
*/
public String getCountryCode() {
enforceAccessPermission();
return mWifiStateMachine.getCountryCode();
}

/**
* Set the operational frequency band
* @param band One of
Expand Down
2 changes: 2 additions & 0 deletions wifi/java/android/net/wifi/IWifiManager.aidl
View file
Expand Up @@ -61,6 +61,8 @@ interface IWifiManager

void setCountryCode(String country, boolean persist);

String getCountryCode();

void setFrequencyBand(int band, boolean persist);

int getFrequencyBand();
Expand Down
12 changes: 12 additions & 0 deletions wifi/java/android/net/wifi/WifiManager.java
View file
Expand Up @@ -809,6 +809,18 @@ public void setCountryCode(String country, boolean persist) {
} catch (RemoteException e) { }
}

/**
* Get the operational country code.
* @hide
*/
public String getCountryCode() {
try {
return mService.getCountryCode();
} catch (RemoteException e) {
return null;
}
}

/**
* Set the operational frequency band.
* @param band One of
Expand Down

0 comments on commit b080c08

Please sign in to comment.