PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

auto import from //branches/cupcake_rel/...@138607

Browse Source
This commit is contained in:
The Android Open Source Project
2009-03-13 13:04:25 -07:00
parent 80a7a1dbf2
commit 72ed6feab2
28 changed files with 194 additions and 243 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
res/layout-land/choose_lock_pattern.xml
View File

@@ -43,29 +43,35 @@
android:layout_height="0dip" android:layout_height="0dip"
android:layout_weight="1.0"> android:layout_weight="1.0">
<!-- left button: skip, or re-try --> <!-- right / bottom button: confirm or ok -->
<Button android:id="@+id/footerLeftButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_alignParentBottom="true"
android:text="@string/lockpattern_restart_button_text"/>
<!-- right button: confirm or ok -->
<Button android:id="@+id/footerRightButton" <Button android:id="@+id/footerRightButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentRight="true" android:layout_width="140dip"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:ellipsize="marquee"
android:singleLine="true"
android:drawableRight="@drawable/ic_btn_next" android:drawableRight="@drawable/ic_btn_next"
android:drawablePadding="3dip" android:drawablePadding="3dip"
android:text="@string/lockpattern_confirm_button_text"/> android:text="@string/lockpattern_confirm_button_text"/>
<!-- left / top button: skip, or re-try -->
<Button android:id="@+id/footerLeftButton"
android:layout_height="wrap_content"
android:layout_width="140dip"
android:layout_above="@id/footerRightButton"
android:layout_centerHorizontal="true"
android:ellipsize="marquee"
android:singleLine="true"
android:text="@string/lockpattern_restart_button_text"/>
<!-- message above buttons --> <!-- message above buttons -->
<TextView android:id="@+id/footerText" <TextView android:id="@+id/footerText"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_above="@+id/footerRightButton" android:layout_above="@+id/footerLeftButton"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:layout_marginBottom="4dip" android:layout_marginBottom="4dip"
android:textSize="14sp"/> android:textSize="14sp"/>

10
res/layout/choose_lock_pattern.xml
View File

@@ -56,8 +56,9 @@
<!-- left button: skip, or retry --> <!-- left button: skip, or retry -->
<Button android:id="@+id/footerLeftButton" <Button android:id="@+id/footerLeftButton"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_width="0dip" android:layout_width="140dip"
android:layout_weight="1" android:ellipsize="marquee"
android:singleLine="true"
android:text="@string/lockpattern_restart_button_text"/> android:text="@string/lockpattern_restart_button_text"/>
<!-- Placeholder to get blank space between the two buttons --> <!-- Placeholder to get blank space between the two buttons -->
@@ -70,8 +71,9 @@
<!-- right button: confirm or ok --> <!-- right button: confirm or ok -->
<Button android:id="@+id/footerRightButton" <Button android:id="@+id/footerRightButton"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_width="0dip" android:layout_width="140dip"
android:layout_weight="1" android:ellipsize="marquee"
android:singleLine="true"
android:drawableRight="@drawable/ic_btn_next" android:drawableRight="@drawable/ic_btn_next"
android:drawablePadding="3dip" android:drawablePadding="3dip"
android:text="@string/lockpattern_confirm_button_text"/> android:text="@string/lockpattern_confirm_button_text"/>

2
res/values-cs/strings.xml
View File

@@ -417,8 +417,6 @@
<string name="status_wifi_mac_address">"Adresa MAC sítě WiFi"</string> <string name="status_wifi_mac_address">"Adresa MAC sítě WiFi"</string>
<string name="status_bt_address">"Adresa zařízení Bluetooth"</string> <string name="status_bt_address">"Adresa zařízení Bluetooth"</string>
<string name="status_unavailable">"Nedostupný údaj"</string> <string name="status_unavailable">"Nedostupný údaj"</string>
<string name="status_network_traffic_stats">"Využití sítě"</string>
<string name="status_network_traffic_summary">"Odesláno: <xliff:g id="NETWORK_TRAFFIC_0">%1$d packets, %2$d bytes%n</xliff:g>Přijato: <xliff:g id="NETWORK_TRAFFIC_1">%3$d packets, %4$d bytes</xliff:g>"</string>
<string name="status_up_time">"Doba provozu"</string> <string name="status_up_time">"Doba provozu"</string>
<string name="status_awake_time">"Doba provozu"</string> <string name="status_awake_time">"Doba provozu"</string>
<string name="internal_memory">"Interní paměť telefonu"</string> <string name="internal_memory">"Interní paměť telefonu"</string>

2
res/values-de/strings.xml
View File

@@ -417,8 +417,6 @@
<string name="status_wifi_mac_address">"WLAN-MAC-Adresse"</string> <string name="status_wifi_mac_address">"WLAN-MAC-Adresse"</string>
<string name="status_bt_address">"Bluetooth-Adresse"</string> <string name="status_bt_address">"Bluetooth-Adresse"</string>
<string name="status_unavailable">"Nicht verfügbar"</string> <string name="status_unavailable">"Nicht verfügbar"</string>
<string name="status_network_traffic_stats">"Netzwerknutzung"</string>
<string name="status_network_traffic_summary">"Gesendet: \n<xliff:g id="NETWORK_TRAFFIC_0">%1$d packets, %2$d bytes%n</xliff:g>Erhalt: <xliff:g id="NETWORK_TRAFFIC_1">%3$d packets, %4$d bytes</xliff:g>"</string>
<string name="status_up_time">"Betriebszeit"</string> <string name="status_up_time">"Betriebszeit"</string>
<string name="status_awake_time">"Aktivzeit"</string> <string name="status_awake_time">"Aktivzeit"</string>
<string name="internal_memory">"Interner Telefonspeicher"</string> <string name="internal_memory">"Interner Telefonspeicher"</string>

2
res/values-es/strings.xml
View File

@@ -416,8 +416,6 @@
<string name="status_wifi_mac_address">"Dirección MAC de la red Wi-Fi"</string> <string name="status_wifi_mac_address">"Dirección MAC de la red Wi-Fi"</string>
<string name="status_bt_address">"Dirección de Bluetooth"</string> <string name="status_bt_address">"Dirección de Bluetooth"</string>
<string name="status_unavailable">"No disponible"</string> <string name="status_unavailable">"No disponible"</string>
<string name="status_network_traffic_stats">"Uso de red"</string>
<string name="status_network_traffic_summary">"Enviado: <xliff:g id="NETWORK_TRAFFIC_0">%1$d packets, %2$d bytes%n</xliff:g>Recibido: <xliff:g id="NETWORK_TRAFFIC_1">%3$d packets, %4$d bytes</xliff:g>"</string>
<string name="status_up_time">"Tiempo de actividad"</string> <string name="status_up_time">"Tiempo de actividad"</string>
<string name="status_awake_time">"Tiempo de actividad"</string> <string name="status_awake_time">"Tiempo de actividad"</string>
<string name="internal_memory">"Almacenamiento interno del teléfono"</string> <string name="internal_memory">"Almacenamiento interno del teléfono"</string>

