Merge "Tweak style of recent apps dialog title." into froyo
diff --git a/core/java/android/provider/Calendar.java b/core/java/android/provider/Calendar.java
index ba63a66..9a09805 100644
--- a/core/java/android/provider/Calendar.java
+++ b/core/java/android/provider/Calendar.java
@@ -638,11 +638,13 @@
private static final int COLUMN_ATTENDEE_TYPE = 3;
private static final int COLUMN_ATTENDEE_STATUS = 4;
private static final String[] EXTENDED_PROJECTION = new String[] {
+ ExtendedProperties._ID,
ExtendedProperties.NAME,
- ExtendedProperties.VALUE,
+ ExtendedProperties.VALUE
};
- private static final int COLUMN_NAME = 0;
- private static final int COLUMN_VALUE = 1;
+ private static final int COLUMN_ID = 0;
+ private static final int COLUMN_NAME = 1;
+ private static final int COLUMN_VALUE = 2;
private static final String WHERE_EVENT_ID = "event_id=?";
@@ -772,6 +774,8 @@
try {
while (subCursor.moveToNext()) {
ContentValues extendedValues = new ContentValues();
+ extendedValues.put(ExtendedProperties._ID,
+ subCursor.getString(COLUMN_ID));
extendedValues.put(ExtendedProperties.NAME,
subCursor.getString(COLUMN_NAME));
extendedValues.put(ExtendedProperties.VALUE,
diff --git a/core/res/res/values-cs/strings.xml b/core/res/res/values-cs/strings.xml
index a4b3bdd..a033e32 100644
--- a/core/res/res/values-cs/strings.xml
+++ b/core/res/res/values-cs/strings.xml
@@ -134,8 +134,7 @@
<string name="power_off" msgid="4266614107412865048">"Vypnout"</string>
<string name="shutdown_progress" msgid="2281079257329981203">"Vypínání..."</string>
<string name="shutdown_confirm" msgid="649792175242821353">"Váš telefon bude vypnut."</string>
- <!-- no translation found for recent_tasks_title (3691764623638127888) -->
- <skip />
+ <string name="recent_tasks_title" msgid="3691764623638127888">"Nejnovější"</string>
<string name="no_recent_tasks" msgid="279702952298056674">"Žádné nedávno použité aplikace."</string>
<string name="global_actions" msgid="2406416831541615258">"Možnosti telefonu"</string>
<string name="global_action_lock" msgid="2844945191792119712">"Zámek obrazovky"</string>
@@ -858,12 +857,8 @@
<string name="car_mode_disable_notification_message" msgid="668663626721675614">"Vyberte, chcete-li ukončit režim Na cestě."</string>
<string name="tethered_notification_title" msgid="8146103971290167718">"Sdílení je aktivní"</string>
<string name="tethered_notification_message" msgid="3067108323903048927">"Dotykem zahájíte konfiguraci"</string>
- <!-- no translation found for throttle_warning_notification_title (4890894267454867276) -->
- <skip />
- <!-- no translation found for throttle_warning_notification_message (2609734763845705708) -->
- <skip />
- <!-- no translation found for throttled_notification_title (6269541897729781332) -->
- <skip />
- <!-- no translation found for throttled_notification_message (4712369856601275146) -->
- <skip />
+ <string name="throttle_warning_notification_title" msgid="4890894267454867276">"Vysoké využití mobilních dat"</string>
+ <string name="throttle_warning_notification_message" msgid="2609734763845705708">"Dotykem zobrazíte další informace o využití mobilních dat"</string>
+ <string name="throttled_notification_title" msgid="6269541897729781332">"Byl překročen limit mobilních dat"</string>
+ <string name="throttled_notification_message" msgid="4712369856601275146">"Dotykem zobrazíte další informace o využití mobilních dat"</string>
</resources>
diff --git a/core/res/res/values-da/strings.xml b/core/res/res/values-da/strings.xml
index fa0c7e8..ab4a7c7 100644
--- a/core/res/res/values-da/strings.xml
+++ b/core/res/res/values-da/strings.xml
@@ -134,8 +134,7 @@
<string name="power_off" msgid="4266614107412865048">"Sluk"</string>
<string name="shutdown_progress" msgid="2281079257329981203">"Lukker ned ..."</string>
<string name="shutdown_confirm" msgid="649792175242821353">"lydstyrke for opkald"</string>
- <!-- no translation found for recent_tasks_title (3691764623638127888) -->
- <skip />
+ <string name="recent_tasks_title" msgid="3691764623638127888">"Seneste"</string>
<string name="no_recent_tasks" msgid="279702952298056674">"Der er ingen nye programmer."</string>
<string name="global_actions" msgid="2406416831541615258">"Indstillinger for telefon"</string>
<string name="global_action_lock" msgid="2844945191792119712">"Skærmlås"</string>
@@ -858,12 +857,8 @@
<string name="car_mode_disable_notification_message" msgid="668663626721675614">"Vælg for at afslutte biltilstand."</string>
<string name="tethered_notification_title" msgid="8146103971290167718">"Tethering aktiveret"</string>
<string name="tethered_notification_message" msgid="3067108323903048927">"Tryk for at konfigurere"</string>
- <!-- no translation found for throttle_warning_notification_title (4890894267454867276) -->
- <skip />
- <!-- no translation found for throttle_warning_notification_message (2609734763845705708) -->
- <skip />
- <!-- no translation found for throttled_notification_title (6269541897729781332) -->
- <skip />
- <!-- no translation found for throttled_notification_message (4712369856601275146) -->
- <skip />
+ <string name="throttle_warning_notification_title" msgid="4890894267454867276">"Højt mobildataforbrug"</string>
+ <string name="throttle_warning_notification_message" msgid="2609734763845705708">"Tryk for oplysninger om brug af mobildata"</string>
+ <string name="throttled_notification_title" msgid="6269541897729781332">"Grænsen for mobildata er overskredet"</string>
+ <string name="throttled_notification_message" msgid="4712369856601275146">"Tryk for oplysninger om brug af mobildata"</string>
</resources>
diff --git a/core/res/res/values-de/strings.xml b/core/res/res/values-de/strings.xml
index dbcde54..8539d51 100644
--- a/core/res/res/values-de/strings.xml
+++ b/core/res/res/values-de/strings.xml
@@ -134,8 +134,7 @@
<string name="power_off" msgid="4266614107412865048">"Ausschalten"</string>
<string name="shutdown_progress" msgid="2281079257329981203">"Herunterfahren..."</string>
<string name="shutdown_confirm" msgid="649792175242821353">"Ihr Telefon wird heruntergefahren."</string>
- <!-- no translation found for recent_tasks_title (3691764623638127888) -->
- <skip />
+ <string name="recent_tasks_title" msgid="3691764623638127888">"Neueste"</string>
<string name="no_recent_tasks" msgid="279702952298056674">"Keine neuen Anwendungen."</string>
<string name="global_actions" msgid="2406416831541615258">"Telefonoptionen"</string>
<string name="global_action_lock" msgid="2844945191792119712">"Bildschirmsperre"</string>
@@ -858,12 +857,8 @@
<string name="car_mode_disable_notification_message" msgid="668663626721675614">"Zum Beenden des Automodus auswählen"</string>
<string name="tethered_notification_title" msgid="8146103971290167718">"Tethering aktiv"</string>
<string name="tethered_notification_message" msgid="3067108323903048927">"Zum Konfigurieren berühren"</string>
- <!-- no translation found for throttle_warning_notification_title (4890894267454867276) -->
- <skip />
- <!-- no translation found for throttle_warning_notification_message (2609734763845705708) -->
- <skip />
- <!-- no translation found for throttled_notification_title (6269541897729781332) -->
- <skip />
- <!-- no translation found for throttled_notification_message (4712369856601275146) -->
- <skip />
+ <string name="throttle_warning_notification_title" msgid="4890894267454867276">"Hohe Mobildatennutzung"</string>
+ <string name="throttle_warning_notification_message" msgid="2609734763845705708">"Weitere Informationen über die Mobildatennutzung durch Berühren aufrufen"</string>
+ <string name="throttled_notification_title" msgid="6269541897729781332">"Mobildatenlimit überschritten"</string>
+ <string name="throttled_notification_message" msgid="4712369856601275146">"Weitere Informationen über die Mobildatennutzung durch Berühren aufrufen"</string>
</resources>
diff --git a/core/res/res/values-el/strings.xml b/core/res/res/values-el/strings.xml
index 4bc1c35..8838eb2 100644
--- a/core/res/res/values-el/strings.xml
+++ b/core/res/res/values-el/strings.xml
@@ -134,8 +134,7 @@
<string name="power_off" msgid="4266614107412865048">"Απενεργοποίηση"</string>
<string name="shutdown_progress" msgid="2281079257329981203">"Απενεργοποίηση..."</string>
<string name="shutdown_confirm" msgid="649792175242821353">"Το τηλέφωνό σας θα απενεργοποιηθεί."</string>
- <!-- no translation found for recent_tasks_title (3691764623638127888) -->
- <skip />
+ <string name="recent_tasks_title" msgid="3691764623638127888">"Πρόσφατα"</string>
<string name="no_recent_tasks" msgid="279702952298056674">"Δεν υπάρχουν πρόσφατες εφαρμογές."</string>
<string name="global_actions" msgid="2406416831541615258">"Επιλογές τηλεφώνου"</string>
<string name="global_action_lock" msgid="2844945191792119712">"Κλείδωμα οθόνης"</string>
@@ -858,12 +857,8 @@
<string name="car_mode_disable_notification_message" msgid="668663626721675614">"Επιλέξτε για έξοδο από τη λειτουργία αυτοκινήτου."</string>
<string name="tethered_notification_title" msgid="8146103971290167718">"Η σύνδεση μέσω κινητής συσκευής είναι ενεργή"</string>
<string name="tethered_notification_message" msgid="3067108323903048927">"Αγγίξτε για να γίνει διαμόρφωση"</string>
- <!-- no translation found for throttle_warning_notification_title (4890894267454867276) -->
- <skip />
- <!-- no translation found for throttle_warning_notification_message (2609734763845705708) -->
- <skip />
- <!-- no translation found for throttled_notification_title (6269541897729781332) -->
- <skip />
- <!-- no translation found for throttled_notification_message (4712369856601275146) -->
- <skip />
+ <string name="throttle_warning_notification_title" msgid="4890894267454867276">"Υψηλή χρήση δεδομένων κινητής τηλεφωνίας"</string>
+ <string name="throttle_warning_notification_message" msgid="2609734763845705708">"Αγγίξτε για να μάθετε περισσότερα σχετικά με τη χρήση δεδομένων κινητής τηλεφωνίας"</string>
+ <string name="throttled_notification_title" msgid="6269541897729781332">"Ξεπεράστηκε το όριο δεδομένων κινητής τηλεφωνίας"</string>
+ <string name="throttled_notification_message" msgid="4712369856601275146">"Αγγίξτε για να μάθετε περισσότερα σχετικά με τη χρήση δεδομένων κινητής τηλεφωνίας"</string>
</resources>
diff --git a/core/res/res/values-es-rUS/strings.xml b/core/res/res/values-es-rUS/strings.xml
index deb9f8f..cdd686d 100644
--- a/core/res/res/values-es-rUS/strings.xml
+++ b/core/res/res/values-es-rUS/strings.xml
@@ -134,8 +134,7 @@
<string name="power_off" msgid="4266614107412865048">"Apagar"</string>
<string name="shutdown_progress" msgid="2281079257329981203">"Apagando…"</string>
<string name="shutdown_confirm" msgid="649792175242821353">"Tu teléfono se apagará."</string>
- <!-- no translation found for recent_tasks_title (3691764623638127888) -->
- <skip />
+ <string name="recent_tasks_title" msgid="3691764623638127888">"Reciente"</string>
<string name="no_recent_tasks" msgid="279702952298056674">"No hay aplicaciones recientes."</string>
<string name="global_actions" msgid="2406416831541615258">"Opciones de teléfono"</string>
<string name="global_action_lock" msgid="2844945191792119712">"Bloqueo de pantalla"</string>
@@ -858,12 +857,8 @@
<string name="car_mode_disable_notification_message" msgid="668663626721675614">"Seleccionar para salir del modo auto"</string>
<string name="tethered_notification_title" msgid="8146103971290167718">"Conexión de anclaje a red activa"</string>
<string name="tethered_notification_message" msgid="3067108323903048927">"Tocar para configurar"</string>
- <!-- no translation found for throttle_warning_notification_title (4890894267454867276) -->
- <skip />
- <!-- no translation found for throttle_warning_notification_message (2609734763845705708) -->
- <skip />
- <!-- no translation found for throttled_notification_title (6269541897729781332) -->
- <skip />
- <!-- no translation found for throttled_notification_message (4712369856601275146) -->
- <skip />
+ <string name="throttle_warning_notification_title" msgid="4890894267454867276">"Amplia utilización de datos móviles"</string>
+ <string name="throttle_warning_notification_message" msgid="2609734763845705708">"Toca para obtener más información acerca de la utilización de datos móviles."</string>
+ <string name="throttled_notification_title" msgid="6269541897729781332">"Límite de datos móviles excedido "</string>
+ <string name="throttled_notification_message" msgid="4712369856601275146">"Toca para obtener más información acerca de la utilización de datos móviles."</string>
</resources>
diff --git a/core/res/res/values-es/strings.xml b/core/res/res/values-es/strings.xml
index ae8b251..df651f2 100644
--- a/core/res/res/values-es/strings.xml
+++ b/core/res/res/values-es/strings.xml
@@ -134,8 +134,7 @@
<string name="power_off" msgid="4266614107412865048">"Apagar"</string>
<string name="shutdown_progress" msgid="2281079257329981203">"Apagando..."</string>
<string name="shutdown_confirm" msgid="649792175242821353">"El teléfono se apagará."</string>
- <!-- no translation found for recent_tasks_title (3691764623638127888) -->
- <skip />
+ <string name="recent_tasks_title" msgid="3691764623638127888">"Reciente"</string>
<string name="no_recent_tasks" msgid="279702952298056674">"No hay aplicaciones recientes"</string>
<string name="global_actions" msgid="2406416831541615258">"Opciones del teléfono"</string>
<string name="global_action_lock" msgid="2844945191792119712">"Bloqueo de pantalla"</string>
@@ -858,12 +857,8 @@
<string name="car_mode_disable_notification_message" msgid="668663626721675614">"Selecciona esta opción para salir del modo coche."</string>
<string name="tethered_notification_title" msgid="8146103971290167718">"Anclaje a red activo"</string>
<string name="tethered_notification_message" msgid="3067108323903048927">"Toca para iniciar la configuración."</string>
- <!-- no translation found for throttle_warning_notification_title (4890894267454867276) -->
- <skip />
- <!-- no translation found for throttle_warning_notification_message (2609734763845705708) -->
- <skip />
- <!-- no translation found for throttled_notification_title (6269541897729781332) -->
- <skip />
- <!-- no translation found for throttled_notification_message (4712369856601275146) -->
- <skip />
+ <string name="throttle_warning_notification_title" msgid="4890894267454867276">"Uso elevado datos móv"</string>
+ <string name="throttle_warning_notification_message" msgid="2609734763845705708">"Toca para más inform sobre uso de datos móv"</string>
+ <string name="throttled_notification_title" msgid="6269541897729781332">"Límite datos móv superado"</string>
+ <string name="throttled_notification_message" msgid="4712369856601275146">"Toca para más inform sobre uso de datos móv"</string>
</resources>
diff --git a/core/res/res/values-fr/strings.xml b/core/res/res/values-fr/strings.xml
index 670bcdf..d672b1e 100644
--- a/core/res/res/values-fr/strings.xml
+++ b/core/res/res/values-fr/strings.xml
@@ -134,8 +134,7 @@
<string name="power_off" msgid="4266614107412865048">"Éteindre"</string>
<string name="shutdown_progress" msgid="2281079257329981203">"Arrêt en cours..."</string>
<string name="shutdown_confirm" msgid="649792175242821353">"Votre téléphone va s\'éteindre."</string>
- <!-- no translation found for recent_tasks_title (3691764623638127888) -->
- <skip />
+ <string name="recent_tasks_title" msgid="3691764623638127888">"Récentes"</string>
<string name="no_recent_tasks" msgid="279702952298056674">"Aucune application récente"</string>
<string name="global_actions" msgid="2406416831541615258">"Options du téléphone"</string>
<string name="global_action_lock" msgid="2844945191792119712">"Verrouillage de l\'écran"</string>
@@ -858,12 +857,8 @@
<string name="car_mode_disable_notification_message" msgid="668663626721675614">"Sélectionnez cette option pour quitter le mode Voiture."</string>
<string name="tethered_notification_title" msgid="8146103971290167718">"Partage de connexion activé"</string>
<string name="tethered_notification_message" msgid="3067108323903048927">"Toucher pour configurer"</string>
- <!-- no translation found for throttle_warning_notification_title (4890894267454867276) -->
- <skip />
- <!-- no translation found for throttle_warning_notification_message (2609734763845705708) -->
- <skip />
- <!-- no translation found for throttled_notification_title (6269541897729781332) -->
- <skip />
- <!-- no translation found for throttled_notification_message (4712369856601275146) -->
- <skip />
+ <string name="throttle_warning_notification_title" msgid="4890894267454867276">"Utilisation importante des données mobiles"</string>
+ <string name="throttle_warning_notification_message" msgid="2609734763845705708">"Touchez pour en savoir plus sur l\'utilisation des données mobiles."</string>
+ <string name="throttled_notification_title" msgid="6269541897729781332">"Plafond d\'utilisation des données mobiles dépassé"</string>
+ <string name="throttled_notification_message" msgid="4712369856601275146">"Touchez pour en savoir plus sur l\'utilisation des données mobiles."</string>
</resources>
diff --git a/core/res/res/values-it/strings.xml b/core/res/res/values-it/strings.xml
index acc8f2b..dd081ecd 100644
--- a/core/res/res/values-it/strings.xml
+++ b/core/res/res/values-it/strings.xml
@@ -134,8 +134,7 @@
<string name="power_off" msgid="4266614107412865048">"Spegni"</string>
<string name="shutdown_progress" msgid="2281079257329981203">"Spegnimento..."</string>
<string name="shutdown_confirm" msgid="649792175242821353">"Il telefono verrà spento."</string>
- <!-- no translation found for recent_tasks_title (3691764623638127888) -->
- <skip />
+ <string name="recent_tasks_title" msgid="3691764623638127888">"Recenti"</string>
<string name="no_recent_tasks" msgid="279702952298056674">"Nessuna applicazione recente."</string>
<string name="global_actions" msgid="2406416831541615258">"Opzioni telefono"</string>
<string name="global_action_lock" msgid="2844945191792119712">"Blocco schermo"</string>
@@ -858,12 +857,8 @@
<string name="car_mode_disable_notification_message" msgid="668663626721675614">"Seleziona per uscire dalla modalità automobile."</string>
<string name="tethered_notification_title" msgid="8146103971290167718">"Tethering attivo"</string>
<string name="tethered_notification_message" msgid="3067108323903048927">"Tocca per configurare"</string>
- <!-- no translation found for throttle_warning_notification_title (4890894267454867276) -->
- <skip />
- <!-- no translation found for throttle_warning_notification_message (2609734763845705708) -->
- <skip />
- <!-- no translation found for throttled_notification_title (6269541897729781332) -->
- <skip />
- <!-- no translation found for throttled_notification_message (4712369856601275146) -->
- <skip />
+ <string name="throttle_warning_notification_title" msgid="4890894267454867276">"Utilizzo dati cell. elevato"</string>
+ <string name="throttle_warning_notification_message" msgid="2609734763845705708">"Tocca per informazioni sull\'utilizzo dati cell."</string>
+ <string name="throttled_notification_title" msgid="6269541897729781332">"Limite dati cell. superato"</string>
+ <string name="throttled_notification_message" msgid="4712369856601275146">"Tocca per informazioni sull\'utilizzo dati cell."</string>
</resources>
diff --git a/core/res/res/values-ja/strings.xml b/core/res/res/values-ja/strings.xml
index 40757b1..7fcef92 100644
--- a/core/res/res/values-ja/strings.xml
+++ b/core/res/res/values-ja/strings.xml
@@ -134,8 +134,7 @@
<string name="power_off" msgid="4266614107412865048">"電源を切る"</string>
<string name="shutdown_progress" msgid="2281079257329981203">"シャットダウン中..."</string>
<string name="shutdown_confirm" msgid="649792175242821353">"携帯電話の電源を切ります。"</string>
- <!-- no translation found for recent_tasks_title (3691764623638127888) -->
- <skip />
+ <string name="recent_tasks_title" msgid="3691764623638127888">"新着"</string>
<string name="no_recent_tasks" msgid="279702952298056674">"最近使ったアプリケーションはありません。"</string>
<string name="global_actions" msgid="2406416831541615258">"携帯電話オプション"</string>
<string name="global_action_lock" msgid="2844945191792119712">"画面ロック"</string>
@@ -858,12 +857,8 @@
<string name="car_mode_disable_notification_message" msgid="668663626721675614">"運転モードを終了するには選択してください。"</string>
<string name="tethered_notification_title" msgid="8146103971290167718">"テザリングが有効です"</string>
<string name="tethered_notification_message" msgid="3067108323903048927">"タップして設定する"</string>
- <!-- no translation found for throttle_warning_notification_title (4890894267454867276) -->
- <skip />
- <!-- no translation found for throttle_warning_notification_message (2609734763845705708) -->
- <skip />
- <!-- no translation found for throttled_notification_title (6269541897729781332) -->
- <skip />
- <!-- no translation found for throttled_notification_message (4712369856601275146) -->
- <skip />
+ <string name="throttle_warning_notification_title" msgid="4890894267454867276">"モバイルデータの使用量が増えています"</string>
+ <string name="throttle_warning_notification_message" msgid="2609734763845705708">"タップしてモバイルデータ利用の詳細を表示します"</string>
+ <string name="throttled_notification_title" msgid="6269541897729781332">"モバイルデータの制限を超えました"</string>
+ <string name="throttled_notification_message" msgid="4712369856601275146">"タップしてモバイルデータ利用の詳細を表示します"</string>
</resources>
diff --git a/core/res/res/values-ko/strings.xml b/core/res/res/values-ko/strings.xml
index 7c5b392..1f742bf 100644
--- a/core/res/res/values-ko/strings.xml
+++ b/core/res/res/values-ko/strings.xml
@@ -134,8 +134,7 @@
<string name="power_off" msgid="4266614107412865048">"종료"</string>
<string name="shutdown_progress" msgid="2281079257329981203">"종료 중..."</string>
<string name="shutdown_confirm" msgid="649792175242821353">"휴대전화가 종료됩니다."</string>
- <!-- no translation found for recent_tasks_title (3691764623638127888) -->
- <skip />
+ <string name="recent_tasks_title" msgid="3691764623638127888">"최근 작업"</string>
<string name="no_recent_tasks" msgid="279702952298056674">"최신 응용프로그램이 아닙니다."</string>
<string name="global_actions" msgid="2406416831541615258">"휴대전화 옵션"</string>
<string name="global_action_lock" msgid="2844945191792119712">"화면 잠금"</string>
@@ -858,8 +857,8 @@
<string name="car_mode_disable_notification_message" msgid="668663626721675614">"차량 모드를 종료하려면 선택하세요."</string>
<string name="tethered_notification_title" msgid="8146103971290167718">"테더링 사용중"</string>
<string name="tethered_notification_message" msgid="3067108323903048927">"구성하려면 터치하세요."</string>
- <string name="throttle_warning_notification_title" msgid="4890894267454867276">"대용량의 무선 데이터 사용"</string>
- <string name="throttle_warning_notification_message" msgid="2609734763845705708">"무선 데이터 사용량에 대해 알고 싶으면 터치하세요."</string>
- <string name="throttled_notification_title" msgid="6269541897729781332">"무선 데이터 제한용량 초과"</string>
- <string name="throttled_notification_message" msgid="4712369856601275146">"무선 데이터 사용량에 대해 알고 싶으면 터치하세요."</string>
+ <string name="throttle_warning_notification_title" msgid="4890894267454867276">"높은 모바일 데이터 사용량"</string>
+ <string name="throttle_warning_notification_message" msgid="2609734763845705708">"모바일 데이터 사용에 대해 자세히 알아보려면 터치하세요."</string>
+ <string name="throttled_notification_title" msgid="6269541897729781332">"모바일 데이터 제한을 초과했습니다."</string>
+ <string name="throttled_notification_message" msgid="4712369856601275146">"모바일 데이터 사용에 대해 자세히 알아보려면 터치하세요."</string>
</resources>
diff --git a/core/res/res/values-nb/strings.xml b/core/res/res/values-nb/strings.xml
index 62b7f67..318fc15 100644
--- a/core/res/res/values-nb/strings.xml
+++ b/core/res/res/values-nb/strings.xml
@@ -134,8 +134,7 @@
<string name="power_off" msgid="4266614107412865048">"Slå av"</string>
<string name="shutdown_progress" msgid="2281079257329981203">"Avslutter…"</string>
<string name="shutdown_confirm" msgid="649792175242821353">"Telefonen vil bli slått av."</string>
- <!-- no translation found for recent_tasks_title (3691764623638127888) -->
- <skip />
+ <string name="recent_tasks_title" msgid="3691764623638127888">"Nylig"</string>
<string name="no_recent_tasks" msgid="279702952298056674">"Ingen nylig brukte applikasjoner."</string>
<string name="global_actions" msgid="2406416831541615258">"Telefoninnstillinger"</string>
<string name="global_action_lock" msgid="2844945191792119712">"Lås skjermen"</string>
@@ -858,12 +857,8 @@
<string name="car_mode_disable_notification_message" msgid="668663626721675614">"Velg for å avslutte bilmodus"</string>
<string name="tethered_notification_title" msgid="8146103971290167718">"Tilknytning er aktiv"</string>
<string name="tethered_notification_message" msgid="3067108323903048927">"Trykk for å konfigurere"</string>
- <!-- no translation found for throttle_warning_notification_title (4890894267454867276) -->
- <skip />
- <!-- no translation found for throttle_warning_notification_message (2609734763845705708) -->
- <skip />
- <!-- no translation found for throttled_notification_title (6269541897729781332) -->
- <skip />
- <!-- no translation found for throttled_notification_message (4712369856601275146) -->
- <skip />
+ <string name="throttle_warning_notification_title" msgid="4890894267454867276">"Høy mobildatabruk"</string>
+ <string name="throttle_warning_notification_message" msgid="2609734763845705708">"Berør for å lese mer om bruk av mobildata"</string>
+ <string name="throttled_notification_title" msgid="6269541897729781332">"Grensen for mobildatabruk er overskredet"</string>
+ <string name="throttled_notification_message" msgid="4712369856601275146">"Berør for å lese mer om bruk av mobildata"</string>
</resources>
diff --git a/core/res/res/values-nl/strings.xml b/core/res/res/values-nl/strings.xml
index 04531ef..736855f 100644
--- a/core/res/res/values-nl/strings.xml
+++ b/core/res/res/values-nl/strings.xml
@@ -134,8 +134,7 @@
<string name="power_off" msgid="4266614107412865048">"Uitschakelen"</string>
<string name="shutdown_progress" msgid="2281079257329981203">"Uitschakelen..."</string>
<string name="shutdown_confirm" msgid="649792175242821353">"Uw telefoon wordt uitgeschakeld."</string>
- <!-- no translation found for recent_tasks_title (3691764623638127888) -->
- <skip />
+ <string name="recent_tasks_title" msgid="3691764623638127888">"Recent"</string>
<string name="no_recent_tasks" msgid="279702952298056674">"Geen recente toepassingen."</string>
<string name="global_actions" msgid="2406416831541615258">"Telefoonopties"</string>
<string name="global_action_lock" msgid="2844945191792119712">"Schermvergrendeling"</string>
@@ -858,12 +857,8 @@
<string name="car_mode_disable_notification_message" msgid="668663626721675614">"Selecteer dit om de automodus af te sluiten."</string>
<string name="tethered_notification_title" msgid="8146103971290167718">"Tethering actief"</string>
<string name="tethered_notification_message" msgid="3067108323903048927">"Aanraken om te configureren"</string>
- <!-- no translation found for throttle_warning_notification_title (4890894267454867276) -->
- <skip />
- <!-- no translation found for throttle_warning_notification_message (2609734763845705708) -->
- <skip />
- <!-- no translation found for throttled_notification_title (6269541897729781332) -->
- <skip />
- <!-- no translation found for throttled_notification_message (4712369856601275146) -->
- <skip />
+ <string name="throttle_warning_notification_title" msgid="4890894267454867276">"Hoog mobiel gegevensgebruik"</string>
+ <string name="throttle_warning_notification_message" msgid="2609734763845705708">"Raak aan voor meer informatie over mobiel gegevensgebruik"</string>
+ <string name="throttled_notification_title" msgid="6269541897729781332">"Mobiele gegevenslimiet overschreden"</string>
+ <string name="throttled_notification_message" msgid="4712369856601275146">"Raak aan voor meer informatie over mobiel gegevensgebruik"</string>
</resources>
diff --git a/core/res/res/values-pl/strings.xml b/core/res/res/values-pl/strings.xml
index 93cce1f..597bd69 100644
--- a/core/res/res/values-pl/strings.xml
+++ b/core/res/res/values-pl/strings.xml
@@ -134,8 +134,7 @@
<string name="power_off" msgid="4266614107412865048">"Wyłącz"</string>
<string name="shutdown_progress" msgid="2281079257329981203">"Wyłączanie..."</string>
<string name="shutdown_confirm" msgid="649792175242821353">"Telefon zostanie wyłączony"</string>
- <!-- no translation found for recent_tasks_title (3691764623638127888) -->
- <skip />
+ <string name="recent_tasks_title" msgid="3691764623638127888">"Najnowsze"</string>
<string name="no_recent_tasks" msgid="279702952298056674">"Brak ostatnio używanych aplikacji."</string>
<string name="global_actions" msgid="2406416831541615258">"Opcje telefonu"</string>
<string name="global_action_lock" msgid="2844945191792119712">"Blokada ekranu"</string>
@@ -858,12 +857,8 @@
<string name="car_mode_disable_notification_message" msgid="668663626721675614">"Wybierz, aby zakończyć tryb samochodowy."</string>
<string name="tethered_notification_title" msgid="8146103971290167718">"Powiązanie aktywne"</string>
<string name="tethered_notification_message" msgid="3067108323903048927">"Dotknij, aby skonfigurować"</string>
- <!-- no translation found for throttle_warning_notification_title (4890894267454867276) -->
- <skip />
- <!-- no translation found for throttle_warning_notification_message (2609734763845705708) -->
- <skip />
- <!-- no translation found for throttled_notification_title (6269541897729781332) -->
- <skip />
- <!-- no translation found for throttled_notification_message (4712369856601275146) -->
- <skip />
+ <string name="throttle_warning_notification_title" msgid="4890894267454867276">"Wysoki poziom użycia danych komórkowych"</string>
+ <string name="throttle_warning_notification_message" msgid="2609734763845705708">"Dotknij, aby uzyskać więcej informacji na temat używania danych komórkowych"</string>
+ <string name="throttled_notification_title" msgid="6269541897729781332">"Przekroczono limit danych komórkowych"</string>
+ <string name="throttled_notification_message" msgid="4712369856601275146">"Dotknij, aby uzyskać więcej informacji na temat używania danych komórkowych"</string>
</resources>
diff --git a/core/res/res/values-pt-rPT/strings.xml b/core/res/res/values-pt-rPT/strings.xml
index 251a82e..8302dd2 100644
--- a/core/res/res/values-pt-rPT/strings.xml
+++ b/core/res/res/values-pt-rPT/strings.xml
@@ -134,8 +134,7 @@
<string name="power_off" msgid="4266614107412865048">"Desligar"</string>
<string name="shutdown_progress" msgid="2281079257329981203">"A encerrar..."</string>
<string name="shutdown_confirm" msgid="649792175242821353">"O seu telefone irá encerrar."</string>
- <!-- no translation found for recent_tasks_title (3691764623638127888) -->
- <skip />
+ <string name="recent_tasks_title" msgid="3691764623638127888">"Recente"</string>
<string name="no_recent_tasks" msgid="279702952298056674">"Nenhuma aplicação recente."</string>
<string name="global_actions" msgid="2406416831541615258">"Opções do telefone"</string>
<string name="global_action_lock" msgid="2844945191792119712">"Bloqueio de ecrã"</string>
@@ -858,12 +857,8 @@
<string name="car_mode_disable_notification_message" msgid="668663626721675614">"Seleccionar para sair do modo automóvel."</string>
<string name="tethered_notification_title" msgid="8146103971290167718">"Associação activa"</string>
<string name="tethered_notification_message" msgid="3067108323903048927">"Tocar para configurar"</string>
- <!-- no translation found for throttle_warning_notification_title (4890894267454867276) -->
- <skip />
- <!-- no translation found for throttle_warning_notification_message (2609734763845705708) -->
- <skip />
- <!-- no translation found for throttled_notification_title (6269541897729781332) -->
- <skip />
- <!-- no translation found for throttled_notification_message (4712369856601275146) -->
- <skip />
+ <string name="throttle_warning_notification_title" msgid="4890894267454867276">"Utilização elevada de dados móveis"</string>
+ <string name="throttle_warning_notification_message" msgid="2609734763845705708">"Toque para saber mais sobre a utilização de dados móveis"</string>
+ <string name="throttled_notification_title" msgid="6269541897729781332">"Limite de dados móveis excedido"</string>
+ <string name="throttled_notification_message" msgid="4712369856601275146">"Toque para saber mais sobre a utilização de dados móveis"</string>
</resources>
diff --git a/core/res/res/values-pt/strings.xml b/core/res/res/values-pt/strings.xml
index 79daeec..92bf56c 100644
--- a/core/res/res/values-pt/strings.xml
+++ b/core/res/res/values-pt/strings.xml
@@ -134,8 +134,7 @@
<string name="power_off" msgid="4266614107412865048">"Desligar"</string>
<string name="shutdown_progress" msgid="2281079257329981203">"Encerrando…"</string>
<string name="shutdown_confirm" msgid="649792175242821353">"O seu telefone será desligado."</string>
- <!-- no translation found for recent_tasks_title (3691764623638127888) -->
- <skip />
+ <string name="recent_tasks_title" msgid="3691764623638127888">"Recente"</string>
<string name="no_recent_tasks" msgid="279702952298056674">"Nenhum aplicativo recente."</string>
<string name="global_actions" msgid="2406416831541615258">"Opções do telefone"</string>
<string name="global_action_lock" msgid="2844945191792119712">"Bloquear tela"</string>
@@ -858,12 +857,8 @@
<string name="car_mode_disable_notification_message" msgid="668663626721675614">"Selecione para sair do modo de carro."</string>
<string name="tethered_notification_title" msgid="8146103971290167718">"Vínculo ativo"</string>
<string name="tethered_notification_message" msgid="3067108323903048927">"Toque para configurar"</string>
- <!-- no translation found for throttle_warning_notification_title (4890894267454867276) -->
- <skip />
- <!-- no translation found for throttle_warning_notification_message (2609734763845705708) -->
- <skip />
- <!-- no translation found for throttled_notification_title (6269541897729781332) -->
- <skip />
- <!-- no translation found for throttled_notification_message (4712369856601275146) -->
- <skip />
+ <string name="throttle_warning_notification_title" msgid="4890894267454867276">"Alto uso de dados do celular"</string>
+ <string name="throttle_warning_notification_message" msgid="2609734763845705708">"Toque para saber mais sobre uso de dados do celular"</string>
+ <string name="throttled_notification_title" msgid="6269541897729781332">"Limite de dados do celular excedido"</string>
+ <string name="throttled_notification_message" msgid="4712369856601275146">"Toque para saber mais sobre o uso de dados do celular"</string>
</resources>
diff --git a/core/res/res/values-ru/strings.xml b/core/res/res/values-ru/strings.xml
index 98f52548..abc726c 100644
--- a/core/res/res/values-ru/strings.xml
+++ b/core/res/res/values-ru/strings.xml
@@ -134,8 +134,7 @@
<string name="power_off" msgid="4266614107412865048">"Выключение"</string>
<string name="shutdown_progress" msgid="2281079257329981203">"Выключение..."</string>
<string name="shutdown_confirm" msgid="649792175242821353">"Телефон будет выключен."</string>
- <!-- no translation found for recent_tasks_title (3691764623638127888) -->
- <skip />
+ <string name="recent_tasks_title" msgid="3691764623638127888">"Недавние"</string>
<string name="no_recent_tasks" msgid="279702952298056674">"Нет последних приложений."</string>
<string name="global_actions" msgid="2406416831541615258">"Параметры телефона"</string>
<string name="global_action_lock" msgid="2844945191792119712">"Блокировка экрана"</string>
@@ -537,7 +536,7 @@
<string name="lockscreen_instructions_when_pattern_enabled" msgid="46154051614126049">"Нажмите \"Меню\", чтобы разблокировать экран или вызвать службу экстренной помощи."</string>
<string name="lockscreen_instructions_when_pattern_disabled" msgid="686260028797158364">"Для разблокировки нажмите \"Меню\"."</string>
<string name="lockscreen_pattern_instructions" msgid="7478703254964810302">"Для разблокировки введите графический ключ"</string>
- <string name="lockscreen_emergency_call" msgid="5347633784401285225">"Вызов службы экстренной помощи"</string>
+ <string name="lockscreen_emergency_call" msgid="5347633784401285225">"Экстренный вызов"</string>
<string name="lockscreen_return_to_call" msgid="5244259785500040021">"Вернуться к вызову"</string>
<string name="lockscreen_pattern_correct" msgid="9039008650362261237">"Правильно!"</string>
<string name="lockscreen_pattern_wrong" msgid="4817583279053112312">"Повторите попытку"</string>
@@ -548,7 +547,7 @@
<string name="lockscreen_missing_sim_message_short" msgid="7381499217732227295">"Нет SIM-карты."</string>
<string name="lockscreen_missing_sim_message" msgid="2186920585695169078">"SIM-карта не установлена."</string>
<string name="lockscreen_missing_sim_instructions" msgid="8874620818937719067">"Вставьте SIM-карту."</string>
- <string name="emergency_calls_only" msgid="6733978304386365407">"Только вызовы экстренных служб"</string>
+ <string name="emergency_calls_only" msgid="6733978304386365407">"Только экстренный вызов"</string>
<string name="lockscreen_network_locked_message" msgid="143389224986028501">"Сеть заблокирована"</string>
<string name="lockscreen_sim_puk_locked_message" msgid="7441797339976230">"SIM-карта заблокирована с помощью кода PUK."</string>
<string name="lockscreen_sim_puk_locked_instructions" msgid="635967534992394321">"См. руководство пользователя или свяжитесь со службой поддержки."</string>
@@ -756,7 +755,7 @@
<string name="volume_notification" msgid="2422265656744276715">"Громкость уведомления"</string>
<string name="volume_unknown" msgid="1400219669770445902">"Громкость"</string>
<string name="ringtone_default" msgid="3789758980357696936">"Мелодия по умолчанию"</string>
- <string name="ringtone_default_with_actual" msgid="8129563480895990372">"Мелодия по умолчанию (<xliff:g id="ACTUAL_RINGTONE">%1$s</xliff:g>)"</string>
+ <string name="ringtone_default_with_actual" msgid="8129563480895990372">"По умолчанию (<xliff:g id="ACTUAL_RINGTONE">%1$s</xliff:g>)"</string>
<string name="ringtone_silent" msgid="4440324407807468713">"Без звука"</string>
<string name="ringtone_picker_title" msgid="3515143939175119094">"Мелодии"</string>
<string name="ringtone_unknown" msgid="5477919988701784788">"Неизвестная мелодия"</string>
@@ -858,12 +857,8 @@
<string name="car_mode_disable_notification_message" msgid="668663626721675614">"Выберите для выхода из режима громкой связи."</string>
<string name="tethered_notification_title" msgid="8146103971290167718">"Подключение активно"</string>
<string name="tethered_notification_message" msgid="3067108323903048927">"Нажмите для настройки"</string>
- <!-- no translation found for throttle_warning_notification_title (4890894267454867276) -->
- <skip />
- <!-- no translation found for throttle_warning_notification_message (2609734763845705708) -->
- <skip />
- <!-- no translation found for throttled_notification_title (6269541897729781332) -->
- <skip />
- <!-- no translation found for throttled_notification_message (4712369856601275146) -->
- <skip />
+ <string name="throttle_warning_notification_title" msgid="4890894267454867276">"Активная передача данных"</string>
+ <string name="throttle_warning_notification_message" msgid="2609734763845705708">"Нажмите, чтобы узнать больше о мобильной передаче данных"</string>
+ <string name="throttled_notification_title" msgid="6269541897729781332">"Превышен лимит на мобильные данные"</string>
+ <string name="throttled_notification_message" msgid="4712369856601275146">"Нажмите, чтобы узнать больше о мобильной передаче данных"</string>
</resources>
diff --git a/core/res/res/values-sv/strings.xml b/core/res/res/values-sv/strings.xml
index 9d8534f..2fefa21 100644
--- a/core/res/res/values-sv/strings.xml
+++ b/core/res/res/values-sv/strings.xml
@@ -134,8 +134,7 @@
<string name="power_off" msgid="4266614107412865048">"Stäng av"</string>
<string name="shutdown_progress" msgid="2281079257329981203">"Avslutar…"</string>
<string name="shutdown_confirm" msgid="649792175242821353">"Din telefon stängs av."</string>
- <!-- no translation found for recent_tasks_title (3691764623638127888) -->
- <skip />
+ <string name="recent_tasks_title" msgid="3691764623638127888">"Senaste"</string>
<string name="no_recent_tasks" msgid="279702952298056674">"Inga nya program."</string>
<string name="global_actions" msgid="2406416831541615258">"Telefonalternativ"</string>
<string name="global_action_lock" msgid="2844945191792119712">"Skärmlås"</string>
@@ -858,12 +857,8 @@
<string name="car_mode_disable_notification_message" msgid="668663626721675614">"Välj om du vill avsluta billäge."</string>
<string name="tethered_notification_title" msgid="8146103971290167718">"Aktiv sammanlänkning"</string>
<string name="tethered_notification_message" msgid="3067108323903048927">"Tryck om du vill konfigurera"</string>
- <!-- no translation found for throttle_warning_notification_title (4890894267454867276) -->
- <skip />
- <!-- no translation found for throttle_warning_notification_message (2609734763845705708) -->
- <skip />
- <!-- no translation found for throttled_notification_title (6269541897729781332) -->
- <skip />
- <!-- no translation found for throttled_notification_message (4712369856601275146) -->
- <skip />
+ <string name="throttle_warning_notification_title" msgid="4890894267454867276">"Hög mobildataanvändning"</string>
+ <string name="throttle_warning_notification_message" msgid="2609734763845705708">"Tryck om du vill veta mer om mobildataanvändning"</string>
+ <string name="throttled_notification_title" msgid="6269541897729781332">"Gränsen för mobildata har överskridits"</string>
+ <string name="throttled_notification_message" msgid="4712369856601275146">"Tryck om du vill veta mer om mobildataanvändning"</string>
</resources>
diff --git a/core/res/res/values-tr/strings.xml b/core/res/res/values-tr/strings.xml
index 50c0c12..7066cb0 100644
--- a/core/res/res/values-tr/strings.xml
+++ b/core/res/res/values-tr/strings.xml
@@ -134,8 +134,7 @@
<string name="power_off" msgid="4266614107412865048">"Kapat"</string>
<string name="shutdown_progress" msgid="2281079257329981203">"Kapanıyor…"</string>
<string name="shutdown_confirm" msgid="649792175242821353">"Telefonunuz kapanacak."</string>
- <!-- no translation found for recent_tasks_title (3691764623638127888) -->
- <skip />
+ <string name="recent_tasks_title" msgid="3691764623638127888">"En Son Görevler"</string>
<string name="no_recent_tasks" msgid="279702952298056674">"Hiçbir yeni uygulama yok."</string>
<string name="global_actions" msgid="2406416831541615258">"Telefon seçenekleri"</string>
<string name="global_action_lock" msgid="2844945191792119712">"Ekran kilidi"</string>
@@ -858,12 +857,8 @@
<string name="car_mode_disable_notification_message" msgid="668663626721675614">"Araba modundan çıkmak için seçin."</string>
<string name="tethered_notification_title" msgid="8146103971290167718">"Bağlantı etkin"</string>
<string name="tethered_notification_message" msgid="3067108323903048927">"Yapılandırmak için dokunun"</string>
- <!-- no translation found for throttle_warning_notification_title (4890894267454867276) -->
- <skip />
- <!-- no translation found for throttle_warning_notification_message (2609734763845705708) -->
- <skip />
- <!-- no translation found for throttled_notification_title (6269541897729781332) -->
- <skip />
- <!-- no translation found for throttled_notification_message (4712369856601275146) -->
- <skip />
+ <string name="throttle_warning_notification_title" msgid="4890894267454867276">"Yüksek düzeyde mobil veri kullanımı"</string>
+ <string name="throttle_warning_notification_message" msgid="2609734763845705708">"Mobil veri kullanımı hakkında daha fazla bilgi edinmek için dokunun"</string>
+ <string name="throttled_notification_title" msgid="6269541897729781332">"Mobil veri limiti aşıldı"</string>
+ <string name="throttled_notification_message" msgid="4712369856601275146">"Mobil veri kullanımı hakkında daha fazla bilgi edinmek için dokunun"</string>
</resources>
diff --git a/core/res/res/values-zh-rCN/strings.xml b/core/res/res/values-zh-rCN/strings.xml
index 78b87e8..455429c 100644
--- a/core/res/res/values-zh-rCN/strings.xml
+++ b/core/res/res/values-zh-rCN/strings.xml
@@ -134,8 +134,7 @@
<string name="power_off" msgid="4266614107412865048">"关机"</string>
<string name="shutdown_progress" msgid="2281079257329981203">"正在关机..."</string>
<string name="shutdown_confirm" msgid="649792175242821353">"您的手机会关机。"</string>
- <!-- no translation found for recent_tasks_title (3691764623638127888) -->
- <skip />
+ <string name="recent_tasks_title" msgid="3691764623638127888">"近期任务"</string>
<string name="no_recent_tasks" msgid="279702952298056674">"没有最近的应用程序。"</string>
<string name="global_actions" msgid="2406416831541615258">"手机选项"</string>
<string name="global_action_lock" msgid="2844945191792119712">"屏幕锁定"</string>
@@ -858,12 +857,8 @@
<string name="car_mode_disable_notification_message" msgid="668663626721675614">"选择退出车载模式"</string>
<string name="tethered_notification_title" msgid="8146103971290167718">"绑定生效"</string>
<string name="tethered_notification_message" msgid="3067108323903048927">"触摸可进行配置"</string>
- <!-- no translation found for throttle_warning_notification_title (4890894267454867276) -->
- <skip />
- <!-- no translation found for throttle_warning_notification_message (2609734763845705708) -->
- <skip />
- <!-- no translation found for throttled_notification_title (6269541897729781332) -->
- <skip />
- <!-- no translation found for throttled_notification_message (4712369856601275146) -->
- <skip />
+ <string name="throttle_warning_notification_title" msgid="4890894267454867276">"手机数据使用过多"</string>
+ <string name="throttle_warning_notification_message" msgid="2609734763845705708">"轻触以了解有关手机数据使用的详情"</string>
+ <string name="throttled_notification_title" msgid="6269541897729781332">"已超出手机数据上限"</string>
+ <string name="throttled_notification_message" msgid="4712369856601275146">"轻触以了解有关手机数据使用的详情"</string>
</resources>
diff --git a/core/res/res/values-zh-rTW/strings.xml b/core/res/res/values-zh-rTW/strings.xml
index 1df18fa..1424b51 100644
--- a/core/res/res/values-zh-rTW/strings.xml
+++ b/core/res/res/values-zh-rTW/strings.xml
@@ -134,8 +134,7 @@
<string name="power_off" msgid="4266614107412865048">"關機"</string>
<string name="shutdown_progress" msgid="2281079257329981203">"關機中..."</string>
<string name="shutdown_confirm" msgid="649792175242821353">"手機即將關機。"</string>
- <!-- no translation found for recent_tasks_title (3691764623638127888) -->
- <skip />
+ <string name="recent_tasks_title" msgid="3691764623638127888">"最新的"</string>
<string name="no_recent_tasks" msgid="279702952298056674">"最近沒有存取應用程式。"</string>
<string name="global_actions" msgid="2406416831541615258">"電話選項"</string>
<string name="global_action_lock" msgid="2844945191792119712">"螢幕鎖定"</string>
@@ -858,12 +857,8 @@
<string name="car_mode_disable_notification_message" msgid="668663626721675614">"選取結束車用模式。"</string>
<string name="tethered_notification_title" msgid="8146103971290167718">"啟用數據連線"</string>
<string name="tethered_notification_message" msgid="3067108323903048927">"輕觸以設定"</string>
- <!-- no translation found for throttle_warning_notification_title (4890894267454867276) -->
- <skip />
- <!-- no translation found for throttle_warning_notification_message (2609734763845705708) -->
- <skip />
- <!-- no translation found for throttled_notification_title (6269541897729781332) -->
- <skip />
- <!-- no translation found for throttled_notification_message (4712369856601275146) -->
- <skip />
+ <string name="throttle_warning_notification_title" msgid="4890894267454867276">"高行動資料用量"</string>
+ <string name="throttle_warning_notification_message" msgid="2609734763845705708">"輕觸即可瞭解更多有關行動資料用量的詳細資訊"</string>
+ <string name="throttled_notification_title" msgid="6269541897729781332">"已達行動資料上限"</string>
+ <string name="throttled_notification_message" msgid="4712369856601275146">"輕觸即可瞭解更多有關行動資料用量的詳細資訊"</string>
</resources>
diff --git a/docs/html/guide/developing/tools/bmgr.jd b/docs/html/guide/developing/tools/bmgr.jd
index 0353b77..2f49532 100644
--- a/docs/html/guide/developing/tools/bmgr.jd
+++ b/docs/html/guide/developing/tools/bmgr.jd
@@ -6,15 +6,13 @@
<div id="qv-wrapper">
<div id="qv">
<h2>bmgr quickview</h2>
-<p><code>bmgr</code> lets you inspect and control the backup/restore system on an Android device.
+<p><code>bmgr</code> lets you control the backup/restore system on an Android device.
<h2>In this document</h2>
<ol>
-<li><a href="#transports">About backup transports</a></li>
-<li><a href="#restoresets">About restore sets</a></li>
-<li><a href="#backup">Forcing a backup operation</a></li>
-<li><a href="#restore">Forcing a restore operation</a></li>
-<li><a href="#other">Other commands</a></li>
+<li><a href="#backup">Forcing a Backup Operation</a></li>
+<li><a href="#restore">Forcing a Restore Operation</a></li>
+<li><a href="#other">Other Commands</a></li>
</ol>
</div>
@@ -22,144 +20,159 @@
<!-- normal page content here -->
-<p><code>bmgr</code> is a shell tool that developers can use to interact with the Backup Manager
-on Android devices supporting API version 8 or later. It provides commands for inducing backup
-and restore operations on demand so that you do not need to repeatedly wipe data or take similar
-intrusive steps to test the operation of an application's backup agent. These commands are
+<p><code>bmgr</code> is a shell tool you can use to interact with the Backup Manager
+on Android devices supporting API Level 8 or greater. It provides commands to induce backup
+and restore operations so that you don't need to repeatedly wipe data or take similar
+intrusive steps in order to test your application's backup agent. These commands are
accessed via the <a href="{@docRoot}guide/developing/tools/adb.html">adb</a> shell.
-<p>There are a couple of basic concepts used by the Backup Manager that are built into the way
-that <code>bmgr</code> operates. These are <a href="#transports">backup transports</a> and
-<a href="#restoresets">restore sets</a>.
-<a name="transports"></a>
-<h2>About backup transports</h2>
+<h2 id="backup">Forcing a Backup Operation</h2>
-<p>A <em>backup transport</em> is the code module responsible for moving backup and restore data
+<p>Normally, your application must notify the Backup Manager when its data has changed, via {@link
+android.app.backup.BackupManager#dataChanged()}. The Backup Manager will then invoke your
+backup agent's {@link
+android.app.backup.BackupAgent#onBackup(ParcelFileDescriptor,BackupDataOutput,ParcelFileDescriptor)
+onBackup()} implementation at some time in the future. However, instead of calling {@link
+android.app.backup.BackupManager#dataChanged()}, you can invoke a backup request from the command
+line by running the <code>bmgr backup</code> command:
+
+ <pre class="no-pretty-print">adb shell bmgr backup <em><package></em></pre>
+
+<p><code><em><package></em></code> is the formal package name of the application you wish to
+schedule for
+backup. When you execute this backup command, your application's backup agent will be invoked to
+perform a backup operation at some time in the future (via your {@link
+android.app.backup.BackupAgent#onBackup(ParcelFileDescriptor,BackupDataOutput,ParcelFileDescriptor)
+onBackup()} method), though there is no guarantee when it will occur. However, you can force all
+pending backup operations to run immediately by using the <code>bmgr run</code> command:
+
+ <pre class="no-pretty-print">adb shell bmgr run</pre>
+
+<p>This causes a backup pass to execute immediately, invoking the backup agents of all applications
+that had previously called {@link android.app.backup.BackupManager#dataChanged()} since the
+last backup operation, plus any applications which had been manually scheduled for
+backup via <code>bmgr backup</code>.
+
+
+
+<h2 id="restore">Forcing a Restore Operation</h2>
+
+<p>Unlike backup operations, which are batched together and run on an occasional basis, restore
+operations execute immediately. The Backup Manager currently provides two kinds of restore
+operations. The first kind restores an entire device with the data that has been backed up. This
+is typically performed only when a device is first provisioned (to replicate settings and other
+saved state from the user's previous device) and is an operation that only the system can
+perform. The second kind of restore operation restores
+a single application to its "active" data set; that is, the application will abandon its current
+data and revert to the last-known-good data that is held in the current backup image. You can
+invoke this second restore operation with the {@link
+android.app.backup.BackupManager#requestRestore(RestoreObserver) requestRestore()} method. The
+Backup Manager will then invoke your backup agent's {@link
+android.app.backup.BackupAgent#onRestore(BackupDataInput,int,ParcelFileDescriptor)
+onRestore()} implementation.
+
+<p>While testing your application, you can immediately invoke the restore operation (bypassing the
+{@link android.app.backup.BackupManager#requestRestore(RestoreObserver) requestRestore()} method)
+for your application by using the <code>bmgr restore</code> command:
+
+ <pre class="no-pretty-print">adb shell bmgr restore <em><package></em></pre>
+
+<p><code><em><package></em></code> is the formal Java-style package name of the application
+participating in the backup/restore mechanism, which you would like to restore. The Backup
+Manager will immediately instantiate the application's backup agent and invoke it for restore. This
+will happen even if your application is not currently running.
+
+
+
+
+
+<h2 id="other">Other Commands</h2>
+
+<p>The data for a single application can be erased from the active data set on demand. This is
+very useful while you're developing a backup agent, in case bugs lead you to write corrupt data
+or saved state information. You can wipe an application's data with the <code>bmgr wipe</code>
+command:
+
+ <pre class="no-pretty-print">adb shell bmgr wipe <em><package></em></pre>
+
+<p><code><em><package></em></code> is the formal package name of the application whose data
+you wish to
+erase. The next backup operation that the application's agent processes will look as
+though the application had never backed anything up before.
+
+<p>You can see whether the Backup Manager is operational at all with the <code>bmgr
+enabled</code> command:
+
+ <pre class="no-pretty-print">adb shell bmgr enabled</pre>
+
+<p>This might be useful if your application's backup agent is never being invoked for backup, to
+verify whether the operating system thinks it should be performing such operations at all.</p>
+
+<p>You can also directly disable or enable the Backup Manager with this command:
+
+ <pre class="no-pretty-print">adb shell bmgr enable <em><boolean></em></pre>
+
+<p><code><em><boolean></em></code> is either <code>true</code> or <code>false</code>.
+This is equivalent to disabling or enabling backup in the device's main Settings UI.</p>
+
+<p class="warning"><strong>Warning!</strong> When backup is disabled, the current backup transport
+will explicitly wipe
+the entire active data set from its backend storage. This is so that when a user says
+they do <em>not</em> want their data backed up, the Backup Manager respects that wish. No further
+data will be saved from the device, and no restore operations will be possible, unless the Backup
+Manager is re-enabled (either through Settings or through the above <code>bmgr</code> command).
+
+
+
+
+<!-- The following is not useful to applications, but may be some useful information some day...
+
+
+<h2 id="transports">Applying a Backup Transport</h2>
+
+<p>A "backup transport" is the code module responsible for moving backup and restore data
to and from some storage location. A device can have multipe transports installed, though only
one is active at any given time. Transports are identified by name. You can see what
transports are available on your device or emulator by running the
<code>bmgr list transports</code> command:
- <pre>adb shell bmgr list transports</pre>
+ <pre class="no-pretty-print">adb shell bmgr list transports</pre>
<p>The output of this command is a list of the transports available on the device. The currently
active transport is flagged with a <code>*</code> character. Transport names may look like
-component names -- for example, <code>android/com.android.internal.backup.LocalTransport</code> --
+component names (for example, <code>android/com.android.internal.backup.LocalTransport</code>),
but they need not be, and the strings are never used as direct class references. The use of
a component-like naming scheme is simply for purposes of preventing name collisions.
<p>You can change which transport is currently active from the command line as well:
- <pre>adb shell bmgr transport NAME</pre>
+ <pre class="no-pretty-print">adb shell bmgr transport <em><name></em></pre>
-<p>where <code>NAME</code> is one of the names as printed by the <code>bmgr list transports</code>
+<p><code><em><name></em></code> is one of the names as printed by the <code>bmgr list
+transports</code>
command. From this point forward, backup and restore operations will be directed through the
newly-selected transport. Backup state tracking is managed separately for each transport, so
switching back and forth between them will not corrupt the saved state.
-<a name="restoresets"></a>
-<h2>About restore sets</h2>
-
-<p>All of the application data that a device has written to a given backup transport is tracked
-together, and is collectively sometimes called a <em>restore set,</em> because the typical use
-of the data set is during restore operations. Each time a device is initially provisioned, a
-new data set is established. The user can get a listing of all the data sets that can be
-restored through the current transport by running this shell command:
-
- <pre>adb shell bmgr list sets</pre>
-
-<p>The output is listing of available restore sets, one per line. The first item on each line is
-a <em>token,</em> a number in hexadecimal that identifies the restore set to the transport. After
-that is a string that may provide some brief identifying information about the restore set. Only
-the token is actually used within the backup and restore mechanism.
-<a name="backup"></a>
-<h2>Forcing a backup operation</h2>
+<h2 id="restoresets">Viewing Restore Sets</h2>
-<p>Normally, applications notify the backup manager directly that their data has changed, in
-response to which the backup manager will make sure to invoke that application's agent when the
-next backup operation is run. You can simulate this manually from the command line if you wish,
-by running this shell command:
+<p>All of the application data that a device has written to its backup transport is tracked
+as a group that is collectively called a "restore set," because each data set is
+most often manipulated during a restore operation. When a device is provisioned for the first
+time, a new restore set is established. You can get a listing of all the restore sets available to
+the current transport by running the <code>bmgr list sets</code> command:
- <pre>adb shell bmgr backup PACKAGE</pre>
+ <pre class="no-pretty-print">adb shell bmgr list sets</pre>
-<p><code>PACKAGE</code> is the formal package name of the application you wish to schedule for
-backup. At this point you know that the application's agent will be invoked for backup at some
-point in the future, though there is no hard guarantee of when that will occur. You can force
-all pending backup operations to run immediately by using the following command:
-
- <pre>adb shell bmgr run</pre>
-
-<p>This causes a backup pass to execute immediately, invoking the agents of all applications that
-had called <code>BackupManager.dataChanged()</code> since the time of the last backup operation,
-plus any applications which had been manually scheduled for backup via
-<code>bmgr backup PACKAGE</code>.
+<p>The output is a listing of available restore sets, one per line. The first item on each line is
+a token (a hexadecimal value that identifies the restore set to the transport). Following
+the token is a string that briefly identifies the restore set.
+Only the token is used within the backup and restore mechanism.
-<a name="restore"></a>
-<h2>Forcing a restore operation</h2>
-
-<p>Unlike backup operations, which are batched together and run on an occasional basis, restore
-operations execute immediately. The backup manager currently provides two kinds of restore
-operations. The first restores an entire device with the data from a given restore set. This
-is typically only performed when a device is first provisioned, to replicate settings and other
-such saved state from the user's previous device. The second kind of restore operation restores
-a single application from the <em>active</em> data set; that is, from the data set currently
-being written to by backup operations. This second form is available as part of the public API.
-It allows applications to abandon their current data and revert to the last-known-good data as
-represented in their current backup image.
-
-<p>A full-system restore operation can be initiated with this shell command:
-
- <pre>adb shell bmgr restore TOKEN</pre>
-
-<p>where <code>TOKEN</code> is the desired restore set's token as printed out by the <code>bmgr
-list sets</code> command. <strong>Warning!</strong> This operation will <em>replace</em> the
-data of all backup-enabled applications with the contents of the given restore set. Be careful,
-and be aware of the potential consequences.
-
-<p>A single-application restore operation does not reference a restore set token; it always uses
-the data from the currently active data set. You can induce such an operation from the command
-line like this:
-
- <pre>adb shell bmgr restore PACKAGE</pre>
-
-<p><code>PACKAGE</code> is the formal package name of an application that is participating in the
-backup/restore mechanism. The backup manager will immediately instantiate the application's
-agent and invoke it for restore.
-
-<a name="other"></a>
-<h2>Other commands</h2>
-
-<p>The data for a single application can be erased from the active data set on demand. This is
-very useful during development of backup agents, in case bugs lead you to write corrupt data
-or saved state information. The shell command for wiping an application's data is this:
-
- <pre>adb shell bmgr wipe PACKAGE</pre>
-
-<p><code>PACKAGE</code> is the formal package name of the application whose data you wish to
-erase. The next backup operation that the application's agent processes will look as
-though the application had never backed anything up before.
-
-<p>You can see whether the backup manager is operational at all by running this command:
-
- <pre>adb shell bmgr enabled</pre>
-
-<p>This might be useful if your application's agent is never being invoked for backup, to verify
-whether the operating system thinks it should be performing such operations at all. You can also
-directly disable or enable the backup manager with this command:
-
- <pre>adb shell bmgr enable BOOLEAN</pre>
-
-<p>where <code>BOOLEAN</code> is either <code>true</code> or <code>false</code>. This is
-equivalent to disabling or enabling backup in the device's main Settings UI.
-<strong>Warning!</strong> When backup is disabled, the current transport will explicitly wipe
-the entire active data set from its backend storage. This is so that when a user says that no,
-they do not want their data backed up, the backup manager respects that wish. No further data
-will be saved from the device, and no restore operations will be possible, unless the backup
-manager is re-enabled (either through Settings or through the above <code>bmgr</code> command).
-
+-->
diff --git a/docs/html/guide/guide_toc.cs b/docs/html/guide/guide_toc.cs
index 269e807..8f66bdd 100644
--- a/docs/html/guide/guide_toc.cs
+++ b/docs/html/guide/guide_toc.cs
@@ -282,7 +282,8 @@
<!--<li><a href="<?cs var:toroot ?>guide/developing/tools/adt.html">ADT Plugin</a></li>-->
<li><a href="<?cs var:toroot ?>guide/developing/tools/aidl.html">aidl</a></li>
<li><a href="<?cs var:toroot ?>guide/developing/tools/avd.html">AVDs</a></li>
- <li><a href="<?cs var:toroot ?>guide/developing/tools/bmgr.html">bmgr</a></li>
+ <li><a href="<?cs var:toroot ?>guide/developing/tools/bmgr.html">bmgr</a>
+ <span class="new">new!</span></li>
<li><a href="<?cs var:toroot ?>guide/developing/tools/ddms.html">ddms</a></li>
<li><a href="<?cs var:toroot ?>guide/developing/tools/othertools.html#dx">dx</a></li>
<li><a href="<?cs var:toroot ?>guide/developing/tools/draw9patch.html">Draw 9-Patch</a></li>
diff --git a/docs/html/guide/topics/data/data-storage.jd b/docs/html/guide/topics/data/data-storage.jd
index 0a1ee02..52f1353 100644
--- a/docs/html/guide/topics/data/data-storage.jd
+++ b/docs/html/guide/topics/data/data-storage.jd
@@ -7,18 +7,19 @@
<h2>Storage quickview</h2>
<ul>
- <li>Fast, lightweight storage through system preferences</li>
- <li>File storage to device internal or removable flash</li>
- <li>Arbitrary and structured storage in databases</li>
- <li>Support for network-based storage</li>
+ <li>Use Shared Preferences for primitive data</li>
+ <li>Use internal device storage for private data</li>
+ <li>Use external storage for large data sets that are not private</li>
+ <li>Use SQLite databases for structured storage</li>
</ul>
<h2>In this document</h2>
<ol>
- <li><a href="#pref">Preferences</a></li>
- <li><a href="#files">Files</a></li>
- <li><a href="#db">Databases</a></li>
- <li><a href="#netw">Network</a></li>
+ <li><a href="#pref">Using Shared Preferences</a></li>
+ <li><a href="#filesInternal">Using the Internal Storage</a></li>
+ <li><a href="#filesExternal">Using the External Storage</a></li>
+ <li><a href="#db">Using Databases</a></li>
+ <li><a href="#netw">Using a Network Connection</a></li>
</ol>
<h2>See also</h2>
@@ -29,171 +30,428 @@
</div>
</div>
-<p>
-A typical desktop operating system provides a common file system that any
-application can use to store files that can be read by other
-applications (perhaps with some access control settings). Android uses a
-different system: On Android, all application data (including files) are
-private to that application.
+<p>Android provides several options for you to save persistent application data. The solution you
+choose depends on your specific needs, such as whether the data should be private to your
+application or accessible to other applications (and the user) and how much space your data
+requires.
</p>
-<p>
-However, Android also provides a standard way for an application to expose
-its private data to other applications — through content providers.
-A content provider is an
-optional component of an application that exposes read/write access to the
-application's data, subject to whatever restrictions it might impose.
-Content providers implement a standard syntax for requesting and modifying
-data, and a standard mechanism for reading the returned data. Android supplies
-a number of content providers for standard data types, such as image, audio,
-and video files and personal contact information. For more information on
-using content providers, see a separate document,
-<a href="{@docRoot}guide/topics/providers/content-providers.html">Content Providers</a>.
-</p>
-
-<p>
-Whether or not you want to export your application's data to others,
-you need a way to store it. Android provides the following four mechanisms
-for storing and retrieving data: <a href="#pref">Preferences</a>,
-<a href="#files">Files</a>, <a href="#db">Databases</a>, and <a href="#netw">Network</a>.
+<p>Your data storage options are the following:</p>
+
+<dl>
+ <dt><a href="#pref">Shared Preferences</a></dt>
+ <dd>Store private primitive data in key-value pairs.</dd>
+ <dt><a href="#filesInternal">Internal Storage</a></dt>
+ <dd>Store private data on the device memory.</dd>
+ <dt><a href="#filesExternal">External Storage</a></dt>
+ <dd>Store public data on the shared external storage.</dd>
+ <dt><a href="#db">SQLite Databases</a></dt>
+ <dd>Store structured data in a private database.</dd>
+ <dt><a href="#netw">Network Connection</a></dt>
+ <dd>Store data on the web with your own network server.</dd>
+</dl>
+
+<p>Android provides a way for you to expose even your private data to other applications
+— with a <a href="{@docRoot}guide/topics/providers/content-providers.html">content
+provider</a>. A content provider is an optional component that exposes read/write access to
+your application data, subject to whatever restrictions you want to impose. For more information
+about using content providers, see the
+<a href="{@docRoot}guide/topics/providers/content-providers.html">Content Providers</a>
+documentation.
</p>
-<h2 id="pref">Preferences</h2>
-<p>Preferences is a lightweight mechanism to store and retrieve key-value pairs of primitive
-data types. It is typically used to store application preferences, such as a
-default greeting or a text font to be loaded whenever the application is started. Call
-<code>{@link android.content.Context#getSharedPreferences(java.lang.String,int)
-Context.getSharedPreferences()}</code> to read and write values. Assign a name to
-your set of preferences if you want to share them with other components in the same
-application, or use <code>{@link android.app.Activity#getPreferences(int)
-Activity.getPreferences()}</code> with no name to keep them private to the calling
-activity. You cannot share preferences across applications (except by using a
-content provider).
-</p>
+
+
+<h2 id="pref">Using Shared Preferences</h2>
+
+<p>The {@link android.content.SharedPreferences} class provides a general framework that allows you
+to save and retrieve persistent key-value pairs of primitive data types. You can use {@link
+android.content.SharedPreferences} to save any primitive data: booleans, floats, ints, longs, and
+strings. This data will persist across user sessions (even if your application is killed).</p>
+
+<div class="sidebox-wrapper">
+<div class="sidebox">
+<h3>User Preferences</h3>
+<p>Shared preferences are not strictly for saving "user preferences," such as what ringtone a
+user has chosen. If you're interested in creating user preferences for your application, see {@link
+android.preference.PreferenceActivity}, which provides an Activity framework for you to create
+user preferences, which will be automatically persisted (using shared preferences).</p>
+</div>
+</div>
+
+<p>To get a {@link android.content.SharedPreferences} object for your application, use one of
+two methods:</p>
+<ul>
+ <li>{@link android.content.Context#getSharedPreferences(String,int)
+getSharedPreferences()} - Use this if you need multiple preferences files identified by name,
+which you specify with the first parameter.</li>
+ <li>{@link android.app.Activity#getPreferences(int) getPreferences()} - Use this if you need
+only one preferences file for your Activity. Because this will be the only preferences file
+for your Activity, you don't supply a name.</li>
+</ul>
+
+<p>To write values:</p>
+<ol>
+ <li>Call {@link android.content.SharedPreferences#edit()} to get a {@link
+android.content.SharedPreferences.Editor}.</li>
+ <li>Add values with methods such as {@link
+android.content.SharedPreferences.Editor#putBoolean(String,boolean) putBoolean()} and {@link
+android.content.SharedPreferences.Editor#putString(String,String) putString()}.</li>
+ <li>Commit the new values with {@link android.content.SharedPreferences.Editor#commit()}</li>
+</ol>
+
+<p>To read values, use {@link android.content.SharedPreferences} methods such as {@link
+android.content.SharedPreferences#getBoolean(String,boolean) getBoolean()} and {@link
+android.content.SharedPreferences#getString(String,String) getString()}.</p>
<p>
-Here is an example of setting user preferences for silent keypress mode for a
+Here is an example that saves a preference for silent keypress mode in a
calculator:
</p>
<pre>
-import android.app.Activity;
-import android.content.SharedPreferences;
-
public class Calc extends Activity {
-public static final String PREFS_NAME = "MyPrefsFile";
- . . .
+ public static final String PREFS_NAME = "MyPrefsFile";
@Override
protected void onCreate(Bundle state){
super.onCreate(state);
-
- . . .
-
+ . . .
+
// Restore preferences
SharedPreferences settings = getSharedPreferences(PREFS_NAME, 0);
boolean silent = settings.getBoolean("silentMode", false);
setSilent(silent);
}
-
+
@Override
protected void onStop(){
super.onStop();
-
- // Save user preferences. We need an Editor object to
- // make changes. All objects are from android.context.Context
+
+ // We need an Editor object to make preference changes.
+ // All objects are from android.context.Context
SharedPreferences settings = getSharedPreferences(PREFS_NAME, 0);
SharedPreferences.Editor editor = settings.edit();
editor.putBoolean("silentMode", mSilentMode);
- // Don't forget to commit your edits!!!
+ // Commit the edits!
editor.commit();
}
}
</pre>
-<h2 id="files">Files</h2>
-<p>You can store files directly on the mobile device or on a removable
-storage medium. By default, other applications cannot access these files.
+
+
+<a name="files"></a>
+<h2 id="#filesInternal">Using the Internal Storage</h2>
+
+<p>You can save files directly on the device's internal storage. By default, files saved
+to the internal storage are private to your application and other applications cannot access
+them (nor can the user). When the user uninstalls your application, these files are removed.</p>
+
+<p>To create and write a private file to the internal storage:</p>
+
+<ol>
+ <li>Call {@link android.content.Context#openFileOutput(String,int) openFileOutput()} with the
+name of the file and the operating mode. This returns a {@link java.io.FileOutputStream}.</li>
+ <li>Write to the file with {@link java.io.FileOutputStream#write(byte[]) write()}.</li>
+ <li>Close the stream with {@link java.io.FileOutputStream#close()}.</li>
+</ol>
+
+<p>For example:</p>
+
+<pre>
+String FILENAME = "hello_file";
+String string = "hello world!";
+
+FileOutputStream fos = openFileOutput(FILENAME, Context.MODE_PRIVATE);
+fos.write(string.getBytes());
+fos.close();
+</pre>
+
+<p>{@link android.content.Context#MODE_PRIVATE} will create the file (or replace a file of
+the same name) and make it private to your application. Other modes available are: {@link
+android.content.Context#MODE_APPEND}, {@link
+android.content.Context#MODE_WORLD_READABLE}, and {@link
+android.content.Context#MODE_WORLD_WRITEABLE}.</p>
+
+<p>To read a file from internal storage:</p>
+
+<ol>
+ <li>Call {@link android.content.Context#openFileInput openFileInput()} and pass it the
+name of the file to read. This returns a {@link java.io.FileInputStream}.</li>
+ <li>Read bytes from the file with {@link java.io.FileInputStream#read(byte[],int,int)
+read()}.</li>
+ <li>Then close the stream with {@link java.io.FileInputStream#close()}.</li>
+</ol>
+
+<p class="note"><strong>Tip:</strong> If you want to save a static file in your application at
+compile time, save the file in your project <code>res/raw/</code> directory. You can open it with
+{@link android.content.res.Resources#openRawResource(int) openRawResource()}, passing the {@code
+R.raw.<em><filename></em>} resource ID. This method returns an {@link java.io.InputStream}
+that you can use to read the file (but you cannot write to the original file).
</p>
-<p>
-To read data from a file, call {@link android.content.Context#openFileInput
-Context.openFileInput()} and pass it the local name and path of the file.
-It returns a standard Java {@link java.io.FileInputStream} object. To write
-to a file, call {@link android.content.Context#openFileOutput
-Context.openFileOutput()} with the name and path. It returns a {@link
-java.io.FileOutputStream} object. Calling these methods with name and path
-strings from another application will not work; you can only access local
-files.
-</p>
-<p>
-If you have a static file to package with your application at compile time,
-you can save the file in your project in <code>res/raw/<em>myDataFile</em></code>,
-and then open it with {@link
-android.content.res.Resources#openRawResource(int) Resources.openRawResource
-(R.raw.<em>myDataFile</em>)}. It returns an {@link java.io.InputStream}
-object that you can use to read from the file.
-</p>
+<h3 id="InternalCache">Saving cache files</h3>
-<h2 id="db">Databases</h2>
-<p>The Android API contains support for creating and using SQLite databases.
-Each database is private to the application that creates it.
-</p>
+<p>If you'd like to cache some data, rather than store it persistently, you should use {@link
+android.content.Context#getCacheDir()} to open a {@link
+java.io.File} that represents the internal directory where your application should save
+temporary cache files.</p>
-<p>
-The {@link android.database.sqlite.SQLiteDatabase} object represents a database
-and has methods for interacting with it — making queries and managing the
-data. To create the database, call <code>{@link
-android.database.sqlite.SQLiteDatabase#create SQLiteDatabase.create()}</code>
-and also subclass {@link android.database.sqlite.SQLiteOpenHelper}.
-</p>
+<p>When the device is
+low on internal storage space, Android may delete these cache files to recover space. However, you
+should not rely on the system to clean up these files for you. You should always maintain the cache
+files yourself and stay within a reasonable limit of space consumed, such as 1MB. When the user
+uninstalls your application, these files are removed.</p>
-<p>
-As part of its support for the SQLite database system, Android exposes
-database management functions that let you store complex collections of data
-wrapped into useful objects. For example, Android defines a data type
-for contact information; it consists of many fields including a first and last
-name (strings), an address and phone numbers (also strings), a photo (bitmap
-image), and much other information describing a person.
-</p>
-<p>
-Android ships with the sqlite3 database tool, which enables you to browse
-table contents, run SQL commands, and perform other useful functions on SQLite
-databases. See <a href="{@docRoot}guide/developing/tools/adb.html#sqlite">Examine databases
-(sqlite3)</a> to learn how to run this program.
-</p>
+<h3 id="InternalMethods">Other useful methods</h3>
-<p>
-All databases, SQLite and others, are stored on the device in
-<code>/data/data/<em>package_name</em>/databases</code>.
-</p>
+<dl>
+ <dt>{@link android.content.Context#getFilesDir()}</dt>
+ <dd>Gets the absolute path to the filesystem directory where your internal files are saved.</dd>
+ <dt>{@link android.content.Context#getDir(String,int) getDir()}</dt>
+ <dd>Creates (or opens an existing) directory within your internal storage space.</dd>
+ <dt>{@link android.content.Context#deleteFile(String) deleteFile()}</dt>
+ <dd>Deletes a file saved on the internal storage.</dd>
+ <dt>{@link android.content.Context#fileList()}</dt>
+ <dd>Returns an array of files currently saved by your application.</dd>
+</dl>
-<p>
-Discussion of how many tables to create, what fields they contain, and how
-they are linked, is beyond the scope of this note, but Android does not
-impose any limitations beyond the standard SQLite concepts. We do recommend
+
+
+
+<h2 id="#filesExternal">Using the External Storage</h2>
+
+<p>Every Android-compatible device supports a shared "external storage" that you can use to
+save files. This can be a removable storage media (such as an SD card) or an internal
+(non-removable) storage. Files saved to the external storage are world-readable and can
+be modified by the user when they enable USB mass storage to transfer files on a computer.</p>
+
+<p class="caution"><strong>Caution:</strong> External files can disappear if the user mounts the
+external storage on a computer or removes the media, and there's no security enforced upon files you
+save to the external storage. All applications can read and write files placed on the external
+storage and the user can remove them.</p>
+
+
+<h3>Checking media availability</h3>
+
+<p>Before you do any work with the external storage, you should always call {@link
+android.os.Environment#getExternalStorageState()} to check whether the media is available. The
+media might be mounted to a computer, missing, read-only, or in some other state. For example,
+here's how you can check the availability:</p>
+
+<pre>
+boolean mExternalStorageAvailable = false;
+boolean mExternalStorageWriteable = false;
+String state = Environment.getExternalStorageState();
+
+if (Environment.MEDIA_MOUNTED.equals(state)) {
+ // We can read and write the media
+ mExternalStorageAvailable = mExternalStorageWriteable = true;
+} else if (Environment.MEDIA_MOUNTED_READ_ONLY.equals(state)) {
+ // We can only read the media
+ mExternalStorageAvailable = true;
+ mExternalStorageWriteable = false;
+} else {
+ // Something else is wrong. It may be one of many other states, but all we need
+ // to know is we can neither read nor write
+ mExternalStorageAvailable = mExternalStorageWriteable = false;
+}
+</pre>
+
+<p>This example checks whether the external storage is available to read and write. The
+{@link android.os.Environment#getExternalStorageState()} method returns other states that you
+might want to check, such as whether the media is being shared (connected to a computer), is missing
+entirely, has been removed badly, etc. You can use these to notify the user with more information
+when your application needs to access the media.</p>
+
+
+<h3>Accessing files on external storage</h3>
+
+<p>If you're using API Level 8 or greater, use {@link
+android.content.Context#getExternalFilesDir(String) getExternalFilesDir()} to open a {@link
+java.io.File} that represents the external storage directory where you should save your
+files. This method takes a <code>type</code> parameter that specifies the type of subdirectory you
+want, such as {@link android.os.Environment#DIRECTORY_MUSIC} and
+{@link android.os.Environment#DIRECTORY_RINGTONES} (pass <code>null</code> to receive
+the root of your application's file directory). This method will create the
+appropriate directory if necessary. By specifying the type of directory, you
+ensure that the Android's media scanner will properly categorize your files in the system (for
+example, ringtones are identified as ringtones and not music). If the user uninstalls your
+application, this directory and all its contents will be deleted.</p>
+
+<p>If you're using API Level 7 or lower, use {@link
+android.os.Environment#getExternalStorageDirectory()}, to open a {@link
+java.io.File} representing the root of the external storage. You should then write your data in the
+following directory:</p>
+<pre class="no-pretty-print classic">
+/Android/data/<em><package_name></em>/files/
+</pre>
+<p>The {@code <em><package_name></em>} is your Java-style package name, such as "{@code
+com.example.android.app}". If the user's device is running API Level 8 or greater and they
+uninstall your application, this directory and all its contents will be deleted.</p>
+
+
+<div class="sidebox-wrapper" style="margin-top:3em">
+<div class="sidebox">
+
+<h4>Hiding your files from the Media Scanner</h4>
+
+<p>Include an empty file named {@code .nomedia} in your external files directory (note the dot
+prefix in the filename). This will prevent Android's media scanner from reading your media
+files and including them in apps like Gallery or Music.</p>
+
+</div>
+</div>
+
+
+<h3>Saving files that should be shared</h3>
+
+<p>If you want to save files that are not specific to your application and that should <em>not</em>
+be deleted when your application is uninstalled, save them to one of the public directories on the
+external storage. These directories lay at the root of the external storage, such as {@code
+Music/}, {@code Pictures/}, {@code Ringtones/}, and others.</p>
+
+<p>In API Level 8 or greater, use {@link
+android.os.Environment#getExternalStoragePublicDirectory(String)
+getExternalStoragePublicDirectory()}, passing it the type of public directory you want, such as
+{@link android.os.Environment#DIRECTORY_MUSIC}, {@link android.os.Environment#DIRECTORY_PICTURES},
+{@link android.os.Environment#DIRECTORY_RINGTONES}, or others. This method will create the
+appropriate directory if necessary.</p>
+
+<p>If you're using API Level 7 or lower, use {@link
+android.os.Environment#getExternalStorageDirectory()} to open a {@link java.io.File} that represents
+the root of the external storage, then save your shared files in one of the following
+directories:</p>
+
+<ul class="nolist"></li>
+ <li><code>Music/</code> - Media scanner classifies all media found here as user music.</li>
+ <li><code>Podcasts/</code> - Media scanner classifies all media found here as a podcast.</li>
+ <li><code>Ringtones/ </code> - Media scanner classifies all media found here as a ringtone.</li>
+ <li><code>Alarms/</code> - Media scanner classifies all media found here as an alarm sound.</li>
+ <li><code>Notifications/</code> - Media scanner classifies all media found here as a notification
+sound.</li>
+ <li><code>Pictures/</code> - All photos (excluding those taken with the camera).</li>
+ <li><code>Movies/</code> - All movies (excluding those taken with the camcorder).</li>
+ <li><code>Download/</code> - Miscellaneous downloads.</li>
+</ul>
+
+
+<h3 id="ExternalCache">Saving cache files</h3>
+
+<p>If you're using API Level 8 or greater, use {@link
+android.content.Context#getExternalCacheDir()} to open a {@link java.io.File} that represents the
+external storage directory where you should save cache files. If the user uninstalls your
+application, these files will be automatically deleted. However, during the life of your
+application, you should manage these cache files and remove those that aren't needed in order to
+preserve file space.</p>
+
+<p>If you're using API Level 7 or lower, use {@link
+android.os.Environment#getExternalStorageDirectory()} to open a {@link java.io.File} that represents
+the root of the external storage, then write your cache data in the following directory:</p>
+<pre class="no-pretty-print classic">
+/Android/data/<em><package_name></em>/cache/
+</pre>
+<p>The {@code <em><package_name></em>} is your Java-style package name, such as "{@code
+com.example.android.app}".</p>
+
+
+
+<h2 id="db">Using Databases</h2>
+
+<p>Android provides full support for <a href="http://www.sqlite.org/">SQLite</a> databases.
+Any databases you create will be accessible by name to any
+class in the application, but not outside the application.</p>
+
+<p>The recommended method to create a new SQLite database is to create a subclass of {@link
+android.database.sqlite.SQLiteOpenHelper} and override the {@link
+android.database.sqlite.SQLiteOpenHelper#onCreate(SQLiteDatabase) onCreate()} method, in which you
+can execute a SQLite command to create tables in the database. For example:</p>
+
+<pre>
+public class MyDbOpenHelper extends SQLiteOpenHelper {
+
+ private static final int DATABASE_VERSION = 2;
+ private static final String DICTIONARY_TABLE_NAME = "dictionary";
+ private static final String DICTIONARY_TABLE_CREATE =
+ "CREATE TABLE " + DICTIONARY_TABLE_NAME + " (" +
+ KEY_WORD + " TEXT, " +
+ KEY_DEFINITION + " TEXT);";
+
+ DictionaryOpenHelper(Context context) {
+ super(context, DATABASE_NAME, null, DATABASE_VERSION);
+ }
+
+ @Override
+ public void onCreate(SQLiteDatabase db) {
+ db.execSQL(DICTIONARY_TABLE_CREATE);
+ }
+}
+</pre>
+
+<p>You can then get an instance of your {@link android.database.sqlite.SQLiteOpenHelper}
+implementation using the constructor you've defined. To write to and read from the database, call
+{@link android.database.sqlite.SQLiteOpenHelper#getWritableDatabase()} and {@link
+android.database.sqlite.SQLiteOpenHelper#getReadableDatabase()}, respectively. These both return a
+{@link android.database.sqlite.SQLiteDatabase} object that represents the database and
+provides methods for SQLite operations.</p>
+
+<div class="sidebox-wrapper">
+<div class="sidebox">
+<p>Android does not impose any limitations beyond the standard SQLite concepts. We do recommend
including an autoincrement value key field that can be used as a unique ID to
quickly find a record. This is not required for private data, but if you
-implement a content provider, you must include such a unique ID field. See the
-<a href="{@docRoot}guide/topics/providers/content-providers.html">Content Providers</a>
-document for more information on this field and the NotePadProvider class
-in the NotePad sample code for an example of creating and populating a
-new database. Any databases you create will be accessible by name to any other
-class in the application, but not outside the application.
+implement a <a href="{@docRoot}guide/topics/providers/content-providers.html">content provider</a>,
+you must include a unique ID using the {@link android.provider.BaseColumns#_ID BaseColumns._ID}
+constant.
+</p>
+</div>
+</div>
+
+<p>You can execute SQLite queries using the {@link android.database.sqlite.SQLiteDatabase}
+{@link
+android.database.sqlite.SQLiteDatabase#query(boolean,String,String[],String,String[],String,String,String,String)
+query()} methods, which accept various query parameters, such as the table to query,
+the projection, selection, columns, grouping, and others. For complex queries, such as
+those that require column aliases, you should use
+{@link android.database.sqlite.SQLiteQueryBuilder}, which provides
+several convienent methods for building queries.</p>
+
+<p>Every SQLite query will return a {@link android.database.Cursor} that points to all the rows
+found by the query. The {@link android.database.Cursor} is always the mechanism with which
+you can navigate results from a database query and read rows and columns.</p>
+
+<p>For sample apps that demonstrate how to use SQLite databases in Android, see the
+<a href="{@docRoot}resources/samples/NotePad/index.html">Note Pad</a> and
+<a href="{@docRoot}resources/samples/SearchableDictionary/index.html">Searchable Dictionary</a>
+applications.</p>
+
+
+<h3 id="dbDebugging">Database debugging</h3>
+
+<p>The Android SDK includes a {@code sqlite3} database tool that allows you to browse
+table contents, run SQL commands, and perform other useful functions on SQLite
+databases. See <a href="{@docRoot}guide/developing/tools/adb.html#sqlite">Examining sqlite3
+databases from a remote shell</a> to learn how to run this tool.
</p>
-<h2 id="netw">Network</h2>
-<p>You can also use the network to store and retrieve data (when it's available).
-To do network operations, use the classes in the following packages:</p>
+
+
+
+<h2 id="netw">Using a Network Connection</h2>
+
+<!-- TODO MAKE THIS USEFUL!! -->
+
+<p>You can use the network (when it's available) to store and retrieve data on your own web-based
+services. To do network operations, use classes in the following packages:</p>
<ul class="no-style">
<li><code>{@link java.net java.net.*}</code></li>
<li><code>{@link android.net android.net.*}</code></li>
</ul>
-
diff --git a/services/java/com/android/server/PackageManagerService.java b/services/java/com/android/server/PackageManagerService.java
index 24d645d..ba326d6 100644
--- a/services/java/com/android/server/PackageManagerService.java
+++ b/services/java/com/android/server/PackageManagerService.java
@@ -9553,8 +9553,7 @@
}
if (DEBUG_SD_INSTALL) Log.i(TAG, "Looking for pkg : " + pkgName);
PackageSetting ps = mSettings.mPackages.get(pkgName);
- if (ps != null && ps.codePathString != null &&
- (ps.pkgFlags & ApplicationInfo.FLAG_EXTERNAL_STORAGE) != 0) {
+ if (ps != null && ps.codePathString != null) {
if (DEBUG_SD_INSTALL) Log.i(TAG, "Container : " + cid +
" corresponds to pkg : " + pkgName +
" at code path: " + ps.codePathString);