diff options
32 files changed, 137 insertions, 127 deletions
diff --git a/res/layout/app_percentage_item.xml b/res/layout/app_percentage_item.xml index e5710e4..949999a 100644 --- a/res/layout/app_percentage_item.xml +++ b/res/layout/app_percentage_item.xml @@ -18,8 +18,8 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="?android:attr/listPreferredItemHeight" - android:paddingLeft="@*android:dimen/preference_item_padding_side" - android:paddingRight="@*android:dimen/preference_item_padding_side" + android:paddingLeft="?android:attr/listPreferredItemPaddingLeft" + android:paddingRight="?android:attr/listPreferredItemPaddingRight" android:paddingTop="8dip" android:paddingBottom="8dip" android:columnCount="3"> diff --git a/res/layout/crypt_keeper_status.xml b/res/layout/crypt_keeper_status.xml index b92bbe8..80da437 100644 --- a/res/layout/crypt_keeper_status.xml +++ b/res/layout/crypt_keeper_status.xml @@ -30,7 +30,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentTop="true" - android:layout_alignParentLeft="true" android:layout_marginTop="8dip" android:layout_gravity="center" android:layout_marginBottom="8dip" diff --git a/res/layout/data_usage_cycles.xml b/res/layout/data_usage_cycles.xml index 136fec6..c9647c8 100644 --- a/res/layout/data_usage_cycles.xml +++ b/res/layout/data_usage_cycles.xml @@ -20,8 +20,8 @@ android:layout_height="40dip" android:orientation="horizontal" android:gravity="center_vertical" - android:paddingLeft="@*android:dimen/preference_item_padding_side" - android:paddingRight="@*android:dimen/preference_item_padding_side"> + android:paddingLeft="?android:attr/listPreferredItemPaddingLeft" + android:paddingRight="?android:attr/listPreferredItemPaddingRight"> <TextView android:layout_width="wrap_content" diff --git a/res/layout/data_usage_detail.xml b/res/layout/data_usage_detail.xml index 639fcf5..0ce17d2 100644 --- a/res/layout/data_usage_detail.xml +++ b/res/layout/data_usage_detail.xml @@ -18,20 +18,22 @@ android:id="@+id/app_detail" android:layout_width="match_parent" android:layout_height="wrap_content" - android:orientation="vertical"> + android:orientation="vertical" + android:visibility="gone"> <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginLeft="@*android:dimen/preference_item_padding_side" - android:layout_marginRight="@*android:dimen/preference_item_padding_side" + android:layout_marginLeft="?android:attr/listPreferredItemPaddingLeft" + android:layout_marginRight="?android:attr/listPreferredItemPaddingRight" android:orientation="horizontal"> <LinearLayout android:layout_width="0dip" android:layout_height="wrap_content" android:layout_weight="1" - android:layout_marginRight="@*android:dimen/preference_item_padding_inner" + android:layout_marginTop="8dip" + android:layout_marginRight="8dip" android:orientation="vertical"> <ImageView @@ -82,8 +84,8 @@ android:id="@+id/app_settings" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginLeft="@*android:dimen/preference_item_padding_side" - android:layout_marginRight="@*android:dimen/preference_item_padding_side" + android:layout_marginLeft="?android:attr/listPreferredItemPaddingLeft" + android:layout_marginRight="?android:attr/listPreferredItemPaddingRight" android:layout_marginTop="16dip" android:layout_marginBottom="16dip" android:text="@string/data_usage_app_settings" /> diff --git a/res/layout/data_usage_header.xml b/res/layout/data_usage_header.xml index a7b12b7..619956d 100644 --- a/res/layout/data_usage_header.xml +++ b/res/layout/data_usage_header.xml @@ -41,8 +41,8 @@ android:id="@+id/usage_summary" android:layout_width="match_parent" android:layout_height="wrap_content" - android:paddingLeft="@*android:dimen/preference_item_padding_side" - android:paddingRight="@*android:dimen/preference_item_padding_side" + android:paddingLeft="?android:attr/listPreferredItemPaddingLeft" + android:paddingRight="?android:attr/listPreferredItemPaddingRight" android:paddingTop="8dip" android:paddingBottom="8dip" android:textAppearance="?android:attr/textAppearanceSmall" /> @@ -52,8 +52,8 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:visibility="gone" - android:paddingLeft="@*android:dimen/preference_item_padding_side" - android:paddingRight="@*android:dimen/preference_item_padding_side" + android:paddingLeft="?android:attr/listPreferredItemPaddingLeft" + android:paddingRight="?android:attr/listPreferredItemPaddingRight" android:paddingBottom="8dip" android:text="@string/data_usage_empty" android:textAppearance="?android:attr/textAppearanceSmall" /> diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml index 7012fe9..c3c8ffc 100644 --- a/res/values-af/strings.xml +++ b/res/values-af/strings.xml @@ -1356,10 +1356,8 @@ <string name="credentials_reset_summary" msgid="3369361230171260282">"Verwyder alle sertifikate"</string> <string name="trusted_credentials" msgid="4266945289534242402">"Vertroude eiebewyse"</string> <string name="trusted_credentials_summary" msgid="6735221351155686632">"Wys vertroude CA-sertifikate"</string> - <!-- no translation found for credentials_install_gesture_prompt (2207390278112395082) --> - <skip /> - <!-- no translation found for credentials_install_gesture_explanation (7408921172253634829) --> - <skip /> + <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Teken jou ontsluitpatroon"</string> + <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Jy moet jou ontsluitpatroon teken om eiebewysinstallasie te bevestig."</string> <string name="credentials_unlock" msgid="385427939577366499"></string> <string name="credentials_unlock_hint" msgid="2301301378040499348">"Voer die wagwoord in vir eiebewysberging."</string> <string name="credentials_old_password" msgid="7553393815538684028">"Huidige wagwoord:"</string> diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml index b45c110..747cb92 100644 --- a/res/values-am/strings.xml +++ b/res/values-am/strings.xml @@ -1356,10 +1356,8 @@ <string name="credentials_reset_summary" msgid="3369361230171260282">"ሁሉንም ምስክሮችአስወግድ"</string> <string name="trusted_credentials" msgid="4266945289534242402">"የሚታመን ማስረጃ"</string> <string name="trusted_credentials_summary" msgid="6735221351155686632">"ታማኝ የCA ምስክር አሳይ"</string> - <!-- no translation found for credentials_install_gesture_prompt (2207390278112395082) --> - <skip /> - <!-- no translation found for credentials_install_gesture_explanation (7408921172253634829) --> - <skip /> + <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"የቁልፍ መክፈቻ ስርዓተ ጥለትህን ሳል"</string> + <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"የምስክርነት ጭነት ለማረጋገጥ የመክፈቻ ስርዓተ ጥለትህን መሳል አለብህ።"</string> <string name="credentials_unlock" msgid="385427939577366499"></string> <string name="credentials_unlock_hint" msgid="2301301378040499348">"ለምስክርነት ማረጋገጫ ማከማቻ የይለፍቃልን ተይብ::"</string> <string name="credentials_old_password" msgid="7553393815538684028">"የአሁኑ ይለፍ ቃል፡"</string> diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml index 0f24ba4..6b14d31 100644 --- a/res/values-be/strings.xml +++ b/res/values-be/strings.xml @@ -1356,10 +1356,8 @@ <string name="credentials_reset_summary" msgid="3369361230171260282">"Выдаліць усе сертыфікаты"</string> <string name="trusted_credentials" msgid="4266945289534242402">"Давераныя паўнамоцтвы"</string> <string name="trusted_credentials_summary" msgid="6735221351155686632">"Паказаць правераныя сертыфікаты CA"</string> - <!-- no translation found for credentials_install_gesture_prompt (2207390278112395082) --> - <skip /> - <!-- no translation found for credentials_install_gesture_explanation (7408921172253634829) --> - <skip /> + <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Намалюйце графiчны ключ разблакоўкі"</string> + <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Каб пацвердзіць усталёўку ўлiковых дадзеных, намалюйце графiчны ключ разблакоўкі."</string> <string name="credentials_unlock" msgid="385427939577366499"></string> <string name="credentials_unlock_hint" msgid="2301301378040499348">"Увядзіце пароль для сховішча ўліковых дадзеных."</string> <string name="credentials_old_password" msgid="7553393815538684028">"Бягучы пароль:"</string> diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml index 7e2ca00..fa8dce1 100644 --- a/res/values-ca/strings.xml +++ b/res/values-ca/strings.xml @@ -1356,10 +1356,8 @@ <string name="credentials_reset_summary" msgid="3369361230171260282">"Elimina tots els certificats"</string> <string name="trusted_credentials" msgid="4266945289534242402">"Credencials de confiança"</string> <string name="trusted_credentials_summary" msgid="6735221351155686632">"Mostra certificats de CA de confiança"</string> - <!-- no translation found for credentials_install_gesture_prompt (2207390278112395082) --> - <skip /> - <!-- no translation found for credentials_install_gesture_explanation (7408921172253634829) --> - <skip /> + <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Dibuixa el patró de desbloqueig"</string> + <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Has de dibuixar el teu patró de desbloqueig per confirmar la instal·lació de les credencials."</string> <string name="credentials_unlock" msgid="385427939577366499"></string> <string name="credentials_unlock_hint" msgid="2301301378040499348">"Escriu la contrasenya per a l\'emmagatzematge de credencials."</string> <string name="credentials_old_password" msgid="7553393815538684028">"Contrasenya actual:"</string> diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml index e5aa821..97127a0 100644 --- a/res/values-cs/strings.xml +++ b/res/values-cs/strings.xml @@ -1068,10 +1068,10 @@ <string name="memory" msgid="6609961111091483458">"RAM"</string> <!-- no translation found for service_process_name (4098932168654826656) --> <skip /> - <string name="running_processes_item_description_s_s" msgid="5790575965282023145">"Počet procesů: <xliff:g id="NUMPROCESS">%1$d</xliff:g>; počet služeb: <xliff:g id="NUMSERVICES">%2$d</xliff:g>"</string> - <string name="running_processes_item_description_s_p" msgid="8019860457123222953">"Počet procesů: <xliff:g id="NUMPROCESS">%1$d</xliff:g>; počet služeb: <xliff:g id="NUMSERVICES">%2$d</xliff:g>"</string> - <string name="running_processes_item_description_p_s" msgid="744424668287252915">"Počet procesů: <xliff:g id="NUMPROCESS">%1$d</xliff:g>; počet služeb: <xliff:g id="NUMSERVICES">%2$d</xliff:g>"</string> - <string name="running_processes_item_description_p_p" msgid="1607384595790852782">"Počet procesů: <xliff:g id="NUMPROCESS">%1$d</xliff:g>; počet služeb: <xliff:g id="NUMSERVICES">%2$d</xliff:g>"</string> + <string name="running_processes_item_description_s_s" msgid="5790575965282023145">"procesy: <xliff:g id="NUMPROCESS">%1$d</xliff:g>, služby: <xliff:g id="NUMSERVICES">%2$d</xliff:g>"</string> + <string name="running_processes_item_description_s_p" msgid="8019860457123222953">"procesy: <xliff:g id="NUMPROCESS">%1$d</xliff:g>, služby: <xliff:g id="NUMSERVICES">%2$d</xliff:g>"</string> + <string name="running_processes_item_description_p_s" msgid="744424668287252915">"procesy: <xliff:g id="NUMPROCESS">%1$d</xliff:g>, služby: <xliff:g id="NUMSERVICES">%2$d</xliff:g>"</string> + <string name="running_processes_item_description_p_p" msgid="1607384595790852782">"procesy: <xliff:g id="NUMPROCESS">%1$d</xliff:g>, služby: <xliff:g id="NUMSERVICES">%2$d</xliff:g>"</string> <string name="runningservicedetails_settings_title" msgid="3224004818524731568">"Spuštěná aplikace"</string> <string name="no_services" msgid="7133900764462288263">"Neaktivní"</string> <string name="runningservicedetails_services_title" msgid="391168243725357375">"Služby"</string> @@ -1356,10 +1356,8 @@ <string name="credentials_reset_summary" msgid="3369361230171260282">"Odebrat všechny certifikáty"</string> <string name="trusted_credentials" msgid="4266945289534242402">"Důvěryhodná pověření"</string> <string name="trusted_credentials_summary" msgid="6735221351155686632">"Zobrazit důvěryhodné certifikáty CA"</string> - <!-- no translation found for credentials_install_gesture_prompt (2207390278112395082) --> - <skip /> - <!-- no translation found for credentials_install_gesture_explanation (7408921172253634829) --> - <skip /> + <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Proveďte bezpečnostní gesto"</string> + <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Instalaci pověření je třeba potvrdit provedením bezpečnostního gesta."</string> <string name="credentials_unlock" msgid="385427939577366499"></string> <string name="credentials_unlock_hint" msgid="2301301378040499348">"Zadejte heslo pro úložiště pověření."</string> <string name="credentials_old_password" msgid="7553393815538684028">"Aktuální heslo:"</string> diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml index 4285389..53bb8fc 100644 --- a/res/values-hr/strings.xml +++ b/res/values-hr/strings.xml @@ -1356,10 +1356,8 @@ <string name="credentials_reset_summary" msgid="3369361230171260282">"Uklanjanje svih certifikata"</string> <string name="trusted_credentials" msgid="4266945289534242402">"Pouzdane vjerodajnice"</string> <string name="trusted_credentials_summary" msgid="6735221351155686632">"Prikaz pouzdanih CA certifikata"</string> - <!-- no translation found for credentials_install_gesture_prompt (2207390278112395082) --> - <skip /> - <!-- no translation found for credentials_install_gesture_explanation (7408921172253634829) --> - <skip /> + <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Iscrtajte obrazac za otključavanje"</string> + <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Da biste potvrdili instalaciju vjerodajnica, trebate nacrtati svoj obrazac za otključavanje."</string> <string name="credentials_unlock" msgid="385427939577366499"></string> <string name="credentials_unlock_hint" msgid="2301301378040499348">"Upišite zaporku za pohranu vjerodajnica."</string> <string name="credentials_old_password" msgid="7553393815538684028">"Trenutačna zaporka:"</string> diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml index 6627421..d3e1528 100644 --- a/res/values-hu/strings.xml +++ b/res/values-hu/strings.xml @@ -1356,10 +1356,8 @@ <string name="credentials_reset_summary" msgid="3369361230171260282">"Összes tanúsítvány eltávolítása"</string> <string name="trusted_credentials" msgid="4266945289534242402">"Megbízható hitelesítő adatok"</string> <string name="trusted_credentials_summary" msgid="6735221351155686632">"Megbízható CA tanúsítványok megjelenítése"</string> - <!-- no translation found for credentials_install_gesture_prompt (2207390278112395082) --> - <skip /> - <!-- no translation found for credentials_install_gesture_explanation (7408921172253634829) --> - <skip /> + <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Rajzolja le a feloldási mintát"</string> + <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"A hitelesítési adatok telepítésének megerősítéséhez rajzolja le feloldási mintáját."</string> <string name="credentials_unlock" msgid="385427939577366499"></string> <string name="credentials_unlock_hint" msgid="2301301378040499348">"Írja be az azonosítótároló jelszavát."</string> <string name="credentials_old_password" msgid="7553393815538684028">"Jelenlegi jelszó:"</string> diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml index 2a3e48d..a81a358 100644 --- a/res/values-in/strings.xml +++ b/res/values-in/strings.xml @@ -1356,10 +1356,8 @@ <string name="credentials_reset_summary" msgid="3369361230171260282">"Hapus semua sertifikat"</string> <string name="trusted_credentials" msgid="4266945289534242402">"Kredensial tepercaya"</string> <string name="trusted_credentials_summary" msgid="6735221351155686632">"Tampilkan sertifikat CA tepercaya"</string> - <!-- no translation found for credentials_install_gesture_prompt (2207390278112395082) --> - <skip /> - <!-- no translation found for credentials_install_gesture_explanation (7408921172253634829) --> - <skip /> + <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Gambar pola pembuka kunci Anda"</string> + <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Anda perlu menggambar pola pembuka kunci untuk mengonfirmasi pemasangan kredensial."</string> <string name="credentials_unlock" msgid="385427939577366499"></string> <string name="credentials_unlock_hint" msgid="2301301378040499348">"Ketik sandi untuk penyimpanan kredensial."</string> <string name="credentials_old_password" msgid="7553393815538684028">"Sandi saat ini:"</string> diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml index 91c1c78..0fbc368 100644 --- a/res/values-ko/strings.xml +++ b/res/values-ko/strings.xml @@ -1356,10 +1356,8 @@ <string name="credentials_reset_summary" msgid="3369361230171260282">"모든 인증서 삭제"</string> <string name="trusted_credentials" msgid="4266945289534242402">"신뢰할 수 있는 자격증명"</string> <string name="trusted_credentials_summary" msgid="6735221351155686632">"신뢰할 수 있는 CA 인증서 표시"</string> - <!-- no translation found for credentials_install_gesture_prompt (2207390278112395082) --> - <skip /> - <!-- no translation found for credentials_install_gesture_explanation (7408921172253634829) --> - <skip /> + <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"잠금해제 패턴을 그리세요."</string> + <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"자격증명 설치를 확인하려면 잠금해제 패턴을 그려야 합니다."</string> <string name="credentials_unlock" msgid="385427939577366499"></string> <string name="credentials_unlock_hint" msgid="2301301378040499348">"자격증명 저장소 비밀번호를 입력하세요."</string> <string name="credentials_old_password" msgid="7553393815538684028">"현재 비밀번호:"</string> diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml index 846cd2a..cc54191 100644 --- a/res/values-ms/strings.xml +++ b/res/values-ms/strings.xml @@ -1502,7 +1502,7 @@ <string name="show_screen_updates" msgid="8282711794220426931">"Tunjukkan kms kini skrin"</string> <string name="show_screen_updates_summary" msgid="1716122382094924596">"Kelipkan kawasan skrin apabila ia mengemas kini"</string> <string name="show_hw_screen_updates" msgid="1066779731201521925">"Tunjuk kms kini skrin GPU"</string> - <string name="show_hw_screen_updates_summary" msgid="5280716513731970663">"Denyar kwsn skrin apbl mereka mengemas kini GPU"</string> + <string name="show_hw_screen_updates_summary" msgid="5280716513731970663">"Denyar kwsn skrin apabila mereka kemas kini GPU"</string> <string name="disable_overlays" msgid="3645736086368449005">"Lumpuhkan tindihan atas"</string> <string name="disable_overlays_summary" msgid="7111098018524381234">"Jangan gunakan tindihan atas untuk komposit skrin"</string> <string name="debug_layout" msgid="5981361776594526155">"Tunjukkan batas reka letak"</string> diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml index fb59f91..57c7d88 100644 --- a/res/values-nl/strings.xml +++ b/res/values-nl/strings.xml @@ -1356,10 +1356,8 @@ <string name="credentials_reset_summary" msgid="3369361230171260282">"Alle certificaten verwijderen"</string> <string name="trusted_credentials" msgid="4266945289534242402">"Vertrouwde id-gegevens"</string> <string name="trusted_credentials_summary" msgid="6735221351155686632">"Vertrouwde CA-certificaten weergeven"</string> - <!-- no translation found for credentials_install_gesture_prompt (2207390278112395082) --> - <skip /> - <!-- no translation found for credentials_install_gesture_explanation (7408921172253634829) --> - <skip /> + <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Teken uw ontgrendelingspatroon"</string> + <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"U moet uw ontgrendelingspatroon tekenen om de identificatie-installatie te bevestigen."</string> <string name="credentials_unlock" msgid="385427939577366499"></string> <string name="credentials_unlock_hint" msgid="2301301378040499348">"Typ het wachtwoord voor referentieopslag."</string> <string name="credentials_old_password" msgid="7553393815538684028">"Huidig wachtwoord:"</string> diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml index d3d1207..68e8f6c 100644 --- a/res/values-pt-rPT/strings.xml +++ b/res/values-pt-rPT/strings.xml @@ -1356,10 +1356,8 @@ <string name="credentials_reset_summary" msgid="3369361230171260282">"Remover todos os certificados"</string> <string name="trusted_credentials" msgid="4266945289534242402">"Credenciais fiáveis"</string> <string name="trusted_credentials_summary" msgid="6735221351155686632">"Mostrar certificados da AC fiáveis"</string> - <!-- no translation found for credentials_install_gesture_prompt (2207390278112395082) --> - <skip /> - <!-- no translation found for credentials_install_gesture_explanation (7408921172253634829) --> - <skip /> + <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Desenhe a sua sequência de desbloqueio"</string> + <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"É necessário desenhar a sequência de desbloqueio para confirmar a instalação de credenciais."</string> <string name="credentials_unlock" msgid="385427939577366499"></string> <string name="credentials_unlock_hint" msgid="2301301378040499348">"Introduzir palavra-passe do armazenamento de credenciais."</string> <string name="credentials_old_password" msgid="7553393815538684028">"Palavra-passe actual:"</string> diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml index 8968f75..ad8683b 100644 --- a/res/values-pt/strings.xml +++ b/res/values-pt/strings.xml @@ -1356,10 +1356,8 @@ <string name="credentials_reset_summary" msgid="3369361230171260282">"Remover todos os certificados"</string> <string name="trusted_credentials" msgid="4266945289534242402">"Credenciais confiáveis"</string> <string name="trusted_credentials_summary" msgid="6735221351155686632">"Mostrar certificados CA de confiança"</string> - <!-- no translation found for credentials_install_gesture_prompt (2207390278112395082) --> - <skip /> - <!-- no translation found for credentials_install_gesture_explanation (7408921172253634829) --> - <skip /> + <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Desenhe seu padrão de desbloqueio"</string> + <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"É necessário que você desenhe seu padrão de desbloqueio para confirmar a instalação de credenciais."</string> <string name="credentials_unlock" msgid="385427939577366499"></string> <string name="credentials_unlock_hint" msgid="2301301378040499348">"Digite a senha para o armazenamento de credenciais."</string> <string name="credentials_old_password" msgid="7553393815538684028">"Senha atual:"</string> diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml index 766a7b5..f021797 100644 --- a/res/values-ro/strings.xml +++ b/res/values-ro/strings.xml @@ -592,7 +592,7 @@ <string name="wifi_p2p_menu_rename" msgid="8448896306960060415">"Redenumiţi dispozitivul"</string> <string name="wifi_p2p_peer_devices" msgid="299526878463303432">"Împerecheaţi dispozitivele"</string> <string name="wifi_p2p_failed_connect_message" msgid="8921447388048243547">"Conectarea nu s-a putut realiza."</string> - <string name="wifi_p2p_failed_rename_message" msgid="2562182284946936380">"Redenumirea dispozitivului a eşuat."</string> + <string name="wifi_p2p_failed_rename_message" msgid="2562182284946936380">"Dispozitivul nu a fost redenumit."</string> <string name="wifi_p2p_disconnect_title" msgid="3216846049677448420">"Deconectaţi?"</string> <string name="wifi_p2p_disconnect_message" msgid="8227342771610125771">"Dacă vă deconectaţi, conexiunea cu <xliff:g id="PEER_NAME">%1$s</xliff:g> se va încheia."</string> <string name="wifi_p2p_disconnect_multiple_message" msgid="3283805371034883105">"Dacă vă deconectaţi, conexiunea cu <xliff:g id="PEER_NAME">%1$s</xliff:g> şi cu alte <xliff:g id="PEER_COUNT">%2$s</xliff:g> dispozitive se va încheia."</string> @@ -1506,14 +1506,14 @@ <string name="show_hw_screen_updates_summary" msgid="5280716513731970663">"Iluminează zonele ecranului la actualizarea cu GPU"</string> <string name="disable_overlays" msgid="3645736086368449005">"Dezactivaţi suprapunerile"</string> <string name="disable_overlays_summary" msgid="7111098018524381234">"Nu utilizaţi suprapuneri pt. compunerea ecranului"</string> - <string name="debug_layout" msgid="5981361776594526155">"Afişaţi limite pt. aspect"</string> + <string name="debug_layout" msgid="5981361776594526155">"Afişaţi limite aspect"</string> <string name="debug_layout_summary" msgid="978411395294379156">"Afişaţi informaţii despre limite, spaţiere etc."</string> <string name="show_cpu_usage" msgid="2389212910758076024">"Afişaţi utiliz. procesor."</string> <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Suprap. pe ecran indic. util. curentă a procesor."</string> <string name="force_hw_ui" msgid="6426383462520888732">"Forţaţi redarea cu GPU"</string> <string name="force_hw_ui_summary" msgid="8642000962902609976">"Utilizaţi accelerarea hardware 2D în aplicaţii"</string> <string name="track_frame_time" msgid="6146354853663863443">"Profil redare cu GPU"</string> - <string name="track_frame_time_summary" msgid="447577515813970287">"Măsur. timp de redare în adb shell dumpsys gfxinfo"</string> + <string name="track_frame_time_summary" msgid="447577515813970287">"Măsurare timp redare în adb shell dumpsys gfxinfo"</string> <string name="window_animation_scale_title" msgid="6162587588166114700">"Scara anim. în fereastră"</string> <string name="transition_animation_scale_title" msgid="387527540523595875">"Scară pt. anim. cu tranz."</string> <string name="animator_duration_scale_title" msgid="3406722410819934083">"Scară durată Animator"</string> diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml index 2f6cef2..f717540 100644 --- a/res/values-ru/strings.xml +++ b/res/values-ru/strings.xml @@ -1356,10 +1356,8 @@ <string name="credentials_reset_summary" msgid="3369361230171260282">"Удалить все сертификаты"</string> <string name="trusted_credentials" msgid="4266945289534242402">"Надежные учетные данные"</string> <string name="trusted_credentials_summary" msgid="6735221351155686632">"Показывать надежные сертификаты ЦС"</string> - <!-- no translation found for credentials_install_gesture_prompt (2207390278112395082) --> - <skip /> - <!-- no translation found for credentials_install_gesture_explanation (7408921172253634829) --> - <skip /> + <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Начертите графический ключ"</string> + <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Чтобы подтвердить установку учетных данных, начертите графический ключ."</string> <string name="credentials_unlock" msgid="385427939577366499"></string> <string name="credentials_unlock_hint" msgid="2301301378040499348">"Введите пароль для хранилища учетных данных."</string> <string name="credentials_old_password" msgid="7553393815538684028">"Текущий пароль:"</string> diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml index 899051d..113f8aa 100644 --- a/res/values-sw/strings.xml +++ b/res/values-sw/strings.xml @@ -1346,10 +1346,8 @@ <string name="credentials_reset_summary" msgid="3369361230171260282">"Ondoa vyeti vyote"</string> <string name="trusted_credentials" msgid="4266945289534242402">"Stakabadhi aminifu"</string> <string name="trusted_credentials_summary" msgid="6735221351155686632">"Onyesha vyeti vyako amilifu vya CA"</string> - <!-- no translation found for credentials_install_gesture_prompt (2207390278112395082) --> - <skip /> - <!-- no translation found for credentials_install_gesture_explanation (7408921172253634829) --> - <skip /> + <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Chora mchoro wako wa kufungua"</string> + <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Unahitaji kuchora mchoro wako wa kufungua ili kuthibitisha usakinishaji wa hati tambulishi."</string> <string name="credentials_unlock" msgid="385427939577366499"></string> <string name="credentials_unlock_hint" msgid="2301301378040499348">"Ingiza nenosiri ya hifadhi ya stakabadhi"</string> <string name="credentials_old_password" msgid="7553393815538684028">"Nenosiri la sasa:"</string> diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml index 66ea90e..107ea03 100644 --- a/res/values-th/strings.xml +++ b/res/values-th/strings.xml @@ -1356,10 +1356,8 @@ <string name="credentials_reset_summary" msgid="3369361230171260282">"นำใบรับรองทั้งหมดออก"</string> <string name="trusted_credentials" msgid="4266945289534242402">"ข้อมูลรับรองที่เชื่อถือได้"</string> <string name="trusted_credentials_summary" msgid="6735221351155686632">"แสดงใบรับรอง CA ที่เชื่อถือได้"</string> - <!-- no translation found for credentials_install_gesture_prompt (2207390278112395082) --> - <skip /> - <!-- no translation found for credentials_install_gesture_explanation (7408921172253634829) --> - <skip /> + <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"วาดรูปแบบการปลดล็อกของคุณ"</string> + <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"คุณจำเป็นต้องวาดรูปแบบการปลดล็อกของคุณเพื่อยืนยันการติดตั้งข้อมูลรับรอง"</string> <string name="credentials_unlock" msgid="385427939577366499"></string> <string name="credentials_unlock_hint" msgid="2301301378040499348">"พิมพ์รหัสผ่านสำหรับที่เก็บข้อมูลรับรอง"</string> <string name="credentials_old_password" msgid="7553393815538684028">"รหัสผ่านปัจจุบัน:"</string> diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml index 3440a48..0784dda 100644 --- a/res/values-tl/strings.xml +++ b/res/values-tl/strings.xml @@ -1356,10 +1356,8 @@ <string name="credentials_reset_summary" msgid="3369361230171260282">"Alisin ang lahat ng certificate"</string> <string name="trusted_credentials" msgid="4266945289534242402">"Pinagkakatiwalaang kredensyal"</string> <string name="trusted_credentials_summary" msgid="6735221351155686632">"Ipakita ang mga pinagkakatiwalaang mga CA certificate"</string> - <!-- no translation found for credentials_install_gesture_prompt (2207390278112395082) --> - <skip /> - <!-- no translation found for credentials_install_gesture_explanation (7408921172253634829) --> - <skip /> + <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Iguhit ang iyong pattern sa pag-unlock"</string> + <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Kailangan mong iguhit ang iyong pattern sa pag-unlock upang kumpirmahin ang pag-install ng kredensyal."</string> <string name="credentials_unlock" msgid="385427939577366499"></string> <string name="credentials_unlock_hint" msgid="2301301378040499348">"I-type ang password para sa storage ng kredensyal."</string> <string name="credentials_old_password" msgid="7553393815538684028">"Kasalukuyang password:"</string> diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml index 3cc2961..f0ffa19 100644 --- a/res/values-uk/strings.xml +++ b/res/values-uk/strings.xml @@ -1501,8 +1501,8 @@ <string name="show_touches_summary" msgid="6684407913145150041">"Показувати візуальну реакцію на торкання"</string> <string name="show_screen_updates" msgid="8282711794220426931">"Показати оновлення екрана"</string> <string name="show_screen_updates_summary" msgid="1716122382094924596">"Підсвічувати області екрана, коли ті оновлюються"</string> - <string name="show_hw_screen_updates" msgid="1066779731201521925">"Показ.оновл-ня граф.проц."</string> - <string name="show_hw_screen_updates_summary" msgid="5280716513731970663">"Підсвіч. екран під час оновл. за доп. граф. проц."</string> + <string name="show_hw_screen_updates" msgid="1066779731201521925">"Показувати оновл. екрана"</string> + <string name="show_hw_screen_updates_summary" msgid="5280716513731970663">"Підсвічувати екран під час оновлення з GPU"</string> <string name="disable_overlays" msgid="3645736086368449005">"Вимкнути накладання"</string> <string name="disable_overlays_summary" msgid="7111098018524381234">"Не використов. накладання для компонування екрана"</string> <string name="debug_layout" msgid="5981361776594526155">"Показувати межі макета"</string> @@ -1511,8 +1511,8 @@ <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Наклад-ня на екрані, яке показ.поточне використ.ЦП"</string> <string name="force_hw_ui" msgid="6426383462520888732">"Примус.візуал. граф.проц."</string> <string name="force_hw_ui_summary" msgid="8642000962902609976">"Використання апаратного прискорення 2D в програмах"</string> - <string name="track_frame_time" msgid="6146354853663863443">"Проф.візуаліз. граф.проц."</string> - <string name="track_frame_time_summary" msgid="447577515813970287">"Вимірюв. час візуаліз. в adb shell dumpsys gfxinfo"</string> + <string name="track_frame_time" msgid="6146354853663863443">"Запис часу роботи GPU"</string> + <string name="track_frame_time_summary" msgid="447577515813970287">"Вимірювати час роботи в adb shell dumpsys gfxinfo"</string> <string name="window_animation_scale_title" msgid="6162587588166114700">"Ступінь анімації вікна"</string> <string name="transition_animation_scale_title" msgid="387527540523595875">"Ступінь анімації переходу"</string> <string name="animator_duration_scale_title" msgid="3406722410819934083">"Тривалість анімації"</string> diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml index 4727516..1dd146f 100644 --- a/res/values-vi/strings.xml +++ b/res/values-vi/strings.xml @@ -1356,10 +1356,8 @@ <string name="credentials_reset_summary" msgid="3369361230171260282">"Xóa tất cả chứng chỉ"</string> <string name="trusted_credentials" msgid="4266945289534242402">"Thông tin đăng nhập tin cậy"</string> <string name="trusted_credentials_summary" msgid="6735221351155686632">"Hiển thị chứng chỉ CA tin cậy"</string> - <!-- no translation found for credentials_install_gesture_prompt (2207390278112395082) --> - <skip /> - <!-- no translation found for credentials_install_gesture_explanation (7408921172253634829) --> - <skip /> + <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Vẽ hình mở khóa của bạn"</string> + <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Bạn cần vẽ hình mở khóa của mình để xác nhận cài đặt thông tin xác thực."</string> <string name="credentials_unlock" msgid="385427939577366499"></string> <string name="credentials_unlock_hint" msgid="2301301378040499348">"Nhập mật khẩu cho vùng lưu trữ thông tin xác thực."</string> <string name="credentials_old_password" msgid="7553393815538684028">"Mật khẩu hiện tại:"</string> diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml index dd5a1a3..1da8b69 100644 --- a/res/values-zu/strings.xml +++ b/res/values-zu/strings.xml @@ -1357,10 +1357,8 @@ <string name="credentials_reset_summary" msgid="3369361230171260282">"Susa zonke izitifiketi"</string> <string name="trusted_credentials" msgid="4266945289534242402">"Izifakazeli ezithenjwayo"</string> <string name="trusted_credentials_summary" msgid="6735221351155686632">"Bonisa izitifiketi ze-CA ezithenjwayo"</string> - <!-- no translation found for credentials_install_gesture_prompt (2207390278112395082) --> - <skip /> - <!-- no translation found for credentials_install_gesture_explanation (7408921172253634829) --> - <skip /> + <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Dweba iphethini yakho yokuvula"</string> + <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Udinga ukudweba iphethini yakho yokuvula ukuze uqinisekise ukufakwa kwezincwadi ezichaza ngomuntu."</string> <string name="credentials_unlock" msgid="385427939577366499"></string> <string name="credentials_unlock_hint" msgid="2301301378040499348">"Thayipha iphasiwedi yokulondoloza ukufakazela ubuqiniso"</string> <string name="credentials_old_password" msgid="7553393815538684028">"Iphasiwedi yamanje:"</string> diff --git a/res/values/strings.xml b/res/values/strings.xml index 8ee96e4..b119f2a 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -3784,6 +3784,8 @@ <string name="data_usage_metered_mobile">Mobile networks</string> <!-- Header for list of Wi-Fi networks. [CHAR LIMIT=32] --> <string name="data_usage_metered_wifi">Wi-Fi networks</string> + <!-- Body text prompting user to enable Wi-Fi to configure metered networks. [CHAR LIMIT=64] --> + <string name="data_usage_metered_wifi_disabled">To select metered Wi-Fi networks, turn Wi-Fi on.</string> <!-- Button at the bottom of the CryptKeeper screen to make an emergency call. --> <string name="cryptkeeper_emergency_call">Emergency call</string> diff --git a/res/xml/data_usage_metered_prefs.xml b/res/xml/data_usage_metered_prefs.xml index 7ec3059..a0c6df4 100644 --- a/res/xml/data_usage_metered_prefs.xml +++ b/res/xml/data_usage_metered_prefs.xml @@ -29,6 +29,14 @@ <PreferenceCategory android:key="wifi" android:title="@string/data_usage_metered_wifi" - android:persistent="false" /> + android:persistent="false"> + + <Preference + android:key="wifi_disabled" + android:summary="@string/data_usage_metered_wifi_disabled" + android:persistent="false" + android:selectable="false" /> + + </PreferenceCategory> </PreferenceScreen> diff --git a/src/com/android/settings/CryptKeeper.java b/src/com/android/settings/CryptKeeper.java index 2739d91..10c067d 100644 --- a/src/com/android/settings/CryptKeeper.java +++ b/src/com/android/settings/CryptKeeper.java @@ -33,6 +33,7 @@ import android.os.RemoteException; import android.os.ServiceManager; import android.os.SystemProperties; import android.os.storage.IMountService; +import android.provider.Settings; import android.telephony.TelephonyManager; import android.text.TextUtils; import android.util.Log; @@ -49,6 +50,7 @@ import android.widget.ProgressBar; import android.widget.TextView; import com.android.internal.telephony.ITelephony; +import com.android.internal.telephony.Phone; import java.util.List; @@ -296,6 +298,7 @@ public class CryptKeeper extends Activity implements TextView.OnEditorActionList | StatusBarManager.DISABLE_HOME | StatusBarManager.DISABLE_RECENT); + setAirplaneModeIfNecessary(); mAudioManager = (AudioManager) getSystemService(Context.AUDIO_SERVICE); // Check for (and recover) retained instance data final Object lastInstance = getLastNonConfigurationInstance(); @@ -607,6 +610,33 @@ public class CryptKeeper extends Activity implements TextView.OnEditorActionList } /** + * Set airplane mode on the device if it isn't an LTE device. + * Full story: In minimal boot mode, we cannot save any state. In particular, we cannot save + * any incoming SMS's. So SMSs that are received here will be silently dropped to the floor. + * That is bad. Also, we cannot receive any telephone calls in this state. So to avoid + * both these problems, we turn the radio off. However, on certain networks turning on and + * off the radio takes a long time. In such cases, we are better off leaving the radio + * running so the latency of an E911 call is short. + * The behavior after this is: + * 1. Emergency dialing: the emergency dialer has logic to force the device out of + * airplane mode and restart the radio. + * 2. Full boot: we read the persistent settings from the previous boot and restore the + * radio to whatever it was before it restarted. This also happens when rebooting a + * phone that has no encryption. + */ + private final void setAirplaneModeIfNecessary() { + final boolean isLteDevice = + TelephonyManager.getDefault().getLteOnCdmaMode() == Phone.LTE_ON_CDMA_TRUE; + if (!isLteDevice) { + Log.d(TAG, "Going into airplane mode."); + Settings.System.putInt(getContentResolver(), Settings.System.AIRPLANE_MODE_ON, 1); + final Intent intent = new Intent(Intent.ACTION_AIRPLANE_MODE_CHANGED); + intent.putExtra("state", true); + sendBroadcast(intent); + } + } + + /** * Code to update the state of, and handle clicks from, the "Emergency call" button. * * This code is mostly duplicated from the corresponding code in diff --git a/src/com/android/settings/DataUsageSummary.java b/src/com/android/settings/DataUsageSummary.java index 1255b6b..3b0ce59 100644 --- a/src/com/android/settings/DataUsageSummary.java +++ b/src/com/android/settings/DataUsageSummary.java @@ -394,9 +394,6 @@ public class DataUsageSummary extends Fragment { mUsageSummary = (TextView) mHeader.findViewById(R.id.usage_summary); mEmpty = (TextView) mHeader.findViewById(android.R.id.empty); - // only assign layout transitions once first layout is finished - mListView.getViewTreeObserver().addOnGlobalLayoutListener(mFirstLayoutListener); - mAdapter = new DataUsageAdapter(mUidDetailProvider, mInsetSide); mListView.setOnItemClickListener(mListListener); mListView.setAdapter(mAdapter); @@ -574,25 +571,22 @@ public class DataUsageSummary extends Fragment { } /** - * Listener to setup {@link LayoutTransition} after first layout pass. + * Build and assign {@link LayoutTransition} to various containers. Should + * only be assigned after initial layout is complete. */ - private OnGlobalLayoutListener mFirstLayoutListener = new OnGlobalLayoutListener() { - @Override - public void onGlobalLayout() { - mListView.getViewTreeObserver().removeOnGlobalLayoutListener(mFirstLayoutListener); - - mTabsContainer.setLayoutTransition(buildLayoutTransition()); - mHeader.setLayoutTransition(buildLayoutTransition()); - mNetworkSwitchesContainer.setLayoutTransition(buildLayoutTransition()); - - final LayoutTransition chartTransition = buildLayoutTransition(); - chartTransition.setStartDelay(LayoutTransition.APPEARING, 0); - chartTransition.setStartDelay(LayoutTransition.DISAPPEARING, 0); - chartTransition.setAnimator(LayoutTransition.APPEARING, null); - chartTransition.setAnimator(LayoutTransition.DISAPPEARING, null); - mChart.setLayoutTransition(chartTransition); - } - }; + private void ensureLayoutTransitions() { + // skip when already setup + if (mChart.getLayoutTransition() != null) return; + + mTabsContainer.setLayoutTransition(buildLayoutTransition()); + mHeader.setLayoutTransition(buildLayoutTransition()); + mNetworkSwitchesContainer.setLayoutTransition(buildLayoutTransition()); + + final LayoutTransition chartTransition = buildLayoutTransition(); + chartTransition.disableTransitionType(LayoutTransition.APPEARING); + chartTransition.disableTransitionType(LayoutTransition.DISAPPEARING); + mChart.setLayoutTransition(chartTransition); + } private static LayoutTransition buildLayoutTransition() { final LayoutTransition transition = new LayoutTransition(); @@ -1176,6 +1170,9 @@ public class DataUsageSummary extends Fragment { } mUsageSummary.setText(getString(summaryRes, totalPhrase, rangePhrase)); + + // initial layout is finished above, ensure we have transitions + ensureLayoutTransitions(); } private final LoaderCallbacks<ChartData> mChartDataCallbacks = new LoaderCallbacks< diff --git a/src/com/android/settings/net/DataUsageMeteredSettings.java b/src/com/android/settings/net/DataUsageMeteredSettings.java index fea8a12..69326bc 100644 --- a/src/com/android/settings/net/DataUsageMeteredSettings.java +++ b/src/com/android/settings/net/DataUsageMeteredSettings.java @@ -48,6 +48,7 @@ public class DataUsageMeteredSettings extends SettingsPreferenceFragment { private PreferenceCategory mMobileCategory; private PreferenceCategory mWifiCategory; + private Preference mWifiDisabled; @Override public void onCreate(Bundle icicle) { @@ -63,9 +64,9 @@ public class DataUsageMeteredSettings extends SettingsPreferenceFragment { addPreferencesFromResource(R.xml.data_usage_metered_prefs); mMobileCategory = (PreferenceCategory) findPreference("mobile"); mWifiCategory = (PreferenceCategory) findPreference("wifi"); + mWifiDisabled = findPreference("wifi_disabled"); updateNetworks(context); - } private void updateNetworks(Context context) { @@ -76,15 +77,15 @@ public class DataUsageMeteredSettings extends SettingsPreferenceFragment { getPreferenceScreen().removePreference(mMobileCategory); } - if (hasWifiRadio(context)) { - mWifiCategory.removeAll(); + mWifiCategory.removeAll(); + if (hasWifiRadio(context) && mWifiManager.isWifiEnabled()) { for (WifiConfiguration config : mWifiManager.getConfiguredNetworks()) { if (config.SSID != null) { mWifiCategory.addPreference(buildWifiPref(context, config)); } } } else { - getPreferenceScreen().removePreference(mWifiCategory); + mWifiCategory.addPreference(mWifiDisabled); } } diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java index a50b3cf..8772f53 100644 --- a/src/com/android/settings/wifi/WifiSettings.java +++ b/src/com/android/settings/wifi/WifiSettings.java @@ -269,7 +269,9 @@ public class WifiSettings extends SettingsPreferenceFragment if (mShowMenu) { registerForContextMenu(getListView()); } - setHasOptionsMenu(mShowMenu); + // FIXME: When WPS image button is implemented, use mShowMenu instead of always showing + // the options menu + setHasOptionsMenu(true); // After confirming PreferenceScreen is available, we call super. super.onActivityCreated(savedInstanceState); @@ -304,8 +306,8 @@ public class WifiSettings extends SettingsPreferenceFragment @Override public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) { + final boolean wifiIsEnabled = mWifiManager.isWifiEnabled(); if (mShowMenu) { - final boolean wifiIsEnabled = mWifiManager.isWifiEnabled(); menu.add(Menu.NONE, MENU_ID_WPS_PBC, 0, R.string.wifi_menu_wps_pbc) .setEnabled(wifiIsEnabled) .setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM); @@ -327,6 +329,11 @@ public class WifiSettings extends SettingsPreferenceFragment menu.add(Menu.NONE, MENU_ID_ADVANCED, 0, R.string.wifi_menu_advanced) //.setIcon(android.R.drawable.ic_menu_manage) .setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER); + } else { + // FIXME: Interim support for WPS, until ImageButton is available + menu.add(Menu.NONE, MENU_ID_WPS_PBC, 0, R.string.wifi_menu_wps_pbc) + .setEnabled(wifiIsEnabled) + .setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM); } super.onCreateOptionsMenu(menu, inflater); } |