2
res/values-fr/strings.xml
View File

@@ -416,8 +416,6 @@
<string name="status_wifi_mac_address">"Adresse MAC Wi-Fi"</string> <string name="status_wifi_mac_address">"Adresse MAC Wi-Fi"</string>
<string name="status_bt_address">"Adresse Bluetooth"</string> <string name="status_bt_address">"Adresse Bluetooth"</string>
<string name="status_unavailable">"Non disponible"</string> <string name="status_unavailable">"Non disponible"</string>
<string name="status_network_traffic_stats">"Utilisation du réseau"</string>
<string name="status_network_traffic_summary">"Envoyés : <xliff:g id="NETWORK_TRAFFIC_0">%1$d packets, %2$d bytes%n</xliff:g> Reçus : <xliff:g id="NETWORK_TRAFFIC_1">%3$d packets, %4$d bytes</xliff:g>"</string>
<string name="status_up_time">"Durée d\'activité"</string> <string name="status_up_time">"Durée d\'activité"</string>
<string name="status_awake_time">"Temps en activité"</string> <string name="status_awake_time">"Temps en activité"</string>
<string name="internal_memory">"Mémoire interne du téléphone"</string> <string name="internal_memory">"Mémoire interne du téléphone"</string>

2
res/values-it/strings.xml
View File

@@ -416,8 +416,6 @@
<string name="status_wifi_mac_address">"Indirizzo MAC Wi-Fi"</string> <string name="status_wifi_mac_address">"Indirizzo MAC Wi-Fi"</string>
<string name="status_bt_address">"Indirizzo Bluetooth"</string> <string name="status_bt_address">"Indirizzo Bluetooth"</string>
<string name="status_unavailable">"Non disponibile"</string> <string name="status_unavailable">"Non disponibile"</string>
<string name="status_network_traffic_stats">"Utilizzo della rete"</string>
<string name="status_network_traffic_summary">"Inviati: <xliff:g id="NETWORK_TRAFFIC_0">%1$d packets, %2$d bytes%n</xliff:g>Ricevuti: <xliff:g id="NETWORK_TRAFFIC_1">%3$d packets, %4$d bytes</xliff:g>"</string>
<string name="status_up_time">"Tempo di attività"</string> <string name="status_up_time">"Tempo di attività"</string>
<string name="status_awake_time">"Tempo di attività"</string> <string name="status_awake_time">"Tempo di attività"</string>
<string name="internal_memory">"Archiviazione interna telefono"</string> <string name="internal_memory">"Archiviazione interna telefono"</string>

2
res/values-ja/strings.xml
View File

@@ -417,8 +417,6 @@
<string name="status_wifi_mac_address">"Wi-Fi MACアドレス"</string> <string name="status_wifi_mac_address">"Wi-Fi MACアドレス"</string>
<string name="status_bt_address">"Bluetoothアドレス"</string> <string name="status_bt_address">"Bluetoothアドレス"</string>
<string name="status_unavailable">"不明"</string> <string name="status_unavailable">"不明"</string>
<string name="status_network_traffic_stats">"ネットワーク使用状況"</string>
<string name="status_network_traffic_summary">"送信: <xliff:g id="NETWORK_TRAFFIC_0">%1$d packets, %2$d bytes%n</xliff:g>受信: <xliff:g id="NETWORK_TRAFFIC_1">%3$d packets, %4$d bytes</xliff:g>"</string>
<string name="status_up_time">"稼働時間"</string> <string name="status_up_time">"稼働時間"</string>
<string name="status_awake_time">"端末使用時間"</string> <string name="status_awake_time">"端末使用時間"</string>
<string name="internal_memory">"端末内部メモリ"</string> <string name="internal_memory">"端末内部メモリ"</string>

2
res/values-ko/strings.xml
View File

@@ -417,8 +417,6 @@
<string name="status_wifi_mac_address">"Wi-Fi MAC 주소"</string> <string name="status_wifi_mac_address">"Wi-Fi MAC 주소"</string>
<string name="status_bt_address">"Bluetooth 주소"</string> <string name="status_bt_address">"Bluetooth 주소"</string>
<string name="status_unavailable">"사용할 수 없음"</string> <string name="status_unavailable">"사용할 수 없음"</string>
<string name="status_network_traffic_stats">"네트워크 사용량"</string>
<string name="status_network_traffic_summary">"전송: <xliff:g id="NETWORK_TRAFFIC_0">%1$d packets, %2$d bytes%n</xliff:g> 수신:<xliff:g id="NETWORK_TRAFFIC_1">%3$d packets, %4$d bytes</xliff:g>"</string>
<string name="status_up_time">"가동 시간"</string> <string name="status_up_time">"가동 시간"</string>
<string name="status_awake_time">"무중단 가동 시간"</string> <string name="status_awake_time">"무중단 가동 시간"</string>
<string name="internal_memory">"전화기 내부 저장공간"</string> <string name="internal_memory">"전화기 내부 저장공간"</string>

2
res/values-nb/strings.xml
View File

@@ -416,8 +416,6 @@
<string name="status_wifi_mac_address">"MAC-adresse for WLAN"</string> <string name="status_wifi_mac_address">"MAC-adresse for WLAN"</string>
<string name="status_bt_address">"Bluetooth-adresse"</string> <string name="status_bt_address">"Bluetooth-adresse"</string>
<string name="status_unavailable">"Ikke tilgjengelig"</string> <string name="status_unavailable">"Ikke tilgjengelig"</string>
<string name="status_network_traffic_stats">"Nettverksbruk"</string>
<string name="status_network_traffic_summary">"Sendt: <xliff:g id="NETWORK_TRAFFIC_0">%1$d packets, %2$d bytes%n</xliff:g>Mottatt: <xliff:g id="NETWORK_TRAFFIC_1">%3$d packets, %4$d bytes</xliff:g>"</string>
<string name="status_up_time">"Oppetid"</string> <string name="status_up_time">"Oppetid"</string>
<string name="status_awake_time">"Våken tid"</string> <string name="status_awake_time">"Våken tid"</string>
<string name="internal_memory">"Intern lagringsplass"</string> <string name="internal_memory">"Intern lagringsplass"</string>

2
res/values-nl/strings.xml
View File

@@ -417,8 +417,6 @@
<string name="status_wifi_mac_address">"Wi-Fi MAC-adres"</string> <string name="status_wifi_mac_address">"Wi-Fi MAC-adres"</string>
<string name="status_bt_address">"Bluetooth-adres"</string> <string name="status_bt_address">"Bluetooth-adres"</string>
<string name="status_unavailable">"Niet beschikbaar"</string> <string name="status_unavailable">"Niet beschikbaar"</string>
<string name="status_network_traffic_stats">"Netwerkgebruik"</string>
<string name="status_network_traffic_summary">"Verzonden: <xliff:g id="NETWORK_TRAFFIC_0">%1$d packets, %2$d bytes%n</xliff:g>Ontvangen: <xliff:g id="NETWORK_TRAFFIC_1">%3$d packets, %4$d bytes</xliff:g>"</string>
<string name="status_up_time">"Bedrijfstijd"</string> <string name="status_up_time">"Bedrijfstijd"</string>
<string name="status_awake_time">"Stand-bytijd"</string> <string name="status_awake_time">"Stand-bytijd"</string>
<string name="internal_memory">"Intern telefoongeheugen"</string> <string name="internal_memory">"Intern telefoongeheugen"</string>

