Merge "Add "unaccounted" item to battery use UI."
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 7b17d6d..6a19474 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -206,10 +206,6 @@
android:value="com.android.settings.wifi.AdvancedWifiSettings" />
<meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
android:resource="@id/wifi_settings" />
- <meta-data android:name="com.android.settings.PARENT_FRAGMENT_TITLE"
- android:resource="@string/wifi_settings" />
- <meta-data android:name="com.android.settings.PARENT_FRAGMENT_CLASS"
- android:value="com.android.settings.Settings$WifiSettingsActivity" />
</activity>
<activity android:name=".wifi.WifiInfo"
@@ -331,10 +327,6 @@
android:value="com.android.settings.TetherSettings" />
<meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
android:resource="@id/wireless_settings" />
- <meta-data android:name="com.android.settings.PARENT_FRAGMENT_TITLE"
- android:resource="@string/wireless_networks_settings_title" />
- <meta-data android:name="com.android.settings.PARENT_FRAGMENT_CLASS"
- android:value="com.android.settings.Settings$WirelessSettingsActivity" />
</activity>
<!-- Keep compatibility with old shortcuts. -->
@@ -347,10 +339,6 @@
android:value="com.android.settings.TetherSettings" />
<meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
android:resource="@id/wireless_settings" />
- <meta-data android:name="com.android.settings.PARENT_FRAGMENT_TITLE"
- android:resource="@string/wireless_networks_settings_title" />
- <meta-data android:name="com.android.settings.PARENT_FRAGMENT_CLASS"
- android:value="com.android.settings.Settings$WirelessSettingsActivity" />
</activity-alias>
<activity android:name="Settings$WifiP2pSettingsActivity"
@@ -366,10 +354,6 @@
android:value="com.android.settings.wifi.p2p.WifiP2pSettings" />
<meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
android:resource="@id/wireless_settings" />
- <meta-data android:name="com.android.settings.PARENT_FRAGMENT_TITLE"
- android:resource="@string/wireless_networks_settings_title" />
- <meta-data android:name="com.android.settings.PARENT_FRAGMENT_CLASS"
- android:value="com.android.settings.Settings$WirelessSettingsActivity" />
</activity>
@@ -388,10 +372,6 @@
android:value="com.android.settings.vpn2.VpnSettings" />
<meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
android:resource="@id/wireless_settings" />
- <meta-data android:name="com.android.settings.PARENT_FRAGMENT_TITLE"
- android:resource="@string/wireless_networks_settings_title" />
- <meta-data android:name="com.android.settings.PARENT_FRAGMENT_CLASS"
- android:value="com.android.settings.Settings$WirelessSettingsActivity" />
</activity>
<activity android:name="Settings$DateTimeSettingsActivity"
@@ -490,10 +470,6 @@
android:value="com.android.settings.inputmethod.SpellCheckersSettings" />
<meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
android:resource="@id/language_settings" />
- <meta-data android:name="com.android.settings.PARENT_FRAGMENT_TITLE"
- android:resource="@string/language_keyboard_settings_title" />
- <meta-data android:name="com.android.settings.PARENT_FRAGMENT_CLASS"
- android:value="com.android.settings.Settings$InputMethodAndLanguageSettingsActivity" />
</activity>
<activity android:name=".inputmethod.InputMethodAndSubtypeEnablerActivity"
@@ -528,10 +504,6 @@
android:value="com.android.settings.inputmethod.UserDictionaryList" />
<meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
android:resource="@id/language_settings" />
- <meta-data android:name="com.android.settings.PARENT_FRAGMENT_TITLE"
- android:resource="@string/language_keyboard_settings_title" />
- <meta-data android:name="com.android.settings.PARENT_FRAGMENT_CLASS"
- android:value="com.android.settings.Settings$InputMethodAndLanguageSettingsActivity" />
</activity>
<activity android:name=".inputmethod.UserDictionaryAddWordActivity"
@@ -557,10 +529,6 @@
android:value="com.android.settings.UserDictionarySettings" />
<meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
android:resource="@id/language_settings" />
- <meta-data android:name="com.android.settings.PARENT_FRAGMENT_TITLE"
- android:resource="@string/language_keyboard_settings_title" />
- <meta-data android:name="com.android.settings.PARENT_FRAGMENT_CLASS"
- android:value="com.android.settings.Settings$InputMethodAndLanguageSettingsActivity" />
</activity-alias>
<activity android:name="Settings$SoundSettingsActivity"
@@ -944,10 +912,6 @@
android:value="com.android.settings.DeviceAdminSettings" />
<meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
android:resource="@id/security_settings" />
- <meta-data android:name="com.android.settings.PARENT_FRAGMENT_TITLE"
- android:resource="@string/security_settings_title" />
- <meta-data android:name="com.android.settings.PARENT_FRAGMENT_CLASS"
- android:value="com.android.settings.Settings$SecuritySettingsActivity" />
</activity>
<!-- Keep compatibility with old shortcuts. -->
@@ -959,10 +923,6 @@
android:value="com.android.settings.DeviceAdminSettings" />
<meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
android:resource="@id/security_settings" />
- <meta-data android:name="com.android.settings.PARENT_FRAGMENT_TITLE"
- android:resource="@string/security_settings_title" />
- <meta-data android:name="com.android.settings.PARENT_FRAGMENT_CLASS"
- android:value="com.android.settings.Settings$SecuritySettingsActivity" />
</activity-alias>
<activity android:name="DeviceAdminAdd"
@@ -1253,10 +1213,6 @@
android:value="com.android.settings.deviceinfo.UsbSettings" />
<meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
android:resource="@id/storage_settings" />
- <meta-data android:name="com.android.settings.PARENT_FRAGMENT_TITLE"
- android:resource="@string/storage_settings_title" />
- <meta-data android:name="com.android.settings.PARENT_FRAGMENT_CLASS"
- android:value="com.android.settings.Settings$StorageSettingsActivity" />
</activity>
<!-- Keep compatibility with old shortcuts. -->
@@ -1268,10 +1224,6 @@
android:value="com.android.settings.deviceinfo.UsbSettings" />
<meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
android:resource="@id/storage_settings" />
- <meta-data android:name="com.android.settings.PARENT_FRAGMENT_TITLE"
- android:resource="@string/storage_settings_title" />
- <meta-data android:name="com.android.settings.PARENT_FRAGMENT_CLASS"
- android:value="com.android.settings.Settings$StorageSettingsActivity" />
</activity-alias>
<!-- Bluetooth stuff -->
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 7c0c7b4..e94da8b 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -113,7 +113,7 @@
<string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Visible per a tots els dispositius Bluetooth propers (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
<string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Visible per a tots els dispositius Bluetooth propers"</string>
<string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Ocult per a altres dispositius Bluetooth"</string>
- <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Només visible per als dispositius sincronitzats"</string>
+ <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Només visible per als dispositius emparellats"</string>
<string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Temps de visibilitat"</string>
<string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Bloqueja el marcatge per veu"</string>
<string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Impedeix l\'ús del marcador Bluetooth quan la pantalla estigui bloquejada"</string>
@@ -448,15 +448,15 @@
<string name="bluetooth_settings_summary" msgid="2091062709530570462">"Gestiona les connexions, defineix el nom i la visibilitat del dispositiu"</string>
<string name="bluetooth_pairing_request" msgid="6385750334766370310">"Sol·licitud d\'emparellament de Bluetooth"</string>
<string name="bluetooth_enter_pin_msg" msgid="5698297871117529185">"Per emparellar amb:<xliff:g id="BOLD_0"><br><b></xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD"></b><br><br></xliff:g>Escriu el PIN sol·licitat pel dispositiu:"</string>
- <string name="bluetooth_enter_passkey_msg" msgid="2220143735340367939">"Per emparellar amb:<xliff:g id="BOLD_0"><br><b></xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD"></b><br><br></xliff:g>Escriu la contrasenya que requereix el dispositiu:"</string>
+ <string name="bluetooth_enter_passkey_msg" msgid="2220143735340367939">"Per emparellar amb:<xliff:g id="BOLD_0"><br><b></xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD"></b><br><br></xliff:g>Escriu la contrasenya sol·licitada pel dispositiu:"</string>
<string name="bluetooth_enable_alphanumeric_pin" msgid="7222713483058171357">"El PIN conté lletres o símbols"</string>
<string name="bluetooth_pin_values_hint" msgid="3815897557875873646">"En general, 0000 o 1234"</string>
<string name="bluetooth_enter_pin_other_device" msgid="4637977124526813470">"Pot ser que també hagis d\'introduir aquest PIN a l\'altre dispositiu."</string>
<string name="bluetooth_enter_passkey_other_device" msgid="2798719004030279602">"Pot ser que també hagis d\'introduir aquesta contrasenya a l\'altre dispositiu."</string>
<string name="bluetooth_confirm_passkey_msg" msgid="3708312912841950052">"Per emparellar amb:<br><b><xliff:g id="DEVICE_NAME">%1$s</xliff:g></b><br><br>Assegura\'t que apareix aquesta contrasenya:<br><b><xliff:g id="PASSKEY">%2$s</xliff:g></b>"</string>
<string name="bluetooth_incoming_pairing_msg" msgid="1615930853859551491">"De:<br><b><xliff:g id="DEVICE_NAME">%1$s</xliff:g></b><br><br>Vols emparellar-lo amb aquest dispositiu?"</string>
- <string name="bluetooth_display_passkey_pin_msg" msgid="2796550001376088433">"Per sincronitzar amb:<xliff:g id="BOLD1_0"><br><b></xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1"></b><br><br></xliff:g>Escriu-hi:<xliff:g id="BOLD2_1"><br><b></xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2"></b></xliff:g> i, a continuació, prem la tecla de retorn."</string>
- <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Sincronitza"</string>
+ <string name="bluetooth_display_passkey_pin_msg" msgid="2796550001376088433">"Per sincronitzar amb:<xliff:g id="BOLD1_0"><br><b></xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1"></b><br><br></xliff:g>Escriu <xliff:g id="BOLD2_1"><br><b></xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2"></b></xliff:g> en el dispositiu i, a continuació, prem la tecla de retorn."</string>
+ <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Emparella"</string>
<string name="bluetooth_pairing_decline" msgid="4185420413578948140">"Cancel·la"</string>
<string name="bluetooth_error_title" msgid="6850384073923533096"></string>
<string name="bluetooth_pairing_error_message" msgid="3748157733635947087">"No s\'ha pogut emparellar amb <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
@@ -468,7 +468,7 @@
<string name="bluetooth_search_for_devices" msgid="5957007154213560390">"Cerca dispositius"</string>
<string name="bluetooth_searching_for_devices" msgid="9203739709307871727">"S\'està cercant..."</string>
<string name="bluetooth_preference_device_settings" msgid="907776049862799122">"Configuració del dispositiu"</string>
- <string name="bluetooth_preference_paired_devices" msgid="1970524193086791964">"Dispositius sincronitzats"</string>
+ <string name="bluetooth_preference_paired_devices" msgid="1970524193086791964">"Dispositius emparellats"</string>
<string name="bluetooth_preference_found_devices" msgid="1647983835063249680">"Dispositius disponibles"</string>
<string name="bluetooth_device_context_connect" msgid="3997659895003244941">"Connecta"</string>
<string name="bluetooth_device_context_disconnect" msgid="8220072022970148683">"Desconnecta"</string>
@@ -493,7 +493,7 @@
<string name="bluetooth_disconnect_pan_user_profile" msgid="8037627994382458698">"L\'accés a Internet mitjançant <xliff:g id="DEVICE_NAME">%1$s</xliff:g> es desconnectarà."</string>
<string name="bluetooth_disconnect_pan_nap_profile" product="tablet" msgid="5455448395850929200">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> es desconnectarà de la compartició de la connexió a Internet de la tauleta."</string>
<string name="bluetooth_disconnect_pan_nap_profile" product="default" msgid="5266851881175033601">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> es desconnectarà de la compartició de la connexió a Internet del telèfon."</string>
- <string name="bluetooth_device_advanced_title" msgid="6066342531927499308">"Dispositiu Bluetooth sincronitzat"</string>
+ <string name="bluetooth_device_advanced_title" msgid="6066342531927499308">"Dispositiu Bluetooth emparellat"</string>
<string name="bluetooth_device_advanced_online_mode_title" msgid="3689050071425683114">"Connecta"</string>
<string name="bluetooth_device_advanced_online_mode_summary" msgid="1204424107263248336">"Connecta\'t al dispositiu Bluetooth"</string>
<string name="bluetooth_device_advanced_profile_header_title" msgid="3764437426089639639">"Perfils"</string>
@@ -1038,7 +1038,7 @@
<string name="regulatory_information" msgid="5695464367088752150">"Informació de regulació"</string>
<string name="copyright_title" msgid="865906688917260647">"Copyright"</string>
<string name="license_title" msgid="1990487604356037871">"Llicència"</string>
- <string name="terms_title" msgid="7697580845616764642">"Condicions del servei"</string>
+ <string name="terms_title" msgid="7697580845616764642">"Termes i condicions"</string>
<string name="settings_license_activity_title" msgid="7553683406244228650">"Llicències de codi obert"</string>
<string name="settings_license_activity_unavailable" msgid="4210539215951487627">"S\'ha produït un problema en llegir les llicències."</string>
<string name="settings_license_activity_loading" msgid="3337535809093591740">"S\'està carregant…"</string>
@@ -2064,15 +2064,15 @@
<string name="user_image_choose_photo" msgid="7940990613897477057">"Selecciona una foto de la galeria"</string>
<string name="regulatory_info_text" msgid="5623087902354026557"></string>
<string name="lock_settings_nfc_title" msgid="33998875572836425">"Configuració de bloqueig de pantalla de NFC"</string>
- <string name="nfc_unlock_paired_tags_title" msgid="3837232675294949824">"Etiquetes sincronitzades"</string>
+ <string name="nfc_unlock_paired_tags_title" msgid="3837232675294949824">"Etiquetes emparellades"</string>
<string name="nfc_unlock_enabled" msgid="7306199149460932989">"Activat"</string>
- <string name="start_nfc_pairing" msgid="5363319136364735698">"Sincronitza amb una etiqueta"</string>
+ <string name="start_nfc_pairing" msgid="5363319136364735698">"Emparella amb una etiqueta"</string>
<string name="title_activity_nfc_pairing" msgid="6821817665260628279">"NfcPairingActivity"</string>
- <string name="pairing_button_title" msgid="7411638037556429744">"Sincronitza ara"</string>
+ <string name="pairing_button_title" msgid="7411638037556429744">"Emparella ara"</string>
<string name="status_no_ring_detected" msgid="838954925249421062">"Posa l\'etiqueta plana en una taula i col·loca el telèfon a sobre."</string>
- <string name="status_device_paired" msgid="4916932520416516526">"L\'etiqueta i el telèfon s\'han sincronitzat correctament. Llestos."</string>
+ <string name="status_device_paired" msgid="4916932520416516526">"L\'etiqueta i el telèfon s\'han emparellat correctament. Llestos."</string>
<string name="status_error_invalid_device" msgid="5045003971535647259">"L\'etiqueta que has proporcionat no es pot utilitzar per desbloquejar el telèfon."</string>
- <string name="status_error_pairing_failed" msgid="8260473909085202868">"S\'ha produït un error amb la sincronització de l\'etiqueta. Torna-ho a provar."</string>
+ <string name="status_error_pairing_failed" msgid="8260473909085202868">"S\'ha produït un error en emparellar l\'etiqueta. Torna-ho a provar."</string>
<string name="enable_nfc" msgid="5234514241098808766">"L\'NFC no està activada i és necessària per desbloquejar la pantalla mitjançant NFC. Activa-la."</string>
<string name="ok" msgid="3651563352754792958">"Configuració de NFC"</string>
</resources>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index d395309..8a14ddd 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -697,7 +697,7 @@
<string name="notification_sound_title" msgid="5137483249425507572">"Standardlyd for underretninger"</string>
<string name="notification_pulse_title" msgid="1247988024534030629">"Blinkende meddelelseslys"</string>
<string name="incoming_call_volume_title" msgid="8073714801365904099">"Ringetone"</string>
- <string name="notification_volume_title" msgid="2012640760341080408">"Meddelelse"</string>
+ <string name="notification_volume_title" msgid="2012640760341080408">"Underretning"</string>
<string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Brug lydstyrke for indgående opkald til underretninger"</string>
<string name="notification_sound_dialog_title" msgid="3805140135741385667">"Standardlyd for underretninger"</string>
<string name="media_volume_title" msgid="3576565767317118106">"Medier"</string>
@@ -2027,7 +2027,7 @@
<string name="global_change_warning" product="default" msgid="2461264421590324675">"Denne indstilling påvirker alle brugere på denne telefon."</string>
<string name="global_locale_change_title" msgid="5956281361384221451">"Skift sprog"</string>
<string name="global_font_change_title" msgid="1887126466191012035">"Skift skriftstørrelse"</string>
- <string name="nfc_payment_settings_title" msgid="1807298287380821613">"Peg og betal"</string>
+ <string name="nfc_payment_settings_title" msgid="1807298287380821613">"Tryk og betal"</string>
<string name="nfc_payment_no_apps" msgid="2481080809791416010">"Betal med et enkelt tryk"</string>
<string name="nfc_payment_learn_more" msgid="5583407773744324447">"Få flere oplysninger"</string>
<string name="nfc_payment_menu_item_add_service" msgid="2885947408068969081">"Find apps"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index b86c086..9ac51f4 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -92,14 +92,14 @@
<string name="battery_info_status_charging" msgid="1705179948350365604">"Идет зарядка"</string>
<string name="battery_info_status_charging_ac" msgid="5874340256342956252">"от сети"</string>
<string name="battery_info_status_charging_usb" msgid="4059070156126770959">"по USB"</string>
- <string name="battery_info_status_charging_wireless" msgid="1822125795446772771">"Wi-Fi"</string>
+ <string name="battery_info_status_charging_wireless" msgid="1822125795446772771">"(беспроводная)"</string>
<string name="battery_info_status_discharging" msgid="310932812698268588">"Не заряжается"</string>
<string name="battery_info_status_not_charging" msgid="2820070506621483576">"Не заряжается"</string>
<string name="battery_info_status_full" msgid="2824614753861462808">"Батарея заряжена"</string>
<string name="battery_info_power_unplugged" msgid="5987246575519551081">"Не подключено"</string>
<string name="battery_info_power_ac" msgid="6808516193001604634">"Питание от сети"</string>
<string name="battery_info_power_usb" msgid="8012931702516331797">"USB"</string>
- <string name="battery_info_power_wireless" msgid="6819163295739305097">"Wi-Fi"</string>
+ <string name="battery_info_power_wireless" msgid="6819163295739305097">"беспроводная"</string>
<string name="battery_info_power_ac_usb" msgid="6777734146838328688">"Питание от сети и USB"</string>
<string name="battery_info_power_unknown" msgid="7344115502868899881">"Неизвестно"</string>
<string name="battery_info_health_unknown" msgid="5664295556921944255">"Неизвестно"</string>
diff --git a/res/values-sv/arrays.xml b/res/values-sv/arrays.xml
index 111f001..6e57979 100644
--- a/res/values-sv/arrays.xml
+++ b/res/values-sv/arrays.xml
@@ -232,7 +232,7 @@
<string-array name="app_ops_categories">
<item msgid="6358963769537892925">"Plats"</item>
<item msgid="255608127647030286">"Personligt"</item>
- <item msgid="4588829735729884491">"Meddelanden"</item>
+ <item msgid="4588829735729884491">"SMS/MMS"</item>
<item msgid="886742181977884584">"Media"</item>
<item msgid="7924928667052300589">"Enhet"</item>
</string-array>
diff --git a/src/com/android/settings/PairNfcDevice.java b/src/com/android/settings/PairNfcDevice.java
index 638f0d7..7c75b9f 100644
--- a/src/com/android/settings/PairNfcDevice.java
+++ b/src/com/android/settings/PairNfcDevice.java
@@ -151,7 +151,7 @@
public void run() {
finish();
}
- }, 4000);
+ }, 1000);
}
private void setErrorMode(int errorMsgResourceId) {
diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java
index 27daa07..271bf2d 100644
--- a/src/com/android/settings/Settings.java
+++ b/src/com/android/settings/Settings.java
@@ -111,10 +111,6 @@
"com.android.settings.TOP_LEVEL_HEADER_ID";
private static final String META_DATA_KEY_FRAGMENT_CLASS =
"com.android.settings.FRAGMENT_CLASS";
- private static final String META_DATA_KEY_PARENT_TITLE =
- "com.android.settings.PARENT_FRAGMENT_TITLE";
- private static final String META_DATA_KEY_PARENT_FRAGMENT_CLASS =
- "com.android.settings.PARENT_FRAGMENT_CLASS";
private static final String EXTRA_UI_OPTIONS = "settings:ui_options";
@@ -129,7 +125,6 @@
private int mTopLevelHeaderId;
private Header mFirstHeader;
private Header mCurrentHeader;
- private Header mParentHeader;
private boolean mInLocalHeaderSwitch;
// Show only these settings for restricted users
@@ -217,7 +212,6 @@
// Retrieve any saved state
if (savedInstanceState != null) {
mCurrentHeader = savedInstanceState.getParcelable(SAVE_KEY_CURRENT_HEADER);
- mParentHeader = savedInstanceState.getParcelable(SAVE_KEY_PARENT_HEADER);
}
// If the current header was saved, switch to it
@@ -226,15 +220,6 @@
showBreadCrumbs(mCurrentHeader.title, null);
}
- if (mParentHeader != null) {
- setParentTitle(mParentHeader.title, null, new OnClickListener() {
- @Override
- public void onClick(View v) {
- switchToParent(mParentHeader.fragment);
- }
- });
- }
-
// Override up navigation for multi-pane, since we handle it in the fragment breadcrumbs
if (onIsMultiPane()) {
getActionBar().setDisplayHomeAsUpEnabled(false);
@@ -250,9 +235,6 @@
if (mCurrentHeader != null) {
outState.putParcelable(SAVE_KEY_CURRENT_HEADER, mCurrentHeader);
}
- if (mParentHeader != null) {
- outState.putParcelable(SAVE_KEY_PARENT_HEADER, mParentHeader);
- }
}
@Override
@@ -376,7 +358,6 @@
public void switchToHeader(Header header) {
if (!mInLocalHeaderSwitch) {
mCurrentHeader = null;
- mParentHeader = null;
}
super.switchToHeader(header);
}
@@ -401,11 +382,6 @@
switchToHeaderLocal(parentHeader);
highlightHeader(mTopLevelHeaderId);
-
- mParentHeader = new Header();
- mParentHeader.fragment
- = parentInfo.metaData.getString(META_DATA_KEY_PARENT_FRAGMENT_CLASS);
- mParentHeader.title = parentInfo.metaData.getString(META_DATA_KEY_PARENT_TITLE);
}
} catch (NameNotFoundException nnfe) {
Log.w(LOG_TAG, "Could not find parent activity : " + className);
@@ -733,17 +709,6 @@
if (ai == null || ai.metaData == null) return;
mTopLevelHeaderId = ai.metaData.getInt(META_DATA_KEY_HEADER_ID);
mFragmentClass = ai.metaData.getString(META_DATA_KEY_FRAGMENT_CLASS);
-
- // Check if it has a parent specified and create a Header object
- final int parentHeaderTitleRes = ai.metaData.getInt(META_DATA_KEY_PARENT_TITLE);
- String parentFragmentClass = ai.metaData.getString(META_DATA_KEY_PARENT_FRAGMENT_CLASS);
- if (parentFragmentClass != null) {
- mParentHeader = new Header();
- mParentHeader.fragment = parentFragmentClass;
- if (parentHeaderTitleRes != 0) {
- mParentHeader.title = getResources().getString(parentHeaderTitleRes);
- }
- }
} catch (NameNotFoundException nnfe) {
// No recovery
}
diff --git a/src/com/android/settings/net/NetworkPolicyEditor.java b/src/com/android/settings/net/NetworkPolicyEditor.java
index 82bd385..ad2afa0 100644
--- a/src/com/android/settings/net/NetworkPolicyEditor.java
+++ b/src/com/android/settings/net/NetworkPolicyEditor.java
@@ -160,7 +160,8 @@
}
public int getPolicyCycleDay(NetworkTemplate template) {
- return getPolicy(template).cycleDay;
+ final NetworkPolicy policy = getPolicy(template);
+ return (policy != null) ? policy.cycleDay : -1;
}
public void setPolicyCycleDay(NetworkTemplate template, int cycleDay, String cycleTimezone) {
@@ -173,7 +174,8 @@
}
public long getPolicyWarningBytes(NetworkTemplate template) {
- return getPolicy(template).warningBytes;
+ final NetworkPolicy policy = getPolicy(template);
+ return (policy != null) ? policy.warningBytes : WARNING_DISABLED;
}
public void setPolicyWarningBytes(NetworkTemplate template, long warningBytes) {
@@ -185,7 +187,8 @@
}
public long getPolicyLimitBytes(NetworkTemplate template) {
- return getPolicy(template).limitBytes;
+ final NetworkPolicy policy = getPolicy(template);
+ return (policy != null) ? policy.limitBytes : LIMIT_DISABLED;
}
public void setPolicyLimitBytes(NetworkTemplate template, long limitBytes) {
@@ -309,8 +312,16 @@
final NetworkPolicy policy3g = getPolicy(template3g);
final NetworkPolicy policy4g = getPolicy(template4g);
- final NetworkPolicy restrictive = policy3g.compareTo(policy4g) < 0 ? policy3g
- : policy4g;
+ NetworkPolicy restrictive = null;
+ if ((policy3g == null) && (policy4g == null)) {
+ return false;
+ } else if (policy3g == null) {
+ restrictive = policy4g;
+ } else if (policy4g == null) {
+ restrictive = policy3g;
+ } else {
+ restrictive = policy3g.compareTo(policy4g) < 0 ? policy3g : policy4g;
+ }
mPolicies.remove(policy3g);
mPolicies.remove(policy4g);
mPolicies.add(new NetworkPolicy(templateAll, restrictive.cycleDay,
@@ -321,6 +332,9 @@
} else if (!beforeSplit && split) {
// duplicate existing policy into two rules
final NetworkPolicy policyAll = getPolicy(templateAll);
+ if (policyAll == null) {
+ return false;
+ }
mPolicies.remove(policyAll);
mPolicies.add(new NetworkPolicy(template3g, policyAll.cycleDay, policyAll.cycleTimezone,
policyAll.warningBytes, policyAll.limitBytes, SNOOZE_NEVER, SNOOZE_NEVER,