2
res/values-pl/strings.xml
View File

@@ -417,8 +417,6 @@
<string name="status_wifi_mac_address">"Adres MAC karty Wi-Fi"</string> <string name="status_wifi_mac_address">"Adres MAC karty Wi-Fi"</string>
<string name="status_bt_address">"Adres Bluetooth"</string> <string name="status_bt_address">"Adres Bluetooth"</string>
<string name="status_unavailable">"Niedostępny"</string> <string name="status_unavailable">"Niedostępny"</string>
<string name="status_network_traffic_stats">"Wykorzystanie sieci"</string>
<string name="status_network_traffic_summary">"Wysłane: <xliff:g id="NETWORK_TRAFFIC_0">%1$d packets, %2$d bytes%n</xliff:g>Odebrane: <xliff:g id="NETWORK_TRAFFIC_1">%3$d packets, %4$d bytes</xliff:g>"</string>
<string name="status_up_time">"Czas działania"</string> <string name="status_up_time">"Czas działania"</string>
<string name="status_awake_time">"Czas działania (włączony)"</string> <string name="status_awake_time">"Czas działania (włączony)"</string>
<string name="internal_memory">"Pamięć wewnętrzna telefonu"</string> <string name="internal_memory">"Pamięć wewnętrzna telefonu"</string>

2
res/values-ru/strings.xml
View File

@@ -417,8 +417,6 @@
<string name="status_wifi_mac_address">"MAC-адрес Wi-Fi"</string> <string name="status_wifi_mac_address">"MAC-адрес Wi-Fi"</string>
<string name="status_bt_address">"Адрес Bluetooth"</string> <string name="status_bt_address">"Адрес Bluetooth"</string>
<string name="status_unavailable">"Недоступно"</string> <string name="status_unavailable">"Недоступно"</string>
<string name="status_network_traffic_stats">"Использование сети"</string>
<string name="status_network_traffic_summary">"Отправлено: <xliff:g id="NETWORK_TRAFFIC_0">%1$d packets, %2$d bytes%n</xliff:g>Принято: <xliff:g id="NETWORK_TRAFFIC_1">%3$d packets, %4$d bytes</xliff:g>"</string>
<string name="status_up_time">"Время работы"</string> <string name="status_up_time">"Время работы"</string>
<string name="status_awake_time">"Время активности"</string> <string name="status_awake_time">"Время активности"</string>
<string name="internal_memory">"Хранение в памяти телефона"</string> <string name="internal_memory">"Хранение в памяти телефона"</string>

2
res/values-zh-rCN/strings.xml
View File

@@ -417,8 +417,6 @@
<string name="status_wifi_mac_address">"Wi-Fi MAC 地址"</string> <string name="status_wifi_mac_address">"Wi-Fi MAC 地址"</string>
<string name="status_bt_address">"蓝牙地址"</string> <string name="status_bt_address">"蓝牙地址"</string>
<string name="status_unavailable">"不可用"</string> <string name="status_unavailable">"不可用"</string>
<string name="status_network_traffic_stats">"网络使用"</string>
<string name="status_network_traffic_summary">"发送：<xliff:g id="NETWORK_TRAFFIC_0">%1$d packets, %2$d bytes%n</xliff:g> 接收：<xliff:g id="NETWORK_TRAFFIC_1">%3$d packets, %4$d bytes</xliff:g>"</string>
<string name="status_up_time">"正常使用时间"</string> <string name="status_up_time">"正常使用时间"</string>
<string name="status_awake_time">"唤醒时间"</string> <string name="status_awake_time">"唤醒时间"</string>
<string name="internal_memory">"手机内部存储"</string> <string name="internal_memory">"手机内部存储"</string>

2
res/values-zh-rTW/strings.xml
View File

@@ -417,8 +417,6 @@
<string name="status_wifi_mac_address">"Wi-Fi MAC 位址"</string> <string name="status_wifi_mac_address">"Wi-Fi MAC 位址"</string>
<string name="status_bt_address">"藍牙位址"</string> <string name="status_bt_address">"藍牙位址"</string>
<string name="status_unavailable">"無法取得"</string> <string name="status_unavailable">"無法取得"</string>
<string name="status_network_traffic_stats">"網路使用率"</string>
<string name="status_network_traffic_summary">"已傳送：<xliff:g id="NETWORK_TRAFFIC_0">%1$d packets, %2$d bytes%n</xliff:g>已接收：<xliff:g id="NETWORK_TRAFFIC_1">%3$d packets, %4$d bytes</xliff:g>"</string>
<string name="status_up_time">"開機時間"</string> <string name="status_up_time">"開機時間"</string>
<string name="status_awake_time">"清醒時間"</string> <string name="status_awake_time">"清醒時間"</string>
<string name="internal_memory">"手機內部記憶體"</string> <string name="internal_memory">"手機內部記憶體"</string>

8
res/values/strings.xml
View File

@@ -812,9 +812,9 @@
<!-- Sound & display settings screen, animations check box label --> <!-- Sound & display settings screen, animations check box label -->
<string name="animations_title">Animation</string> <string name="animations_title">Animation</string>
<!-- Sound & display settings screen, animations option summary text when check box is selected --> <!-- Sound & display settings screen, animations option summary text when check box is selected -->
<string name="animations_summary_on">Show animation when opening &amp; closing windows</string> <string name="animations_summary_on">Show screen transition animations</string>
<!-- Sound & display settings screen, animations option summary text when check box is clear --> <!-- Sound & display settings screen, animations option summary text when check box is clear -->
<string name="animations_summary_off">Show animation when opening &amp; closing windows</string> <string name="animations_summary_off">Show screen transition animations</string>
<!-- Sound & display settings screen, accelerometer-based rotation check box label --> <!-- Sound & display settings screen, accelerometer-based rotation check box label -->
<string name="accelerometer_title">Orientation</string> <string name="accelerometer_title">Orientation</string>
<!-- Sound & display settings screen, accelerometer-based rotation summary text when check box is selected --> <!-- Sound & display settings screen, accelerometer-based rotation summary text when check box is selected -->
@@ -927,10 +927,6 @@
<string name="status_bt_address">Bluetooth address</string> <string name="status_bt_address">Bluetooth address</string>
<!-- About phone, status item value if the actual value is not available. --> <!-- About phone, status item value if the actual value is not available. -->
<string name="status_unavailable">Unavailable</string> <string name="status_unavailable">Unavailable</string>
<!-- About phone, status item title. How many packets and bytes have been sent and received across all network interfaces. -->
<string name="status_network_traffic_stats">Network usage</string>
<!-- About phone, status item summary. How many packets and bytes have been sent and received across all network interfaces. -->
<string name="status_network_traffic_summary">Sent: <xliff:g id="network_traffic">%1$d packets, %2$d bytes%n</xliff:g>Rcvd: <xliff:g id="network_traffic">%3$d packets, %4$d bytes</xliff:g></string>
<!-- About phone, status item title. How long the device has been running since its last reboot. --> <!-- About phone, status item title. How long the device has been running since its last reboot. -->
<string name="status_up_time">Up time</string> <string name="status_up_time">Up time</string>
<!-- About phone, status item title. How much time the device has had its main CPU awake. --> <!-- About phone, status item title. How much time the device has had its main CPU awake. -->

5
res/xml/device_info_status.xml
View File

@@ -82,11 +82,6 @@
android:title="@string/status_bt_address" android:title="@string/status_bt_address"
android:summary="@string/device_info_not_available" android:summary="@string/device_info_not_available"
android:persistent="false" /> android:persistent="false" />
<Preference android:key="network_traffic_stats"
style="?android:attr/preferenceInformationStyle"
android:title="@string/status_network_traffic_stats"
android:summary="@string/device_info_not_available"
android:persistent="false" />
<Preference android:key="up_time" <Preference android:key="up_time"
style="?android:attr/preferenceInformationStyle" style="?android:attr/preferenceInformationStyle"
android:title="@string/status_up_time" android:title="@string/status_up_time"

9
src/com/android/settings/ChooseLockPattern.java
View File

@@ -481,15 +481,8 @@ public class ChooseLockPattern extends Activity implements View.OnClickListener{
} }
private void saveChosenPatternAndFinish() { private void saveChosenPatternAndFinish() {
boolean patternExistedBefore = mLockPatternUtils.savedPatternExists();
mLockPatternUtils.saveLockPattern(mChosenPattern); mLockPatternUtils.saveLockPattern(mChosenPattern);
mLockPatternUtils.setLockPatternEnabled(true);
// if setting pattern for first time, enable the lock gesture. otherwise,
// keep the user's setting.
if (!patternExistedBefore) {
mLockPatternUtils.setLockPatternEnabled(true);
mLockPatternUtils.setVisiblePatternEnabled(true);
}
setResult(RESULT_FINISHED); setResult(RESULT_FINISHED);
finish(); finish();

2
src/com/android/settings/ChooseLockPatternTutorial.java
View File

@@ -34,7 +34,7 @@ public class ChooseLockPatternTutorial extends Activity implements View.OnClickL
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
// Don't show the tutorial if the user has seen it before. // Don't show the tutorial if the user has seen it before.
LockPatternUtils lockPatternUtils = new LockPatternUtils(getContentResolver()); LockPatternUtils lockPatternUtils = new LockPatternUtils(getContentResolver());
if (savedInstanceState == null && lockPatternUtils.savedPatternExists()) { if (savedInstanceState == null && lockPatternUtils.isPatternEverChosen()) {
Intent intent = new Intent(); Intent intent = new Intent();
intent.setClassName("com.android.settings", "com.android.settings.ChooseLockPattern"); intent.setClassName("com.android.settings", "com.android.settings.ChooseLockPattern");
startActivity(intent); startActivity(intent);

5
src/com/android/settings/DateTimeSettings.java
View File

@@ -171,7 +171,10 @@ public class DateTimeSettings
SystemClock.setCurrentTimeMillis(when); SystemClock.setCurrentTimeMillis(when);
} }
updateTimeAndDateDisplay(); updateTimeAndDateDisplay();
timeUpdated();
// We don't need to call timeUpdated() here because the TIME_CHANGED
// broadcast is sent by the AlarmManager as a side effect of setting the
// SystemClock time.
} }
public void onSharedPreferenceChanged(SharedPreferences preferences, String key) { public void onSharedPreferenceChanged(SharedPreferences preferences, String key) {

2
src/com/android/settings/LauncherAppWidgetBinder.java
View File

@@ -53,7 +53,7 @@ public class LauncherAppWidgetBinder extends Activity {
static final Uri CONTENT_URI = Uri.parse("content://" + AUTHORITY + "/" + TABLE_FAVORITES); static final Uri CONTENT_URI = Uri.parse("content://" + AUTHORITY + "/" + TABLE_FAVORITES);
static final String ITEM_TYPE = "itemType"; static final String ITEM_TYPE = "itemType";
static final String APPWIDGET_ID = "gadgetId"; static final String APPWIDGET_ID = "appWidgetId";
static final String ICON = "icon"; static final String ICON = "icon";
static final int ITEM_TYPE_APPWIDGET = 4; static final int ITEM_TYPE_APPWIDGET = 4;

133
src/com/android/settings/ManageApplications.java
View File

@@ -248,6 +248,38 @@ public class ManageApplications extends ListActivity implements
switch (msg.what) { switch (msg.what) {
case INIT_PKG_INFO: case INIT_PKG_INFO:
if(localLOGV) Log.i(TAG, "Message INIT_PKG_INFO"); if(localLOGV) Log.i(TAG, "Message INIT_PKG_INFO");
if (!mJustCreated) {
// Add or delete newly created packages by comparing lists
List<ApplicationInfo> newList = getInstalledApps(FILTER_APPS_ALL);
int oldCount = mAppPropCache.size();
boolean idxArr[] = new boolean[oldCount];
for ( int i = 0; i < oldCount; i++) {
idxArr[i] = false;
}
if (newList != null) {
for (ApplicationInfo app : newList) {
AppInfo aInfo = mAppPropCache.get(app.packageName);
if ( aInfo == null) {
// New package. post an ADD_PKG message
if(localLOGV) Log.i(TAG, "Adding pkg: "+app.packageName);
updatePackageList(Intent.ACTION_PACKAGE_ADDED, app.packageName);
} else {
idxArr[aInfo.index] = true;
}
}
Set<String> keyList = mAppPropCache.keySet();
for (String key : keyList) {
AppInfo aInfo = mAppPropCache.get(key);
int idx = aInfo.index;
if (!idxArr[idx]) {
String pkg = aInfo.pkgName;
if(localLOGV) Log.i(TAG, "Deleting pkg: " + pkg);
updatePackageList(Intent.ACTION_PACKAGE_REMOVED, pkg);
}
}
}
}
// Retrieve the package list and init some structures // Retrieve the package list and init some structures
initAppList(mFilterApps); initAppList(mFilterApps);
mHandler.sendEmptyMessage(NEXT_LOAD_STEP); mHandler.sendEmptyMessage(NEXT_LOAD_STEP);
@@ -499,12 +531,18 @@ public class ManageApplications extends ListActivity implements
// some initialization code used when kicking off the size computation // some initialization code used when kicking off the size computation
private void initAppList(int filterOption) { private void initAppList(int filterOption) {
// Initialize lists
List<ApplicationInfo> appList = getInstalledApps(filterOption);
initAppList(appList, filterOption);
}
// some initialization code used when kicking off the size computation
private void initAppList(List<ApplicationInfo> appList, int filterOption) {
setProgressBarIndeterminateVisibility(true); setProgressBarIndeterminateVisibility(true);
mComputeIndex = 0; mComputeIndex = 0;
mComputeSizes = false; mComputeSizes = false;
mLoadLabels = false; mLoadLabels = false;
// Initialize lists // Initialize lists
List<ApplicationInfo> appList = getInstalledApps(filterOption);
mAddRemoveMap = new TreeMap<String, Boolean>(); mAddRemoveMap = new TreeMap<String, Boolean>();
mAppInfoAdapter.resetAppList(filterOption, appList); mAppInfoAdapter.resetAppList(filterOption, appList);
} }
@@ -860,11 +898,18 @@ public class ManageApplications extends ListActivity implements
} }
return mSizeComparator; return mSizeComparator;
} }
public void updateAppsResourceInfo(Map<String, AppInfo> iconMap) { /*
* This method updates resource information in the package map.
*
* @param iconMap a map of package names and attributes
* @return A boolean value to indicate if the property map has to be
* refreshed completely
*/
public boolean updateAppsResourceInfo(Map<String, AppInfo> iconMap) {
if(iconMap == null) { if(iconMap == null) {
Log.w(TAG, "Null iconMap when refreshing icon in List Adapter"); Log.w(TAG, "Null iconMap when refreshing icon in List Adapter");
return; return true;
} }
boolean changed = false; boolean changed = false;
for (ApplicationInfo info : mAppLocalList) { for (ApplicationInfo info : mAppLocalList) {
@@ -874,7 +919,7 @@ public class ManageApplications extends ListActivity implements
if (aInfo != null) { if (aInfo != null) {
aInfo.refreshIcon(pInfo); aInfo.refreshIcon(pInfo);
} else { } else {
mAppPropMap.put(info.packageName, pInfo); return false;
} }
changed = true; changed = true;
} }
@@ -882,14 +927,56 @@ public class ManageApplications extends ListActivity implements
if(changed) { if(changed) {
notifyDataSetChanged(); notifyDataSetChanged();
} }
return true;
} }
private boolean shouldBeInList(int filterOption, ApplicationInfo info) {
// Match filter here
boolean addToCurrList = false;
if (filterOption == FILTER_APPS_RUNNING) {
List<ApplicationInfo> runningList = getInstalledApps(FILTER_APPS_RUNNING);
for (ApplicationInfo running : runningList) {
if (running.packageName.equalsIgnoreCase(info.packageName)) {
addToCurrList = true;
break;
}
}
} else if (filterOption == FILTER_APPS_THIRD_PARTY) {
if ((info.flags & ApplicationInfo.FLAG_SYSTEM) == 0) {
addToCurrList = true;
} else if ((info.flags & ApplicationInfo.FLAG_UPDATED_SYSTEM_APP) != 0) {
addToCurrList = true;
}
} else {
return true;
}
return addToCurrList;
}
/*
* Add a package to the current list.
* The package is only added to the displayed list
* based on the filter value. The package is always added to the property map.
* @param pkgName name of package to be added
* @param ps PackageStats of new package
*/
public void addToList(String pkgName, PackageStats ps) { public void addToList(String pkgName, PackageStats ps) {
if(pkgName == null) { if(pkgName == null) {
Log.w(TAG, "Adding null pkg to List Adapter"); Log.w(TAG, "Adding null pkg to List Adapter");
return; return;
} }
ApplicationInfo info; boolean notInList = true;
int newIdx = getIndex(pkgName);
if (newIdx != -1) {
notInList = false;
if (mAppPropMap.get(pkgName) != null) {
// weird. just ignore entry
Log.i(TAG, "Package:"+pkgName+" already added");
return;
}
}
// Get ApplicationInfo
ApplicationInfo info = null;
try { try {
info = mPm.getApplicationInfo(pkgName, 0); info = mPm.getApplicationInfo(pkgName, 0);
} catch (NameNotFoundException e) { } catch (NameNotFoundException e) {
@@ -901,21 +988,26 @@ public class ManageApplications extends ListActivity implements
Log.i(TAG, "Null ApplicationInfo for package:"+pkgName); Log.i(TAG, "Null ApplicationInfo for package:"+pkgName);
return; return;
} }
// Binary search returns a negative index (ie --index) of the position where // Add entry to map
// this might be inserted. mAppPropMap.put(pkgName, new AppInfo(pkgName, newIdx,
int newIdx = Collections.binarySearch(mAppLocalList, info,
getAppComparator(mSortOrder));
if(newIdx >= 0) {
Log.i(TAG, "Strange. Package:"+pkgName+" is not new");
return;
}
// New entry
newIdx = -newIdx-1;
mAppLocalList.add(newIdx, info);
mAppPropMap.put(info.packageName, new AppInfo(pkgName, newIdx,
info.loadLabel(mPm), info.loadIcon(mPm), ps)); info.loadLabel(mPm), info.loadIcon(mPm), ps));
adjustIndex(); // Add to list
notifyDataSetChanged(); if (notInList && (shouldBeInList(mFilterApps, info))) {
// Binary search returns a negative index (ie -index) of the position where
// this might be inserted.
newIdx = Collections.binarySearch(mAppLocalList, info,
getAppComparator(mSortOrder));
if(newIdx >= 0) {
Log.i(TAG, "Strange. Package:"+pkgName+" is not new");
return;
}
// New entry
newIdx = -newIdx-1;
mAppLocalList.add(newIdx, info);
// Adjust index
adjustIndex();
notifyDataSetChanged();
}
} }
public void removeFromList(List<String> pkgNames) { public void removeFromList(List<String> pkgNames) {
@@ -1134,7 +1226,6 @@ public class ManageApplications extends ListActivity implements
List<ApplicationInfo> appList = getInstalledApps(mSortOrder); List<ApplicationInfo> appList = getInstalledApps(mSortOrder);
mAppInfoAdapter = new AppInfoAdapter(this, appList); mAppInfoAdapter = new AppInfoAdapter(this, appList);
ListView lv= (ListView) findViewById(android.R.id.list); ListView lv= (ListView) findViewById(android.R.id.list);
//lv.setAdapter(mAppInfoAdapter);
lv.setOnItemClickListener(this); lv.setOnItemClickListener(this);
lv.setSaveEnabled(true); lv.setSaveEnabled(true);
lv.setItemsCanFocus(true); lv.setItemsCanFocus(true);

30
src/com/android/settings/SecuritySettings.java
View File

@@ -45,8 +45,7 @@ public class SecuritySettings extends PreferenceActivity
private static final String KEY_LOCK_ENABLED = "lockenabled"; private static final String KEY_LOCK_ENABLED = "lockenabled";
private static final String KEY_VISIBLE_PATTERN = "visiblepattern"; private static final String KEY_VISIBLE_PATTERN = "visiblepattern";
private static final String KEY_TACTILE_FEEDBACK_ENABLED = "tactilefeedback"; private static final String KEY_TACTILE_FEEDBACK_ENABLED = "tactilefeedback";
private static final int CONFIRM_PATTERN_THEN_DISABLE_REQUEST_CODE = 55; private static final int CONFIRM_PATTERN_THEN_DISABLE_AND_CLEAR_REQUEST_CODE = 55;
private static final int CONFIRM_PATTERN_THEN_ENABLE_REQUEST_CODE = 56;
private LockPatternUtils mLockPatternUtils; private LockPatternUtils mLockPatternUtils;
private CheckBoxPreference mLockEnabled; private CheckBoxPreference mLockEnabled;
@@ -64,7 +63,7 @@ public class SecuritySettings extends PreferenceActivity
private CheckBoxPreference mNetwork; private CheckBoxPreference mNetwork;
private CheckBoxPreference mGps; private CheckBoxPreference mGps;
private LocationManager mLocationManager; private LocationManager mLocationManager;
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
@@ -257,36 +256,26 @@ public class SecuritySettings extends PreferenceActivity
@Override @Override
protected void onClick() { protected void onClick() {
if (mLockPatternUtils.savedPatternExists()) { if (mLockPatternUtils.savedPatternExists() && isChecked()) {
if (isChecked()) { confirmPatternThenDisableAndClear();
confirmPatternThenDisable();
} else {
confirmPatternThenEnable();
}
} else { } else {
super.onClick(); super.onClick();
} }
} }
} }
private void confirmPatternThenEnable() {
final Intent intent = new Intent();
intent.setClassName("com.android.settings", "com.android.settings.ConfirmLockPattern");
startActivityForResult(intent, CONFIRM_PATTERN_THEN_ENABLE_REQUEST_CODE);
}
/** /**
* Launch screen to confirm the existing lock pattern. * Launch screen to confirm the existing lock pattern.
* @see #onActivityResult(int, int, android.content.Intent) * @see #onActivityResult(int, int, android.content.Intent)
*/ */
private void confirmPatternThenDisable() { private void confirmPatternThenDisableAndClear() {
final Intent intent = new Intent(); final Intent intent = new Intent();
intent.setClassName("com.android.settings", "com.android.settings.ConfirmLockPattern"); intent.setClassName("com.android.settings", "com.android.settings.ConfirmLockPattern");
startActivityForResult(intent, CONFIRM_PATTERN_THEN_DISABLE_REQUEST_CODE); startActivityForResult(intent, CONFIRM_PATTERN_THEN_DISABLE_AND_CLEAR_REQUEST_CODE);
} }
/** /**
* @see #confirmPatternThenDisable * @see #confirmPatternThenDisableAndClear
*/ */
@Override @Override
protected void onActivityResult(int requestCode, int resultCode, protected void onActivityResult(int requestCode, int resultCode,
@@ -295,10 +284,9 @@ public class SecuritySettings extends PreferenceActivity
final boolean resultOk = resultCode == Activity.RESULT_OK; final boolean resultOk = resultCode == Activity.RESULT_OK;
if ((requestCode == CONFIRM_PATTERN_THEN_DISABLE_REQUEST_CODE) && resultOk) { if ((requestCode == CONFIRM_PATTERN_THEN_DISABLE_AND_CLEAR_REQUEST_CODE) && resultOk) {
mLockPatternUtils.setLockPatternEnabled(false); mLockPatternUtils.setLockPatternEnabled(false);
} else if ((requestCode == CONFIRM_PATTERN_THEN_ENABLE_REQUEST_CODE) && resultOk) { mLockPatternUtils.saveLockPattern(null);
mLockPatternUtils.setLockPatternEnabled(true);
} }
} }
} }

10
src/com/android/settings/SoundAndDisplaySettings.java
View File

@@ -168,7 +168,9 @@ public class SoundAndDisplaySettings extends PreferenceActivity implements
} catch (RemoteException e) { } catch (RemoteException e) {
} }
if (mAnimationScales != null) { if (mAnimationScales != null) {
for (int i=0; i<mAnimationScales.length; i++) { // We will leave the window animations alone (always set),
// and only use this to change the transition animations.
for (int i=1; i<mAnimationScales.length; i++) {
if (mAnimationScales[i] == 0) { if (mAnimationScales[i] == 0) {
animations = false; animations = false;
break; break;
@@ -224,7 +226,11 @@ public class SoundAndDisplaySettings extends PreferenceActivity implements
mSoundEffects.isChecked() ? 1 : 0); mSoundEffects.isChecked() ? 1 : 0);
} else if (preference == mAnimations) { } else if (preference == mAnimations) {
for (int i=0; i<mAnimationScales.length; i++) { if (mAnimationScales.length > 0) {
// Window animations are always on.
mAnimationScales[0] = 1;
}
for (int i=1; i<mAnimationScales.length; i++) {
mAnimationScales[i] = mAnimations.isChecked() ? 1 : 0; mAnimationScales[i] = mAnimations.isChecked() ? 1 : 0;
} }
try { try {

5
src/com/android/settings/bluetooth/BluetoothPinDialog.java
View File

@@ -46,6 +46,7 @@ public class BluetoothPinDialog extends AlertActivity implements DialogInterface
TextWatcher { TextWatcher {
private static final String TAG = "BluetoothPinDialog"; private static final String TAG = "BluetoothPinDialog";
private final int BLUETOOTH_PIN_MAX_LENGTH = 16;
private LocalBluetoothManager mLocalManager; private LocalBluetoothManager mLocalManager;
private String mAddress; private String mAddress;
private EditText mPinView; private EditText mPinView;
@@ -138,8 +139,8 @@ public class BluetoothPinDialog extends AlertActivity implements DialogInterface
mPinView = (EditText) view.findViewById(R.id.text); mPinView = (EditText) view.findViewById(R.id.text);
mPinView.addTextChangedListener(this); mPinView.addTextChangedListener(this);
// Maximum of 10 characters in a PIN // Maximum of 16 characters in a PIN
mPinView.setFilters(new InputFilter[] { new LengthFilter(10) }); mPinView.setFilters(new InputFilter[] { new LengthFilter(BLUETOOTH_PIN_MAX_LENGTH) });
return view; return view;
} }

14
src/com/android/settings/deviceinfo/Status.java
View File

@@ -30,7 +30,6 @@ import android.os.Handler;
import android.os.Message; import android.os.Message;
import android.os.SystemClock; import android.os.SystemClock;
import android.os.SystemProperties; import android.os.SystemProperties;
import android.os.NetStat;
import android.preference.Preference; import android.preference.Preference;
import android.preference.PreferenceActivity; import android.preference.PreferenceActivity;
import android.telephony.PhoneStateListener; import android.telephony.PhoneStateListener;
@@ -64,7 +63,6 @@ public class Status extends PreferenceActivity {
private static final String KEY_WIFI_MAC_ADDRESS = "wifi_mac_address"; private static final String KEY_WIFI_MAC_ADDRESS = "wifi_mac_address";
private static final String KEY_BT_ADDRESS = "bt_address"; private static final String KEY_BT_ADDRESS = "bt_address";
private static final String KEY_NETWORK_TRAFFIC_STATS = "network_traffic_stats";
private static final int EVENT_SIGNAL_STRENGTH_CHANGED = 200; private static final int EVENT_SIGNAL_STRENGTH_CHANGED = 200;
private static final int EVENT_SERVICE_STATE_CHANGED = 300; private static final int EVENT_SERVICE_STATE_CHANGED = 300;
@@ -111,7 +109,6 @@ public class Status extends PreferenceActivity {
case EVENT_UPDATE_STATS: case EVENT_UPDATE_STATS:
status.updateTimes(); status.updateTimes();
status.setNetworkTrafficStats();
sendEmptyMessageDelayed(EVENT_UPDATE_STATS, 1000); sendEmptyMessageDelayed(EVENT_UPDATE_STATS, 1000);
break; break;
} }
@@ -350,17 +347,6 @@ public class Status extends PreferenceActivity {
} }
} }
private void setNetworkTrafficStats() {
long txPkts = NetStat.getTotalTxPkts();
long txBytes = NetStat.getTotalTxBytes();
long rxPkts = NetStat.getTotalRxPkts();
long rxBytes = NetStat.getTotalRxBytes();
Preference netStatsPref = findPreference(KEY_NETWORK_TRAFFIC_STATS);
netStatsPref.setSummary(getString(R.string.status_network_traffic_summary,
txPkts, txBytes, rxPkts, rxBytes));
}
void updateTimes() { void updateTimes() {
long at = SystemClock.uptimeMillis() / 1000; long at = SystemClock.uptimeMillis() / 1000;
long ut = SystemClock.elapsedRealtime() / 1000; long ut = SystemClock.elapsedRealtime() / 1000;

66
src/com/android/settings/wifi/AccessPointState.java
View File

@@ -47,24 +47,7 @@ public final class AccessPointState implements Comparable<AccessPointState>, Par
private static final String ADHOC_CAPABILITY = "[IBSS]"; private static final String ADHOC_CAPABILITY = "[IBSS]";
/** String present in capabilities if the scan result is enterprise secured */ /** String present in capabilities if the scan result is enterprise secured */
private static final String ENTERPRISE_CAPABILITY = "-EAP-"; private static final String ENTERPRISE_CAPABILITY = "-EAP-";
// Localized strings for different security types
private static String LOCALIZED_WPA2;
private static String LOCALIZED_WPA;
private static String LOCALIZED_WEP;
private static String LOCALIZED_OPEN;
private static String LOCALIZED_UNKNOWN;
private static String LOCALIZED_VERBOSE_WPA2;
private static String LOCALIZED_VERBOSE_WPA;
private static String LOCALIZED_VERBOSE_WEP;
private static String LOCALIZED_VERBOSE_OPEN;
// Localized strings for various messages
private static String SUMMARY_NOT_IN_RANGE;
private static String SUMMARY_REMEMBERED;
private static String SUMMARY_CONNECTION_FAILED;
public static final String BSSID_ANY = "any"; public static final String BSSID_ANY = "any";
public static final int NETWORK_ID_NOT_SET = -1; public static final int NETWORK_ID_NOT_SET = -1;
/** This should be used with care! */ /** This should be used with care! */
@@ -147,31 +130,8 @@ public final class AccessPointState implements Comparable<AccessPointState>, Par
void setContext(Context context) { void setContext(Context context) {
mContext = context; mContext = context;
setStrings();
} }
private void setStrings() {
final Context c = mContext;
if (SUMMARY_NOT_IN_RANGE == null && c != null) {
SUMMARY_NOT_IN_RANGE = c.getString(R.string.summary_not_in_range);
SUMMARY_REMEMBERED = c.getString(R.string.summary_remembered);
SUMMARY_CONNECTION_FAILED = c.getString(R.string.summary_connection_failed);
LOCALIZED_OPEN = c.getString(R.string.wifi_security_open);
LOCALIZED_WEP = c.getString(R.string.wifi_security_wep);
LOCALIZED_WPA = c.getString(R.string.wifi_security_wpa);
LOCALIZED_WPA2 = c.getString(R.string.wifi_security_wpa2);
LOCALIZED_VERBOSE_OPEN = c.getString(R.string.wifi_security_verbose_open);
LOCALIZED_VERBOSE_WEP = c.getString(R.string.wifi_security_verbose_wep);
LOCALIZED_VERBOSE_WPA = c.getString(R.string.wifi_security_verbose_wpa);
LOCALIZED_VERBOSE_WPA2 = c.getString(R.string.wifi_security_verbose_wpa2);
LOCALIZED_UNKNOWN = c.getString(R.string.wifi_security_unknown);
}
}
public void setNetworkId(int networkId) { public void setNetworkId(int networkId) {
this.networkId = networkId; this.networkId = networkId;
} }
@@ -311,12 +271,12 @@ public final class AccessPointState implements Comparable<AccessPointState>, Par
} }
public String getHumanReadableSecurity() { public String getHumanReadableSecurity() {
if (security.equals(OPEN)) return LOCALIZED_OPEN; if (security.equals(OPEN)) return mContext.getString(R.string.wifi_security_open);
else if (security.equals(WEP)) return LOCALIZED_WEP; else if (security.equals(WEP)) return mContext.getString(R.string.wifi_security_wep);
else if (security.equals(WPA)) return LOCALIZED_WPA; else if (security.equals(WPA)) return mContext.getString(R.string.wifi_security_wpa);
else if (security.equals(WPA2)) return LOCALIZED_WPA2; else if (security.equals(WPA2)) return mContext.getString(R.string.wifi_security_wpa2);
return LOCALIZED_UNKNOWN; return mContext.getString(R.string.wifi_security_unknown);
} }
public void updateFromScanResult(ScanResult scanResult) { public void updateFromScanResult(ScanResult scanResult) {
@@ -719,22 +679,22 @@ public final class AccessPointState implements Comparable<AccessPointState>, Par
buildSummary(sb, WifiStatus.getPrintable(mContext, status), true); buildSummary(sb, WifiStatus.getPrintable(mContext, status), true);
} else if (!seen) { } else if (!seen) {
buildSummary(sb, SUMMARY_NOT_IN_RANGE, true); buildSummary(sb, mContext.getString(R.string.summary_not_in_range), true);
// Remembered comes second in this case // Remembered comes second in this case
if (!primary && configured) { if (!primary && configured) {
buildSummary(sb, SUMMARY_REMEMBERED, true); buildSummary(sb, mContext.getString(R.string.summary_remembered), true);
} }
} else { } else {
if (configured && disabled) { if (configured && disabled) {
// The connection failure overrides all in this case // The connection failure overrides all in this case
return SUMMARY_CONNECTION_FAILED; return mContext.getString(R.string.summary_connection_failed);
} }
// Remembered comes first in this case // Remembered comes first in this case
if (!primary && configured) { if (!primary && configured) {
buildSummary(sb, SUMMARY_REMEMBERED, true); buildSummary(sb, mContext.getString(R.string.summary_remembered), true);
} }
// If it is seen (and not the primary), show the security type // If it is seen (and not the primary), show the security type
@@ -749,13 +709,13 @@ public final class AccessPointState implements Comparable<AccessPointState>, Par
private String getVerboseSecurity() { private String getVerboseSecurity() {
if (WEP.equals(security)) { if (WEP.equals(security)) {
return LOCALIZED_VERBOSE_WEP; return mContext.getString(R.string.wifi_security_verbose_wep);
} else if (WPA.equals(security)) { } else if (WPA.equals(security)) {
return LOCALIZED_VERBOSE_WPA; return mContext.getString(R.string.wifi_security_verbose_wpa);
} else if (WPA2.equals(security)) { } else if (WPA2.equals(security)) {
return LOCALIZED_VERBOSE_WPA2; return mContext.getString(R.string.wifi_security_verbose_wpa2);
} else if (OPEN.equals(security)) { } else if (OPEN.equals(security)) {
return LOCALIZED_VERBOSE_OPEN; return mContext.getString(R.string.wifi_security_verbose_open);
} else { } else {
return null; return null;
} }

82
src/com/android/settings/wifi/WifiStatus.java
View File

@@ -20,51 +20,9 @@ import com.android.settings.R;
import android.content.Context; import android.content.Context;
import android.net.NetworkInfo; import android.net.NetworkInfo;
import android.net.wifi.WifiInfo;
import android.text.TextUtils; import android.text.TextUtils;
public class WifiStatus { public class WifiStatus {
// e.g., "Connecting"
public static String sScanning;
public static String sConnecting;
public static String sAuthenticating;
public static String sObtainingIp;
public static String sConnected;
public static String sDisconnecting;
public static String sDisconnected;
public static String sFailed;
// e.g., "Connecting to %1$s"
public static String sScanningFragment;
public static String sConnectingFragment;
public static String sAuthenticatingFragment;
public static String sObtainingIpFragment;
public static String sConnectedFragment;
public static String sDisconnectingFragment;
public static String sDisconnectedFragment;
public static String sFailedFragment;
private static void fillStrings(Context context) {
sScanning = context.getString(R.string.status_scanning);
sConnecting = context.getString(R.string.status_connecting);
sAuthenticating = context.getString(R.string.status_authenticating);
sObtainingIp = context.getString(R.string.status_obtaining_ip);
sConnected = context.getString(R.string.status_connected);
sDisconnecting = context.getString(R.string.status_disconnecting);
sDisconnected = context.getString(R.string.status_disconnected);
sFailed = context.getString(R.string.status_failed);
sScanningFragment = context.getString(R.string.fragment_status_scanning);
sConnectingFragment = context.getString(R.string.fragment_status_connecting);
sAuthenticatingFragment = context.getString(R.string.fragment_status_authenticating);
sObtainingIpFragment = context.getString(R.string.fragment_status_obtaining_ip);
sConnectedFragment = context.getString(R.string.fragment_status_connected);
sDisconnectingFragment = context.getString(R.string.fragment_status_disconnecting);
sDisconnectedFragment = context.getString(R.string.fragment_status_disconnected);
sFailedFragment = context.getString(R.string.fragment_status_failed);
}
public static String getStatus(Context context, String ssid, public static String getStatus(Context context, String ssid,
NetworkInfo.DetailedState detailedState) { NetworkInfo.DetailedState detailedState) {
@@ -85,27 +43,23 @@ public class WifiStatus {
public static String getPrintable(Context context, public static String getPrintable(Context context,
NetworkInfo.DetailedState detailedState) { NetworkInfo.DetailedState detailedState) {
if (sScanning == null) {
fillStrings(context);
}
switch (detailedState) { switch (detailedState) {
case AUTHENTICATING: case AUTHENTICATING:
return sAuthenticating; return context.getString(R.string.status_authenticating);
case CONNECTED: case CONNECTED:
return sConnected; return context.getString(R.string.status_connected);
case CONNECTING: case CONNECTING:
return sConnecting; return context.getString(R.string.status_connecting);
case DISCONNECTED: case DISCONNECTED:
return sDisconnected; return context.getString(R.string.status_disconnected);
case DISCONNECTING: case DISCONNECTING:
return sDisconnecting; return context.getString(R.string.status_disconnecting);
case FAILED: case FAILED:
return sFailed; return context.getString(R.string.status_failed);
case OBTAINING_IPADDR: case OBTAINING_IPADDR:
return sObtainingIp; return context.getString(R.string.status_obtaining_ip);
case SCANNING: case SCANNING:
return sScanning; return context.getString(R.string.status_scanning);
default: default:
return null; return null;
} }
@@ -114,35 +68,31 @@ public class WifiStatus {
public static String getPrintableFragment(Context context, public static String getPrintableFragment(Context context,
NetworkInfo.DetailedState detailedState, String apName) { NetworkInfo.DetailedState detailedState, String apName) {
if (sScanningFragment == null) {
fillStrings(context);
}
String fragment = null; String fragment = null;
switch (detailedState) { switch (detailedState) {
case AUTHENTICATING: case AUTHENTICATING:
fragment = sAuthenticatingFragment; fragment = context.getString(R.string.fragment_status_authenticating);
break; break;
case CONNECTED: case CONNECTED:
fragment = sConnectedFragment; fragment = context.getString(R.string.fragment_status_connected);
break; break;
case CONNECTING: case CONNECTING:
fragment = sConnectingFragment; fragment = context.getString(R.string.fragment_status_connecting);
break; break;
case DISCONNECTED: case DISCONNECTED:
fragment = sDisconnectedFragment; fragment = context.getString(R.string.fragment_status_disconnected);
break; break;
case DISCONNECTING: case DISCONNECTING:
fragment = sDisconnectingFragment; fragment = context.getString(R.string.fragment_status_disconnecting);
break; break;
case FAILED: case FAILED:
fragment = sFailedFragment; fragment = context.getString(R.string.fragment_status_failed);
break; break;
case OBTAINING_IPADDR: case OBTAINING_IPADDR:
fragment = sObtainingIpFragment; fragment = context.getString(R.string.fragment_status_obtaining_ip);
break; break;
case SCANNING: case SCANNING:
fragment = sScanningFragment; fragment = context.getString(R.string.fragment_status_scanning);
break; break;
} }