diff options
230 files changed, 1123 insertions, 434 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 28165a7..493d7f4 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -171,7 +171,7 @@ <activity android:name=".wifi.WifiSetupActivity" android:uiOptions="splitActionBarWhenNarrow" - android:theme="@style/setup_wizard_theme" + android:theme="@style/SetupWizardWifiTheme" android:label="@string/wifi_setup_wizard_title" android:icon="@drawable/empty_icon" android:clearTaskOnLaunch="true"> @@ -1625,9 +1625,14 @@ android:excludeFromRecents="true" android:theme="@*android:style/Theme.Holo.Light.Dialog.Alert"> <intent-filter> + <!-- TODO this filter can be removed --> <action android:name="android.nfc.cardemulation.ACTION_CHANGE_DEFAULT" /> <category android:name="android.intent.category.DEFAULT" /> </intent-filter> + <intent-filter> + <action android:name="android.nfc.cardemulation.action.ACTION_CHANGE_DEFAULT" /> + <category android:name="android.intent.category.DEFAULT" /> + </intent-filter> </activity> <activity android:name="Settings$NotificationAccessSettingsActivity" @@ -1667,7 +1672,7 @@ <action android:name="android.net.wifi.WIFI_STATE_CHANGED" /> <action android:name="android.net.conn.BACKGROUND_DATA_SETTING_CHANGED" /> <action android:name="android.bluetooth.adapter.action.STATE_CHANGED" /> - <action android:name="android.location.PROVIDERS_CHANGED" /> + <action android:name="android.location.MODE_CHANGED" /> <action android:name="com.android.sync.SYNC_CONN_STATUS_CHANGED" /> </intent-filter> <meta-data android:name="android.appwidget.provider" android:resource="@xml/appwidget_info" /> diff --git a/res/drawable-hdpi/ic_menu_add.png b/res/drawable-hdpi/ic_menu_add.png Binary files differdeleted file mode 100644 index 4b68f52..0000000 --- a/res/drawable-hdpi/ic_menu_add.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_menu_add_dark.png b/res/drawable-hdpi/ic_menu_add_dark.png Binary files differnew file mode 100644 index 0000000..b45001e --- /dev/null +++ b/res/drawable-hdpi/ic_menu_add_dark.png diff --git a/res/drawable-hdpi/ic_menu_add_light.png b/res/drawable-hdpi/ic_menu_add_light.png Binary files differnew file mode 100644 index 0000000..91b0354 --- /dev/null +++ b/res/drawable-hdpi/ic_menu_add_light.png diff --git a/res/drawable-hdpi/ic_wifi_lock_signal_1.png b/res/drawable-hdpi/ic_wifi_lock_signal_1.png Binary files differdeleted file mode 100644 index 60857b3..0000000 --- a/res/drawable-hdpi/ic_wifi_lock_signal_1.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_wifi_lock_signal_1_dark.png b/res/drawable-hdpi/ic_wifi_lock_signal_1_dark.png Binary files differnew file mode 100644 index 0000000..2ec38ae --- /dev/null +++ b/res/drawable-hdpi/ic_wifi_lock_signal_1_dark.png diff --git a/res/drawable-hdpi/ic_wifi_lock_signal_1_light.png b/res/drawable-hdpi/ic_wifi_lock_signal_1_light.png Binary files differnew file mode 100644 index 0000000..8b0009b --- /dev/null +++ b/res/drawable-hdpi/ic_wifi_lock_signal_1_light.png diff --git a/res/drawable-hdpi/ic_wifi_lock_signal_2.png b/res/drawable-hdpi/ic_wifi_lock_signal_2.png Binary files differdeleted file mode 100644 index 5e1f118..0000000 --- a/res/drawable-hdpi/ic_wifi_lock_signal_2.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_wifi_lock_signal_2_dark.png b/res/drawable-hdpi/ic_wifi_lock_signal_2_dark.png Binary files differnew file mode 100644 index 0000000..a3383a8 --- /dev/null +++ b/res/drawable-hdpi/ic_wifi_lock_signal_2_dark.png diff --git a/res/drawable-hdpi/ic_wifi_lock_signal_2_light.png b/res/drawable-hdpi/ic_wifi_lock_signal_2_light.png Binary files differnew file mode 100644 index 0000000..b79d3e5 --- /dev/null +++ b/res/drawable-hdpi/ic_wifi_lock_signal_2_light.png diff --git a/res/drawable-hdpi/ic_wifi_lock_signal_3.png b/res/drawable-hdpi/ic_wifi_lock_signal_3.png Binary files differdeleted file mode 100644 index 490bd58..0000000 --- a/res/drawable-hdpi/ic_wifi_lock_signal_3.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_wifi_lock_signal_3_dark.png b/res/drawable-hdpi/ic_wifi_lock_signal_3_dark.png Binary files differnew file mode 100644 index 0000000..e2cb17e --- /dev/null +++ b/res/drawable-hdpi/ic_wifi_lock_signal_3_dark.png diff --git a/res/drawable-hdpi/ic_wifi_lock_signal_3_light.png b/res/drawable-hdpi/ic_wifi_lock_signal_3_light.png Binary files differnew file mode 100644 index 0000000..053c7af --- /dev/null +++ b/res/drawable-hdpi/ic_wifi_lock_signal_3_light.png diff --git a/res/drawable-hdpi/ic_wifi_lock_signal_4.png b/res/drawable-hdpi/ic_wifi_lock_signal_4.png Binary files differdeleted file mode 100644 index e5fa8d1..0000000 --- a/res/drawable-hdpi/ic_wifi_lock_signal_4.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_wifi_lock_signal_4_dark.png b/res/drawable-hdpi/ic_wifi_lock_signal_4_dark.png Binary files differnew file mode 100644 index 0000000..65b02dd --- /dev/null +++ b/res/drawable-hdpi/ic_wifi_lock_signal_4_dark.png diff --git a/res/drawable-hdpi/ic_wifi_lock_signal_4_light.png b/res/drawable-hdpi/ic_wifi_lock_signal_4_light.png Binary files differnew file mode 100644 index 0000000..0516bd4 --- /dev/null +++ b/res/drawable-hdpi/ic_wifi_lock_signal_4_light.png diff --git a/res/drawable-hdpi/ic_wifi_signal_1.png b/res/drawable-hdpi/ic_wifi_signal_1.png Binary files differdeleted file mode 100644 index de9162b..0000000 --- a/res/drawable-hdpi/ic_wifi_signal_1.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_wifi_signal_1_dark.png b/res/drawable-hdpi/ic_wifi_signal_1_dark.png Binary files differnew file mode 100644 index 0000000..f3f0208 --- /dev/null +++ b/res/drawable-hdpi/ic_wifi_signal_1_dark.png diff --git a/res/drawable-hdpi/ic_wifi_signal_1_light.png b/res/drawable-hdpi/ic_wifi_signal_1_light.png Binary files differnew file mode 100644 index 0000000..d9968b9 --- /dev/null +++ b/res/drawable-hdpi/ic_wifi_signal_1_light.png diff --git a/res/drawable-hdpi/ic_wifi_signal_2.png b/res/drawable-hdpi/ic_wifi_signal_2.png Binary files differdeleted file mode 100644 index 4c7559c..0000000 --- a/res/drawable-hdpi/ic_wifi_signal_2.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_wifi_signal_2_dark.png b/res/drawable-hdpi/ic_wifi_signal_2_dark.png Binary files differnew file mode 100644 index 0000000..9541c38 --- /dev/null +++ b/res/drawable-hdpi/ic_wifi_signal_2_dark.png diff --git a/res/drawable-hdpi/ic_wifi_signal_2_light.png b/res/drawable-hdpi/ic_wifi_signal_2_light.png Binary files differnew file mode 100644 index 0000000..d3065de --- /dev/null +++ b/res/drawable-hdpi/ic_wifi_signal_2_light.png diff --git a/res/drawable-hdpi/ic_wifi_signal_3.png b/res/drawable-hdpi/ic_wifi_signal_3.png Binary files differdeleted file mode 100644 index 2d76324..0000000 --- a/res/drawable-hdpi/ic_wifi_signal_3.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_wifi_signal_3_dark.png b/res/drawable-hdpi/ic_wifi_signal_3_dark.png Binary files differnew file mode 100644 index 0000000..be1ba37 --- /dev/null +++ b/res/drawable-hdpi/ic_wifi_signal_3_dark.png diff --git a/res/drawable-hdpi/ic_wifi_signal_3_light.png b/res/drawable-hdpi/ic_wifi_signal_3_light.png Binary files differnew file mode 100644 index 0000000..4a6407f --- /dev/null +++ b/res/drawable-hdpi/ic_wifi_signal_3_light.png diff --git a/res/drawable-hdpi/ic_wifi_signal_4.png b/res/drawable-hdpi/ic_wifi_signal_4.png Binary files differdeleted file mode 100644 index bd50fd7..0000000 --- a/res/drawable-hdpi/ic_wifi_signal_4.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_wifi_signal_4_dark.png b/res/drawable-hdpi/ic_wifi_signal_4_dark.png Binary files differnew file mode 100644 index 0000000..3fed8e6 --- /dev/null +++ b/res/drawable-hdpi/ic_wifi_signal_4_dark.png diff --git a/res/drawable-hdpi/ic_wifi_signal_4_light.png b/res/drawable-hdpi/ic_wifi_signal_4_light.png Binary files differnew file mode 100644 index 0000000..e52acd6 --- /dev/null +++ b/res/drawable-hdpi/ic_wifi_signal_4_light.png diff --git a/res/drawable-hdpi/ic_wps.png b/res/drawable-hdpi/ic_wps.png Binary files differdeleted file mode 100644 index 36c2a32..0000000 --- a/res/drawable-hdpi/ic_wps.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_wps_dark.png b/res/drawable-hdpi/ic_wps_dark.png Binary files differnew file mode 100644 index 0000000..918b0cc --- /dev/null +++ b/res/drawable-hdpi/ic_wps_dark.png diff --git a/res/drawable-hdpi/ic_wps_light.png b/res/drawable-hdpi/ic_wps_light.png Binary files differnew file mode 100644 index 0000000..5ad9f3e --- /dev/null +++ b/res/drawable-hdpi/ic_wps_light.png diff --git a/res/drawable-ldrtl-hdpi/ic_wifi_lock_signal_1.png b/res/drawable-ldrtl-hdpi/ic_wifi_lock_signal_1.png Binary files differdeleted file mode 100644 index 5806c4f..0000000 --- a/res/drawable-ldrtl-hdpi/ic_wifi_lock_signal_1.png +++ /dev/null diff --git a/res/drawable-ldrtl-hdpi/ic_wifi_lock_signal_2.png b/res/drawable-ldrtl-hdpi/ic_wifi_lock_signal_2.png Binary files differdeleted file mode 100644 index c3a1d91..0000000 --- a/res/drawable-ldrtl-hdpi/ic_wifi_lock_signal_2.png +++ /dev/null diff --git a/res/drawable-ldrtl-hdpi/ic_wifi_lock_signal_3.png b/res/drawable-ldrtl-hdpi/ic_wifi_lock_signal_3.png Binary files differdeleted file mode 100644 index 36ea001..0000000 --- a/res/drawable-ldrtl-hdpi/ic_wifi_lock_signal_3.png +++ /dev/null diff --git a/res/drawable-ldrtl-hdpi/ic_wifi_lock_signal_4.png b/res/drawable-ldrtl-hdpi/ic_wifi_lock_signal_4.png Binary files differdeleted file mode 100644 index 6c4f252..0000000 --- a/res/drawable-ldrtl-hdpi/ic_wifi_lock_signal_4.png +++ /dev/null diff --git a/res/drawable-ldrtl-mdpi/ic_wifi_lock_signal_1.png b/res/drawable-ldrtl-mdpi/ic_wifi_lock_signal_1.png Binary files differdeleted file mode 100644 index 3f635f8..0000000 --- a/res/drawable-ldrtl-mdpi/ic_wifi_lock_signal_1.png +++ /dev/null diff --git a/res/drawable-ldrtl-mdpi/ic_wifi_lock_signal_2.png b/res/drawable-ldrtl-mdpi/ic_wifi_lock_signal_2.png Binary files differdeleted file mode 100644 index 04aae2d..0000000 --- a/res/drawable-ldrtl-mdpi/ic_wifi_lock_signal_2.png +++ /dev/null diff --git a/res/drawable-ldrtl-mdpi/ic_wifi_lock_signal_3.png b/res/drawable-ldrtl-mdpi/ic_wifi_lock_signal_3.png Binary files differdeleted file mode 100644 index 17609df..0000000 --- a/res/drawable-ldrtl-mdpi/ic_wifi_lock_signal_3.png +++ /dev/null diff --git a/res/drawable-ldrtl-mdpi/ic_wifi_lock_signal_4.png b/res/drawable-ldrtl-mdpi/ic_wifi_lock_signal_4.png Binary files differdeleted file mode 100644 index 90a8e27..0000000 --- a/res/drawable-ldrtl-mdpi/ic_wifi_lock_signal_4.png +++ /dev/null diff --git a/res/drawable-ldrtl-xhdpi/ic_wifi_lock_signal_1.png b/res/drawable-ldrtl-xhdpi/ic_wifi_lock_signal_1.png Binary files differdeleted file mode 100644 index 0e124bd..0000000 --- a/res/drawable-ldrtl-xhdpi/ic_wifi_lock_signal_1.png +++ /dev/null diff --git a/res/drawable-ldrtl-xhdpi/ic_wifi_lock_signal_2.png b/res/drawable-ldrtl-xhdpi/ic_wifi_lock_signal_2.png Binary files differdeleted file mode 100644 index d97d5d4..0000000 --- a/res/drawable-ldrtl-xhdpi/ic_wifi_lock_signal_2.png +++ /dev/null diff --git a/res/drawable-ldrtl-xhdpi/ic_wifi_lock_signal_3.png b/res/drawable-ldrtl-xhdpi/ic_wifi_lock_signal_3.png Binary files differdeleted file mode 100644 index 99a8384..0000000 --- a/res/drawable-ldrtl-xhdpi/ic_wifi_lock_signal_3.png +++ /dev/null diff --git a/res/drawable-ldrtl-xhdpi/ic_wifi_lock_signal_4.png b/res/drawable-ldrtl-xhdpi/ic_wifi_lock_signal_4.png Binary files differdeleted file mode 100644 index 40307f8..0000000 --- a/res/drawable-ldrtl-xhdpi/ic_wifi_lock_signal_4.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_menu_add.png b/res/drawable-mdpi/ic_menu_add.png Binary files differdeleted file mode 100644 index 15ffadd..0000000 --- a/res/drawable-mdpi/ic_menu_add.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_menu_add_dark.png b/res/drawable-mdpi/ic_menu_add_dark.png Binary files differnew file mode 100644 index 0000000..e6add2b --- /dev/null +++ b/res/drawable-mdpi/ic_menu_add_dark.png diff --git a/res/drawable-mdpi/ic_menu_add_light.png b/res/drawable-mdpi/ic_menu_add_light.png Binary files differnew file mode 100644 index 0000000..8b55810 --- /dev/null +++ b/res/drawable-mdpi/ic_menu_add_light.png diff --git a/res/drawable-mdpi/ic_wifi_lock_signal_1.png b/res/drawable-mdpi/ic_wifi_lock_signal_1.png Binary files differdeleted file mode 100644 index e8ac823..0000000 --- a/res/drawable-mdpi/ic_wifi_lock_signal_1.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_wifi_lock_signal_1_dark.png b/res/drawable-mdpi/ic_wifi_lock_signal_1_dark.png Binary files differnew file mode 100644 index 0000000..d6868aa --- /dev/null +++ b/res/drawable-mdpi/ic_wifi_lock_signal_1_dark.png diff --git a/res/drawable-mdpi/ic_wifi_lock_signal_1_light.png b/res/drawable-mdpi/ic_wifi_lock_signal_1_light.png Binary files differnew file mode 100644 index 0000000..eb41a10 --- /dev/null +++ b/res/drawable-mdpi/ic_wifi_lock_signal_1_light.png diff --git a/res/drawable-mdpi/ic_wifi_lock_signal_2.png b/res/drawable-mdpi/ic_wifi_lock_signal_2.png Binary files differdeleted file mode 100644 index 6034a89..0000000 --- a/res/drawable-mdpi/ic_wifi_lock_signal_2.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_wifi_lock_signal_2_dark.png b/res/drawable-mdpi/ic_wifi_lock_signal_2_dark.png Binary files differnew file mode 100644 index 0000000..ada9739 --- /dev/null +++ b/res/drawable-mdpi/ic_wifi_lock_signal_2_dark.png diff --git a/res/drawable-mdpi/ic_wifi_lock_signal_2_light.png b/res/drawable-mdpi/ic_wifi_lock_signal_2_light.png Binary files differnew file mode 100644 index 0000000..ff041c4 --- /dev/null +++ b/res/drawable-mdpi/ic_wifi_lock_signal_2_light.png diff --git a/res/drawable-mdpi/ic_wifi_lock_signal_3.png b/res/drawable-mdpi/ic_wifi_lock_signal_3.png Binary files differdeleted file mode 100644 index 0089a55..0000000 --- a/res/drawable-mdpi/ic_wifi_lock_signal_3.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_wifi_lock_signal_3_dark.png b/res/drawable-mdpi/ic_wifi_lock_signal_3_dark.png Binary files differnew file mode 100644 index 0000000..0a294ff --- /dev/null +++ b/res/drawable-mdpi/ic_wifi_lock_signal_3_dark.png diff --git a/res/drawable-mdpi/ic_wifi_lock_signal_3_light.png b/res/drawable-mdpi/ic_wifi_lock_signal_3_light.png Binary files differnew file mode 100644 index 0000000..98cf1ff --- /dev/null +++ b/res/drawable-mdpi/ic_wifi_lock_signal_3_light.png diff --git a/res/drawable-mdpi/ic_wifi_lock_signal_4.png b/res/drawable-mdpi/ic_wifi_lock_signal_4.png Binary files differdeleted file mode 100644 index ae02f24..0000000 --- a/res/drawable-mdpi/ic_wifi_lock_signal_4.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_wifi_lock_signal_4_dark.png b/res/drawable-mdpi/ic_wifi_lock_signal_4_dark.png Binary files differnew file mode 100644 index 0000000..ccda2c7 --- /dev/null +++ b/res/drawable-mdpi/ic_wifi_lock_signal_4_dark.png diff --git a/res/drawable-mdpi/ic_wifi_lock_signal_4_light.png b/res/drawable-mdpi/ic_wifi_lock_signal_4_light.png Binary files differnew file mode 100644 index 0000000..83af4de --- /dev/null +++ b/res/drawable-mdpi/ic_wifi_lock_signal_4_light.png diff --git a/res/drawable-mdpi/ic_wifi_signal_1.png b/res/drawable-mdpi/ic_wifi_signal_1.png Binary files differdeleted file mode 100644 index e99a47d..0000000 --- a/res/drawable-mdpi/ic_wifi_signal_1.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_wifi_signal_1_dark.png b/res/drawable-mdpi/ic_wifi_signal_1_dark.png Binary files differnew file mode 100644 index 0000000..6715c5d --- /dev/null +++ b/res/drawable-mdpi/ic_wifi_signal_1_dark.png diff --git a/res/drawable-mdpi/ic_wifi_signal_1_light.png b/res/drawable-mdpi/ic_wifi_signal_1_light.png Binary files differnew file mode 100644 index 0000000..eec60c0 --- /dev/null +++ b/res/drawable-mdpi/ic_wifi_signal_1_light.png diff --git a/res/drawable-mdpi/ic_wifi_signal_2.png b/res/drawable-mdpi/ic_wifi_signal_2.png Binary files differdeleted file mode 100644 index 79516ea..0000000 --- a/res/drawable-mdpi/ic_wifi_signal_2.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_wifi_signal_2_dark.png b/res/drawable-mdpi/ic_wifi_signal_2_dark.png Binary files differnew file mode 100644 index 0000000..e31d19f --- /dev/null +++ b/res/drawable-mdpi/ic_wifi_signal_2_dark.png diff --git a/res/drawable-mdpi/ic_wifi_signal_2_light.png b/res/drawable-mdpi/ic_wifi_signal_2_light.png Binary files differnew file mode 100644 index 0000000..7caa144 --- /dev/null +++ b/res/drawable-mdpi/ic_wifi_signal_2_light.png diff --git a/res/drawable-mdpi/ic_wifi_signal_3.png b/res/drawable-mdpi/ic_wifi_signal_3.png Binary files differdeleted file mode 100644 index f2af11d..0000000 --- a/res/drawable-mdpi/ic_wifi_signal_3.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_wifi_signal_3_dark.png b/res/drawable-mdpi/ic_wifi_signal_3_dark.png Binary files differnew file mode 100644 index 0000000..bd6a1e8 --- /dev/null +++ b/res/drawable-mdpi/ic_wifi_signal_3_dark.png diff --git a/res/drawable-mdpi/ic_wifi_signal_3_light.png b/res/drawable-mdpi/ic_wifi_signal_3_light.png Binary files differnew file mode 100644 index 0000000..7be2515 --- /dev/null +++ b/res/drawable-mdpi/ic_wifi_signal_3_light.png diff --git a/res/drawable-mdpi/ic_wifi_signal_4.png b/res/drawable-mdpi/ic_wifi_signal_4.png Binary files differdeleted file mode 100644 index 3d4288e..0000000 --- a/res/drawable-mdpi/ic_wifi_signal_4.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_wifi_signal_4_dark.png b/res/drawable-mdpi/ic_wifi_signal_4_dark.png Binary files differnew file mode 100644 index 0000000..af125c2 --- /dev/null +++ b/res/drawable-mdpi/ic_wifi_signal_4_dark.png diff --git a/res/drawable-mdpi/ic_wifi_signal_4_light.png b/res/drawable-mdpi/ic_wifi_signal_4_light.png Binary files differnew file mode 100644 index 0000000..658761a --- /dev/null +++ b/res/drawable-mdpi/ic_wifi_signal_4_light.png diff --git a/res/drawable-mdpi/ic_wps.png b/res/drawable-mdpi/ic_wps.png Binary files differdeleted file mode 100644 index e522e97..0000000 --- a/res/drawable-mdpi/ic_wps.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_wps_dark.png b/res/drawable-mdpi/ic_wps_dark.png Binary files differnew file mode 100644 index 0000000..77d73a8 --- /dev/null +++ b/res/drawable-mdpi/ic_wps_dark.png diff --git a/res/drawable-mdpi/ic_wps_light.png b/res/drawable-mdpi/ic_wps_light.png Binary files differnew file mode 100644 index 0000000..ef560fa --- /dev/null +++ b/res/drawable-mdpi/ic_wps_light.png diff --git a/res/drawable-xhdpi/ic_menu_add.png b/res/drawable-xhdpi/ic_menu_add.png Binary files differdeleted file mode 100644 index 420510e..0000000 --- a/res/drawable-xhdpi/ic_menu_add.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_menu_add_dark.png b/res/drawable-xhdpi/ic_menu_add_dark.png Binary files differnew file mode 100644 index 0000000..6e2e18a --- /dev/null +++ b/res/drawable-xhdpi/ic_menu_add_dark.png diff --git a/res/drawable-xhdpi/ic_menu_add_light.png b/res/drawable-xhdpi/ic_menu_add_light.png Binary files differnew file mode 100644 index 0000000..4109b2c --- /dev/null +++ b/res/drawable-xhdpi/ic_menu_add_light.png diff --git a/res/drawable-xhdpi/ic_wifi_lock_signal_1.png b/res/drawable-xhdpi/ic_wifi_lock_signal_1.png Binary files differdeleted file mode 100644 index 8b8cb03..0000000 --- a/res/drawable-xhdpi/ic_wifi_lock_signal_1.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_wifi_lock_signal_1_dark.png b/res/drawable-xhdpi/ic_wifi_lock_signal_1_dark.png Binary files differnew file mode 100644 index 0000000..c2be32f --- /dev/null +++ b/res/drawable-xhdpi/ic_wifi_lock_signal_1_dark.png diff --git a/res/drawable-xhdpi/ic_wifi_lock_signal_1_light.png b/res/drawable-xhdpi/ic_wifi_lock_signal_1_light.png Binary files differnew file mode 100644 index 0000000..57c8fb2 --- /dev/null +++ b/res/drawable-xhdpi/ic_wifi_lock_signal_1_light.png diff --git a/res/drawable-xhdpi/ic_wifi_lock_signal_2.png b/res/drawable-xhdpi/ic_wifi_lock_signal_2.png Binary files differdeleted file mode 100644 index 411269c..0000000 --- a/res/drawable-xhdpi/ic_wifi_lock_signal_2.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_wifi_lock_signal_2_dark.png b/res/drawable-xhdpi/ic_wifi_lock_signal_2_dark.png Binary files differnew file mode 100644 index 0000000..9e65730 --- /dev/null +++ b/res/drawable-xhdpi/ic_wifi_lock_signal_2_dark.png diff --git a/res/drawable-xhdpi/ic_wifi_lock_signal_2_light.png b/res/drawable-xhdpi/ic_wifi_lock_signal_2_light.png Binary files differnew file mode 100644 index 0000000..db783f8 --- /dev/null +++ b/res/drawable-xhdpi/ic_wifi_lock_signal_2_light.png diff --git a/res/drawable-xhdpi/ic_wifi_lock_signal_3.png b/res/drawable-xhdpi/ic_wifi_lock_signal_3.png Binary files differdeleted file mode 100644 index f0d92a0..0000000 --- a/res/drawable-xhdpi/ic_wifi_lock_signal_3.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_wifi_lock_signal_3_dark.png b/res/drawable-xhdpi/ic_wifi_lock_signal_3_dark.png Binary files differnew file mode 100644 index 0000000..5a12175 --- /dev/null +++ b/res/drawable-xhdpi/ic_wifi_lock_signal_3_dark.png diff --git a/res/drawable-xhdpi/ic_wifi_lock_signal_3_light.png b/res/drawable-xhdpi/ic_wifi_lock_signal_3_light.png Binary files differnew file mode 100644 index 0000000..8b7df74 --- /dev/null +++ b/res/drawable-xhdpi/ic_wifi_lock_signal_3_light.png diff --git a/res/drawable-xhdpi/ic_wifi_lock_signal_4.png b/res/drawable-xhdpi/ic_wifi_lock_signal_4.png Binary files differdeleted file mode 100644 index d26694d..0000000 --- a/res/drawable-xhdpi/ic_wifi_lock_signal_4.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_wifi_lock_signal_4_dark.png b/res/drawable-xhdpi/ic_wifi_lock_signal_4_dark.png Binary files differnew file mode 100644 index 0000000..4d2942c --- /dev/null +++ b/res/drawable-xhdpi/ic_wifi_lock_signal_4_dark.png diff --git a/res/drawable-xhdpi/ic_wifi_lock_signal_4_light.png b/res/drawable-xhdpi/ic_wifi_lock_signal_4_light.png Binary files differnew file mode 100644 index 0000000..bf26501 --- /dev/null +++ b/res/drawable-xhdpi/ic_wifi_lock_signal_4_light.png diff --git a/res/drawable-xhdpi/ic_wifi_signal_1.png b/res/drawable-xhdpi/ic_wifi_signal_1.png Binary files differdeleted file mode 100644 index 3fded08..0000000 --- a/res/drawable-xhdpi/ic_wifi_signal_1.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_wifi_signal_1_dark.png b/res/drawable-xhdpi/ic_wifi_signal_1_dark.png Binary files differnew file mode 100644 index 0000000..bf1634c --- /dev/null +++ b/res/drawable-xhdpi/ic_wifi_signal_1_dark.png diff --git a/res/drawable-xhdpi/ic_wifi_signal_1_light.png b/res/drawable-xhdpi/ic_wifi_signal_1_light.png Binary files differnew file mode 100644 index 0000000..0f58f3d --- /dev/null +++ b/res/drawable-xhdpi/ic_wifi_signal_1_light.png diff --git a/res/drawable-xhdpi/ic_wifi_signal_2.png b/res/drawable-xhdpi/ic_wifi_signal_2.png Binary files differdeleted file mode 100644 index 3a32026..0000000 --- a/res/drawable-xhdpi/ic_wifi_signal_2.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_wifi_signal_2_dark.png b/res/drawable-xhdpi/ic_wifi_signal_2_dark.png Binary files differnew file mode 100644 index 0000000..5345ff3 --- /dev/null +++ b/res/drawable-xhdpi/ic_wifi_signal_2_dark.png diff --git a/res/drawable-xhdpi/ic_wifi_signal_2_light.png b/res/drawable-xhdpi/ic_wifi_signal_2_light.png Binary files differnew file mode 100644 index 0000000..c5bcc7e --- /dev/null +++ b/res/drawable-xhdpi/ic_wifi_signal_2_light.png diff --git a/res/drawable-xhdpi/ic_wifi_signal_3.png b/res/drawable-xhdpi/ic_wifi_signal_3.png Binary files differdeleted file mode 100644 index 1616940..0000000 --- a/res/drawable-xhdpi/ic_wifi_signal_3.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_wifi_signal_3_dark.png b/res/drawable-xhdpi/ic_wifi_signal_3_dark.png Binary files differnew file mode 100644 index 0000000..8cc3a6e --- /dev/null +++ b/res/drawable-xhdpi/ic_wifi_signal_3_dark.png diff --git a/res/drawable-xhdpi/ic_wifi_signal_3_light.png b/res/drawable-xhdpi/ic_wifi_signal_3_light.png Binary files differnew file mode 100644 index 0000000..1cdacc5 --- /dev/null +++ b/res/drawable-xhdpi/ic_wifi_signal_3_light.png diff --git a/res/drawable-xhdpi/ic_wifi_signal_4.png b/res/drawable-xhdpi/ic_wifi_signal_4.png Binary files differdeleted file mode 100644 index 8b256c3..0000000 --- a/res/drawable-xhdpi/ic_wifi_signal_4.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_wifi_signal_4_dark.png b/res/drawable-xhdpi/ic_wifi_signal_4_dark.png Binary files differnew file mode 100644 index 0000000..c9aa4e5 --- /dev/null +++ b/res/drawable-xhdpi/ic_wifi_signal_4_dark.png diff --git a/res/drawable-xhdpi/ic_wifi_signal_4_light.png b/res/drawable-xhdpi/ic_wifi_signal_4_light.png Binary files differnew file mode 100644 index 0000000..3cf1c8d --- /dev/null +++ b/res/drawable-xhdpi/ic_wifi_signal_4_light.png diff --git a/res/drawable-xhdpi/ic_wps.png b/res/drawable-xhdpi/ic_wps.png Binary files differdeleted file mode 100644 index 71308f2..0000000 --- a/res/drawable-xhdpi/ic_wps.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_wps_dark.png b/res/drawable-xhdpi/ic_wps_dark.png Binary files differnew file mode 100644 index 0000000..3ea4a3b --- /dev/null +++ b/res/drawable-xhdpi/ic_wps_dark.png diff --git a/res/drawable-xhdpi/ic_wps_light.png b/res/drawable-xhdpi/ic_wps_light.png Binary files differnew file mode 100644 index 0000000..f913d2c --- /dev/null +++ b/res/drawable-xhdpi/ic_wps_light.png diff --git a/res/drawable-xxhdpi/ic_menu_add_dark.png b/res/drawable-xxhdpi/ic_menu_add_dark.png Binary files differnew file mode 100644 index 0000000..5b4923f --- /dev/null +++ b/res/drawable-xxhdpi/ic_menu_add_dark.png diff --git a/res/drawable-xxhdpi/ic_menu_add_light.png b/res/drawable-xxhdpi/ic_menu_add_light.png Binary files differnew file mode 100644 index 0000000..767b808 --- /dev/null +++ b/res/drawable-xxhdpi/ic_menu_add_light.png diff --git a/res/drawable-xxhdpi/ic_wifi_lock_signal_1_dark.png b/res/drawable-xxhdpi/ic_wifi_lock_signal_1_dark.png Binary files differnew file mode 100644 index 0000000..20739fa --- /dev/null +++ b/res/drawable-xxhdpi/ic_wifi_lock_signal_1_dark.png diff --git a/res/drawable-xxhdpi/ic_wifi_lock_signal_1_light.png b/res/drawable-xxhdpi/ic_wifi_lock_signal_1_light.png Binary files differnew file mode 100644 index 0000000..c13edff --- /dev/null +++ b/res/drawable-xxhdpi/ic_wifi_lock_signal_1_light.png diff --git a/res/drawable-xxhdpi/ic_wifi_lock_signal_2_dark.png b/res/drawable-xxhdpi/ic_wifi_lock_signal_2_dark.png Binary files differnew file mode 100644 index 0000000..9cd652a --- /dev/null +++ b/res/drawable-xxhdpi/ic_wifi_lock_signal_2_dark.png diff --git a/res/drawable-xxhdpi/ic_wifi_lock_signal_2_light.png b/res/drawable-xxhdpi/ic_wifi_lock_signal_2_light.png Binary files differnew file mode 100644 index 0000000..cb7f0c2 --- /dev/null +++ b/res/drawable-xxhdpi/ic_wifi_lock_signal_2_light.png diff --git a/res/drawable-xxhdpi/ic_wifi_lock_signal_3_dark.png b/res/drawable-xxhdpi/ic_wifi_lock_signal_3_dark.png Binary files differnew file mode 100644 index 0000000..99097df --- /dev/null +++ b/res/drawable-xxhdpi/ic_wifi_lock_signal_3_dark.png diff --git a/res/drawable-xxhdpi/ic_wifi_lock_signal_3_light.png b/res/drawable-xxhdpi/ic_wifi_lock_signal_3_light.png Binary files differnew file mode 100644 index 0000000..a0961f4 --- /dev/null +++ b/res/drawable-xxhdpi/ic_wifi_lock_signal_3_light.png diff --git a/res/drawable-xxhdpi/ic_wifi_lock_signal_4_dark.png b/res/drawable-xxhdpi/ic_wifi_lock_signal_4_dark.png Binary files differnew file mode 100644 index 0000000..6c00a9c --- /dev/null +++ b/res/drawable-xxhdpi/ic_wifi_lock_signal_4_dark.png diff --git a/res/drawable-xxhdpi/ic_wifi_lock_signal_4_light.png b/res/drawable-xxhdpi/ic_wifi_lock_signal_4_light.png Binary files differnew file mode 100644 index 0000000..74e1a40 --- /dev/null +++ b/res/drawable-xxhdpi/ic_wifi_lock_signal_4_light.png diff --git a/res/drawable-xxhdpi/ic_wifi_signal_1_dark.png b/res/drawable-xxhdpi/ic_wifi_signal_1_dark.png Binary files differnew file mode 100644 index 0000000..b50fda5 --- /dev/null +++ b/res/drawable-xxhdpi/ic_wifi_signal_1_dark.png diff --git a/res/drawable-xxhdpi/ic_wifi_signal_1_light.png b/res/drawable-xxhdpi/ic_wifi_signal_1_light.png Binary files differnew file mode 100644 index 0000000..f6fad9d --- /dev/null +++ b/res/drawable-xxhdpi/ic_wifi_signal_1_light.png diff --git a/res/drawable-xxhdpi/ic_wifi_signal_2_dark.png b/res/drawable-xxhdpi/ic_wifi_signal_2_dark.png Binary files differnew file mode 100644 index 0000000..f906023 --- /dev/null +++ b/res/drawable-xxhdpi/ic_wifi_signal_2_dark.png diff --git a/res/drawable-xxhdpi/ic_wifi_signal_2_light.png b/res/drawable-xxhdpi/ic_wifi_signal_2_light.png Binary files differnew file mode 100644 index 0000000..7f5859b --- /dev/null +++ b/res/drawable-xxhdpi/ic_wifi_signal_2_light.png diff --git a/res/drawable-xxhdpi/ic_wifi_signal_3_dark.png b/res/drawable-xxhdpi/ic_wifi_signal_3_dark.png Binary files differnew file mode 100644 index 0000000..ef40952 --- /dev/null +++ b/res/drawable-xxhdpi/ic_wifi_signal_3_dark.png diff --git a/res/drawable-xxhdpi/ic_wifi_signal_3_light.png b/res/drawable-xxhdpi/ic_wifi_signal_3_light.png Binary files differnew file mode 100644 index 0000000..e3151b3 --- /dev/null +++ b/res/drawable-xxhdpi/ic_wifi_signal_3_light.png diff --git a/res/drawable-xxhdpi/ic_wifi_signal_4_dark.png b/res/drawable-xxhdpi/ic_wifi_signal_4_dark.png Binary files differnew file mode 100644 index 0000000..13f9425 --- /dev/null +++ b/res/drawable-xxhdpi/ic_wifi_signal_4_dark.png diff --git a/res/drawable-xxhdpi/ic_wifi_signal_4_light.png b/res/drawable-xxhdpi/ic_wifi_signal_4_light.png Binary files differnew file mode 100644 index 0000000..96e25e5 --- /dev/null +++ b/res/drawable-xxhdpi/ic_wifi_signal_4_light.png diff --git a/res/drawable-xxhdpi/ic_wps_dark.png b/res/drawable-xxhdpi/ic_wps_dark.png Binary files differnew file mode 100644 index 0000000..8b38db8 --- /dev/null +++ b/res/drawable-xxhdpi/ic_wps_dark.png diff --git a/res/drawable-xxhdpi/ic_wps_light.png b/res/drawable-xxhdpi/ic_wps_light.png Binary files differnew file mode 100644 index 0000000..0084175 --- /dev/null +++ b/res/drawable-xxhdpi/ic_wps_light.png diff --git a/res/drawable/wifi_signal.xml b/res/drawable/wifi_signal_dark.xml index 86c1ab0..b578f47 100644 --- a/res/drawable/wifi_signal.xml +++ b/res/drawable/wifi_signal_dark.xml @@ -16,7 +16,7 @@ <selector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"> - <item settings:state_encrypted="true" android:drawable="@drawable/wifi_signal_lock" /> - <item settings:state_encrypted="false" android:drawable="@drawable/wifi_signal_open" /> + <item settings:state_encrypted="true" android:drawable="@drawable/wifi_signal_lock_dark" /> + <item settings:state_encrypted="false" android:drawable="@drawable/wifi_signal_open_dark" /> </selector> diff --git a/res/drawable/wifi_signal_light.xml b/res/drawable/wifi_signal_light.xml new file mode 100644 index 0000000..f1f74e3 --- /dev/null +++ b/res/drawable/wifi_signal_light.xml @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2008 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<selector xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"> + <item settings:state_encrypted="true" android:drawable="@drawable/wifi_signal_lock_light" /> + <item settings:state_encrypted="false" android:drawable="@drawable/wifi_signal_open_light" /> +</selector> + diff --git a/res/drawable/wifi_signal_lock_dark.xml b/res/drawable/wifi_signal_lock_dark.xml new file mode 100644 index 0000000..37226a8 --- /dev/null +++ b/res/drawable/wifi_signal_lock_dark.xml @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2008 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<level-list xmlns:android="http://schemas.android.com/apk/res/android"> + <item android:maxLevel="0" android:drawable="@drawable/ic_wifi_lock_signal_1_dark" /> + <item android:maxLevel="1" android:drawable="@drawable/ic_wifi_lock_signal_2_dark" /> + <item android:maxLevel="2" android:drawable="@drawable/ic_wifi_lock_signal_3_dark" /> + <item android:maxLevel="3" android:drawable="@drawable/ic_wifi_lock_signal_4_dark" /> +</level-list> + diff --git a/res/drawable/wifi_signal_lock_light.xml b/res/drawable/wifi_signal_lock_light.xml new file mode 100644 index 0000000..bf2d360 --- /dev/null +++ b/res/drawable/wifi_signal_lock_light.xml @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2008 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<level-list xmlns:android="http://schemas.android.com/apk/res/android"> + <item android:maxLevel="0" android:drawable="@drawable/ic_wifi_lock_signal_1_light" /> + <item android:maxLevel="1" android:drawable="@drawable/ic_wifi_lock_signal_2_light" /> + <item android:maxLevel="2" android:drawable="@drawable/ic_wifi_lock_signal_3_light" /> + <item android:maxLevel="3" android:drawable="@drawable/ic_wifi_lock_signal_4_light" /> +</level-list> + diff --git a/res/drawable/wifi_signal_lock.xml b/res/drawable/wifi_signal_open_dark.xml index 2ad6d91..d696983 100644 --- a/res/drawable/wifi_signal_lock.xml +++ b/res/drawable/wifi_signal_open_dark.xml @@ -15,9 +15,9 @@ --> <level-list xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:maxLevel="0" android:drawable="@drawable/ic_wifi_lock_signal_1" /> - <item android:maxLevel="1" android:drawable="@drawable/ic_wifi_lock_signal_2" /> - <item android:maxLevel="2" android:drawable="@drawable/ic_wifi_lock_signal_3" /> - <item android:maxLevel="3" android:drawable="@drawable/ic_wifi_lock_signal_4" /> + <item android:maxLevel="0" android:drawable="@drawable/ic_wifi_signal_1_dark" /> + <item android:maxLevel="1" android:drawable="@drawable/ic_wifi_signal_2_dark" /> + <item android:maxLevel="2" android:drawable="@drawable/ic_wifi_signal_3_dark" /> + <item android:maxLevel="3" android:drawable="@drawable/ic_wifi_signal_4_dark" /> </level-list> diff --git a/res/drawable/wifi_signal_open.xml b/res/drawable/wifi_signal_open_light.xml index b506dd3..c54e9e9 100644 --- a/res/drawable/wifi_signal_open.xml +++ b/res/drawable/wifi_signal_open_light.xml @@ -15,9 +15,9 @@ --> <level-list xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:maxLevel="0" android:drawable="@drawable/ic_wifi_signal_1" /> - <item android:maxLevel="1" android:drawable="@drawable/ic_wifi_signal_2" /> - <item android:maxLevel="2" android:drawable="@drawable/ic_wifi_signal_3" /> - <item android:maxLevel="3" android:drawable="@drawable/ic_wifi_signal_4" /> + <item android:maxLevel="0" android:drawable="@drawable/ic_wifi_signal_1_light" /> + <item android:maxLevel="1" android:drawable="@drawable/ic_wifi_signal_2_light" /> + <item android:maxLevel="2" android:drawable="@drawable/ic_wifi_signal_3_light" /> + <item android:maxLevel="3" android:drawable="@drawable/ic_wifi_signal_4_light" /> </level-list> diff --git a/res/layout/preference_widget_wifi_signal.xml b/res/layout/preference_widget_wifi_signal.xml index 6df203c..c2541a5 100644 --- a/res/layout/preference_widget_wifi_signal.xml +++ b/res/layout/preference_widget_wifi_signal.xml @@ -15,8 +15,8 @@ --> <ImageView xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/signal" + android:id="@+id/signal" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:src="@drawable/wifi_signal" + android:src="?attr/wifi_signal" android:contentDescription="@null" /> diff --git a/res/layout/process_stats_details.xml b/res/layout/process_stats_details.xml new file mode 100644 index 0000000..0de1054 --- /dev/null +++ b/res/layout/process_stats_details.xml @@ -0,0 +1,76 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2013 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<ScrollView + xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:clipToPadding="false" + android:scrollbarStyle="@integer/preference_scrollbar_style"> + + <LinearLayout + android:id="@+id/all_details" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:paddingTop="5dip" + android:paddingBottom="5dip" + android:orientation="vertical"> + + <include layout="@layout/app_percentage_item" /> + + <!-- Force stop and report buttons --> + <LinearLayout + android:id="@+id/two_buttons_panel" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:paddingBottom="6dip" + android:orientation="vertical"> + <include + layout="@layout/two_buttons_panel"/> + </LinearLayout> + + <TextView + style="?android:attr/listSeparatorTextViewStyle" + android:text="@string/details_subtitle" /> + + <LinearLayout + android:id="@+id/details" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:paddingStart="6dip" + android:orientation="vertical"> + + <!-- Insert detail items here --> + + </LinearLayout> + + <TextView + style="?android:attr/listSeparatorTextViewStyle" + android:text="@string/services_subtitle" /> + + <LinearLayout + android:id="@+id/services" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:paddingStart="6dip" + android:orientation="vertical"> + + <!-- Insert service items here --> + + </LinearLayout> + + </LinearLayout> +</ScrollView> diff --git a/res/layout/regulatory_info.xml b/res/layout/regulatory_info.xml index 478eaab..8cd4157 100755 --- a/res/layout/regulatory_info.xml +++ b/res/layout/regulatory_info.xml @@ -17,6 +17,7 @@ android:layout_width="match_parent" android:layout_height="match_parent"> <ImageView + android:id="@+id/regulatoryInfo" android:adjustViewBounds="true" android:layout_width="wrap_content" android:layout_height="wrap_content" diff --git a/res/layout/setup_preference.xml b/res/layout/setup_preference.xml index 7e917d8..d0cbc02 100644 --- a/res/layout/setup_preference.xml +++ b/res/layout/setup_preference.xml @@ -33,7 +33,6 @@ android:id="@+id/title_bar" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_alignBottom="@id/title" android:gravity="bottom" android:orientation="horizontal"> <TextView @@ -52,7 +51,7 @@ android:layout_marginStart="8dip" android:layout_marginEnd="8dip" android:layout_marginBottom="8dip" - android:src="@*android:drawable/ic_menu_moreoverflow_holo_dark" + android:src="?attr/ic_menu_moreoverflow" android:background="?android:attr/actionBarItemBackground" android:contentDescription="@string/wifi_menu_more_options" /> @@ -124,7 +123,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center" - android:src="@drawable/ic_menu_add" /> + android:src="?attr/ic_menu_add" /> <TextView android:id="@+id/other" diff --git a/res/layout/wifi_wps_dialog.xml b/res/layout/wifi_wps_dialog.xml index 1c5713a..a86823d 100644 --- a/res/layout/wifi_wps_dialog.xml +++ b/res/layout/wifi_wps_dialog.xml @@ -35,7 +35,7 @@ android:layout_height="wrap_content" android:layout_gravity="center" android:layout_marginTop="8dip" - android:src="@drawable/ic_wps" /> + android:src="?attr/ic_wps" /> <ProgressBar android:id="@+id/wps_timeout_bar" diff --git a/res/menu/vpn.xml b/res/menu/vpn.xml index dd8f64c..3e0a788 100644 --- a/res/menu/vpn.xml +++ b/res/menu/vpn.xml @@ -18,7 +18,7 @@ <item android:id="@+id/vpn_create" android:title="@string/vpn_create" - android:icon="@drawable/ic_menu_add" + android:icon="?attr/ic_menu_add" android:showAsAction="always" /> <item android:id="@+id/vpn_lockdown" diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml index 46cd0a0..712f3ab 100644 --- a/res/values-af/strings.xml +++ b/res/values-af/strings.xml @@ -1962,7 +1962,7 @@ <string name="global_change_warning" product="default" msgid="2461264421590324675">"Hierdie instelling beïnvloed alle gebruikers op hierdie foon."</string> <string name="global_locale_change_title" msgid="5956281361384221451">"Verander taal"</string> <string name="global_font_change_title" msgid="1887126466191012035">"Verander lettergrootte"</string> - <string name="nfc_payment_settings_title" msgid="4226098386809754689">"Tik en betaal"</string> + <string name="nfc_payment_settings_title" msgid="1121386157283141856">"Betalings"</string> <string name="nfc_payment_ask" msgid="1061129391464251903">"Vra elke keer"</string> <string name="nfc_payment_set_default" msgid="1583397933053078296">"Stel as jou voorkeur?"</string> <string name="restriction_settings_title" msgid="4233515503765879736">"Beperkings"</string> diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml index 39de3e8..393dc17 100644 --- a/res/values-am/strings.xml +++ b/res/values-am/strings.xml @@ -532,7 +532,7 @@ <string name="wifi_display_summary_disabled" msgid="5318394806146587849">"ተሰናክሏል"</string> <string name="wifi_display_certification_heading" msgid="3125105883233765652">"የእውቅና ማረጋገጫ"</string> <string name="wifi_display_session_info" msgid="4733627902691604836">"የክፍለ ጊዜ መረጃ"</string> - <string name="wifi_display_listen_mode" msgid="2962301785910874273">"የአዳምጥ ሁነታን አንቃ"</string> + <string name="wifi_display_listen_mode" msgid="2962301785910874273">"የማዳመጥ ሁነታን አንቃ"</string> <string name="wifi_display_autonomous_go" msgid="140864379216673466">"ራስ-ሰር GO አንቃ"</string> <string name="wifi_display_pause" msgid="6037110530682927245">"ለአፍታ አቁም"</string> <string name="wifi_display_resume" msgid="8195590160258469425">"ከቆመበት ቀጥል"</string> @@ -1962,7 +1962,7 @@ <string name="global_change_warning" product="default" msgid="2461264421590324675">"ይህ ቅንብር እዚህ ስልክ ላይ ያሉት ሁሉም ተጠቃሚዎች ይመለከታቸዋል።"</string> <string name="global_locale_change_title" msgid="5956281361384221451">"ቋንቋ ይቀይሩ"</string> <string name="global_font_change_title" msgid="1887126466191012035">"የቅርጸ-ቁምፊ መጠን ይቀይሩ"</string> - <string name="nfc_payment_settings_title" msgid="4226098386809754689">"መታ ያድርጉ እና ይክፈሉ"</string> + <string name="nfc_payment_settings_title" msgid="1121386157283141856">"ክፍያዎች"</string> <string name="nfc_payment_ask" msgid="1061129391464251903">"ሁልጊዜ ጊዜ ጠይቅ"</string> <string name="nfc_payment_set_default" msgid="1583397933053078296">"እንደ ምርጫዎ ሆኖ ይዘጋጅ?"</string> <string name="restriction_settings_title" msgid="4233515503765879736">"ገደቦች"</string> diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml index 8eab098..c156d92 100644 --- a/res/values-ar/strings.xml +++ b/res/values-ar/strings.xml @@ -1450,7 +1450,7 @@ <string name="battery_stats_screen_on_label" msgid="7150221809877509708">"الشاشة قيد التشغيل"</string> <string name="battery_stats_gps_on_label" msgid="1193657533641951256">"GPS (نظام تحديد المواقع العالمي) على"</string> <string name="battery_stats_wifi_running_label" msgid="1845839195549226252">"Wi‑Fi"</string> - <string name="battery_stats_wake_lock_label" msgid="1908942681902324095">"في الوضغ النشط"</string> + <string name="battery_stats_wake_lock_label" msgid="1908942681902324095">"في الوضع النشط"</string> <string name="battery_stats_phone_signal_label" msgid="4137799310329041341">"إشارة شبكة الجوال"</string> <!-- no translation found for battery_stats_last_duration (1535831453827905957) --> <skip /> @@ -1962,7 +1962,7 @@ <string name="global_change_warning" product="default" msgid="2461264421590324675">"يؤثر هذا الإعداد على جميع مستخدمي هذا الهاتف."</string> <string name="global_locale_change_title" msgid="5956281361384221451">"تغيير اللغة"</string> <string name="global_font_change_title" msgid="1887126466191012035">"تغيير حجم الخط"</string> - <string name="nfc_payment_settings_title" msgid="4226098386809754689">"التوصيل والدفع"</string> + <string name="nfc_payment_settings_title" msgid="1121386157283141856">"الدفعات المالية"</string> <string name="nfc_payment_ask" msgid="1061129391464251903">"الطلب في كل مرة"</string> <string name="nfc_payment_set_default" msgid="1583397933053078296">"هل تريد تعيينه كتفضيل؟"</string> <string name="restriction_settings_title" msgid="4233515503765879736">"القيود"</string> diff --git a/res/values-az-rAZ/strings.xml b/res/values-az-rAZ/strings.xml index 96d555f..f40fa33 100644 --- a/res/values-az-rAZ/strings.xml +++ b/res/values-az-rAZ/strings.xml @@ -1962,7 +1962,7 @@ <string name="global_change_warning" product="default" msgid="2461264421590324675">"Bu parametr bu telefondakı bütün istifadəçilərə təsir göstərir."</string> <string name="global_locale_change_title" msgid="5956281361384221451">"Dili dəyişin"</string> <string name="global_font_change_title" msgid="1887126466191012035">"Şriftin ölçüsünü dəyiş"</string> - <string name="nfc_payment_settings_title" msgid="4226098386809754689">"Tıklayaraq Ödə"</string> + <string name="nfc_payment_settings_title" msgid="1121386157283141856">"Ödənişlər"</string> <string name="nfc_payment_ask" msgid="1061129391464251903">"Hər zaman soruş"</string> <string name="nfc_payment_set_default" msgid="1583397933053078296">"Tərcihiniz olsun?"</string> <string name="restriction_settings_title" msgid="4233515503765879736">"Məhdudiyyətlər"</string> diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml index dff4e1a..7c38708 100644 --- a/res/values-be/strings.xml +++ b/res/values-be/strings.xml @@ -2059,7 +2059,7 @@ <string name="global_change_warning" product="default" msgid="2461264421590324675">"Гэты параметр распаўсюджвае на ўсіх карыстальнікаў гэтага тэлефона."</string> <string name="global_locale_change_title" msgid="5956281361384221451">"Змяніць мову"</string> <string name="global_font_change_title" msgid="1887126466191012035">"Змяніць памер шрыфту"</string> - <!-- no translation found for nfc_payment_settings_title (4226098386809754689) --> + <!-- no translation found for nfc_payment_settings_title (1121386157283141856) --> <skip /> <!-- no translation found for nfc_payment_ask (1061129391464251903) --> <skip /> diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml index e585b92..1b10ef5 100644 --- a/res/values-bg/strings.xml +++ b/res/values-bg/strings.xml @@ -1962,7 +1962,7 @@ <string name="global_change_warning" product="default" msgid="2461264421590324675">"Настройката засяга всички потребители на този телефон."</string> <string name="global_locale_change_title" msgid="5956281361384221451">"Промяна на езика"</string> <string name="global_font_change_title" msgid="1887126466191012035">"Промяна на размера на шрифта"</string> - <string name="nfc_payment_settings_title" msgid="4226098386809754689">"Докоснете и платете"</string> + <string name="nfc_payment_settings_title" msgid="1121386157283141856">"Плащания"</string> <string name="nfc_payment_ask" msgid="1061129391464251903">"Да се пита винаги"</string> <string name="nfc_payment_set_default" msgid="1583397933053078296">"Да се зададе ли като ваше предпочитание?"</string> <string name="restriction_settings_title" msgid="4233515503765879736">"Ограничения"</string> diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml index 25af479..dd2f195 100644 --- a/res/values-ca/strings.xml +++ b/res/values-ca/strings.xml @@ -1962,7 +1962,7 @@ <string name="global_change_warning" product="default" msgid="2461264421590324675">"Aquesta configuració afecta tots els usuaris del telèfon."</string> <string name="global_locale_change_title" msgid="5956281361384221451">"Canvi de l\'idioma"</string> <string name="global_font_change_title" msgid="1887126466191012035">"Canvi del cos de lletra"</string> - <string name="nfc_payment_settings_title" msgid="4226098386809754689">"Toca i paga"</string> + <string name="nfc_payment_settings_title" msgid="1121386157283141856">"Pagaments"</string> <string name="nfc_payment_ask" msgid="1061129391464251903">"Pregunta sempre"</string> <string name="nfc_payment_set_default" msgid="1583397933053078296">"Vols establir-ho com a preferència?"</string> <string name="restriction_settings_title" msgid="4233515503765879736">"Restriccions"</string> diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml index 4d874cf..c73aabb 100644 --- a/res/values-cs/strings.xml +++ b/res/values-cs/strings.xml @@ -1962,7 +1962,7 @@ <string name="global_change_warning" product="default" msgid="2461264421590324675">"Toto nastavení ovlivní všechny uživatele tohoto telefonu."</string> <string name="global_locale_change_title" msgid="5956281361384221451">"Změna jazyka"</string> <string name="global_font_change_title" msgid="1887126466191012035">"Změna velikosti písma"</string> - <string name="nfc_payment_settings_title" msgid="4226098386809754689">"Zaplatit dotykem telefonu"</string> + <string name="nfc_payment_settings_title" msgid="1121386157283141856">"Platby"</string> <string name="nfc_payment_ask" msgid="1061129391464251903">"Vždy se dotázat"</string> <string name="nfc_payment_set_default" msgid="1583397933053078296">"Nastavit jako předvolbu?"</string> <string name="restriction_settings_title" msgid="4233515503765879736">"Omezení"</string> diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml index 566087b..7b98645 100644 --- a/res/values-da/strings.xml +++ b/res/values-da/strings.xml @@ -534,7 +534,7 @@ <string name="wifi_display_session_info" msgid="4733627902691604836">"Oplysninger om session"</string> <string name="wifi_display_listen_mode" msgid="2962301785910874273">"Aktivér lyttetilstand"</string> <string name="wifi_display_autonomous_go" msgid="140864379216673466">"Aktivér autonom GO"</string> - <string name="wifi_display_pause" msgid="6037110530682927245">"Midlertidigt standset"</string> + <string name="wifi_display_pause" msgid="6037110530682927245">"Sæt på pause"</string> <string name="wifi_display_resume" msgid="8195590160258469425">"Genoptag"</string> <string name="wifi_display_listen_channel" msgid="4146320990898147857">"Lyttekanal"</string> <string name="wifi_display_operating_channel" msgid="233535284689144515">"Igangværende kanal"</string> @@ -1962,7 +1962,7 @@ <string name="global_change_warning" product="default" msgid="2461264421590324675">"Denne indstilling påvirker alle brugere på denne telefon."</string> <string name="global_locale_change_title" msgid="5956281361384221451">"Skift sprog"</string> <string name="global_font_change_title" msgid="1887126466191012035">"Skift skriftstørrelse"</string> - <string name="nfc_payment_settings_title" msgid="4226098386809754689">"Peg og betal"</string> + <string name="nfc_payment_settings_title" msgid="1121386157283141856">"Betalinger"</string> <string name="nfc_payment_ask" msgid="1061129391464251903">"Spørg hver gang"</string> <string name="nfc_payment_set_default" msgid="1583397933053078296">"Vil du angive dette som din præference?"</string> <string name="restriction_settings_title" msgid="4233515503765879736">"Begrænsninger"</string> diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml index fd3effd..9e18c3c 100644 --- a/res/values-de/strings.xml +++ b/res/values-de/strings.xml @@ -1963,7 +1963,7 @@ <string name="global_change_warning" product="default" msgid="2461264421590324675">"Diese Einstellung betrifft alle Nutzer auf diesem Telefon."</string> <string name="global_locale_change_title" msgid="5956281361384221451">"Sprache ändern"</string> <string name="global_font_change_title" msgid="1887126466191012035">"Schriftgröße ändern"</string> - <string name="nfc_payment_settings_title" msgid="4226098386809754689">"Mobil bezahlen"</string> + <string name="nfc_payment_settings_title" msgid="1121386157283141856">"Zahlungen"</string> <string name="nfc_payment_ask" msgid="1061129391464251903">"Jedes Mal fragen"</string> <string name="nfc_payment_set_default" msgid="1583397933053078296">"Als bevorzugte Einstellung festlegen?"</string> <string name="restriction_settings_title" msgid="4233515503765879736">"Einschränkungen"</string> diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml index c5b9dbe..4cae1fd 100644 --- a/res/values-el/strings.xml +++ b/res/values-el/strings.xml @@ -1962,7 +1962,7 @@ <string name="global_change_warning" product="default" msgid="2461264421590324675">"Αυτή η χρήση επηρεάζει όλους τους χρήστες στο συγκεκριμένο τηλέφωνο."</string> <string name="global_locale_change_title" msgid="5956281361384221451">"Αλλαγή γλώσσας"</string> <string name="global_font_change_title" msgid="1887126466191012035">"Αλλαγή μεγέθους γραμματοσειράς"</string> - <string name="nfc_payment_settings_title" msgid="4226098386809754689">"Πατήστε και πληρώστε"</string> + <string name="nfc_payment_settings_title" msgid="1121386157283141856">"Πληρωμές"</string> <string name="nfc_payment_ask" msgid="1061129391464251903">"Ερώτηση κάθε φορά"</string> <string name="nfc_payment_set_default" msgid="1583397933053078296">"Ορισμός ως προτίμησης;"</string> <string name="restriction_settings_title" msgid="4233515503765879736">"Περιορισμοί"</string> diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml index 90b36e0..dd6c97a 100644 --- a/res/values-en-rGB/strings.xml +++ b/res/values-en-rGB/strings.xml @@ -1962,7 +1962,7 @@ <string name="global_change_warning" product="default" msgid="2461264421590324675">"This setting affects all users on this phone."</string> <string name="global_locale_change_title" msgid="5956281361384221451">"Change language"</string> <string name="global_font_change_title" msgid="1887126466191012035">"Change font size"</string> - <string name="nfc_payment_settings_title" msgid="4226098386809754689">"Tap and Pay"</string> + <string name="nfc_payment_settings_title" msgid="1121386157283141856">"Payments"</string> <string name="nfc_payment_ask" msgid="1061129391464251903">"Ask every time"</string> <string name="nfc_payment_set_default" msgid="1583397933053078296">"Set as your preference?"</string> <string name="restriction_settings_title" msgid="4233515503765879736">"Restrictions"</string> diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml index 90b36e0..dd6c97a 100644 --- a/res/values-en-rIN/strings.xml +++ b/res/values-en-rIN/strings.xml @@ -1962,7 +1962,7 @@ <string name="global_change_warning" product="default" msgid="2461264421590324675">"This setting affects all users on this phone."</string> <string name="global_locale_change_title" msgid="5956281361384221451">"Change language"</string> <string name="global_font_change_title" msgid="1887126466191012035">"Change font size"</string> - <string name="nfc_payment_settings_title" msgid="4226098386809754689">"Tap and Pay"</string> + <string name="nfc_payment_settings_title" msgid="1121386157283141856">"Payments"</string> <string name="nfc_payment_ask" msgid="1061129391464251903">"Ask every time"</string> <string name="nfc_payment_set_default" msgid="1583397933053078296">"Set as your preference?"</string> <string name="restriction_settings_title" msgid="4233515503765879736">"Restrictions"</string> diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml index efcf2cd..e7b8ba9 100644 --- a/res/values-es-rUS/strings.xml +++ b/res/values-es-rUS/strings.xml @@ -1962,7 +1962,7 @@ <string name="global_change_warning" product="default" msgid="2461264421590324675">"Esta configuración afecta a todos los usuarios de este dispositivo."</string> <string name="global_locale_change_title" msgid="5956281361384221451">"Cambiar idioma"</string> <string name="global_font_change_title" msgid="1887126466191012035">"Cambiar tamaño de fuente"</string> - <string name="nfc_payment_settings_title" msgid="4226098386809754689">"Tocar y pagar"</string> + <string name="nfc_payment_settings_title" msgid="1121386157283141856">"Pagos"</string> <string name="nfc_payment_ask" msgid="1061129391464251903">"Preguntar siempre"</string> <string name="nfc_payment_set_default" msgid="1583397933053078296">"¿Establecer como preferencia?"</string> <string name="restriction_settings_title" msgid="4233515503765879736">"Restricciones"</string> diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml index a33bcde..61a9c44 100644 --- a/res/values-es/strings.xml +++ b/res/values-es/strings.xml @@ -1962,7 +1962,7 @@ <string name="global_change_warning" product="default" msgid="2461264421590324675">"Esta configuración afecta a todos los usuarios de este teléfono."</string> <string name="global_locale_change_title" msgid="5956281361384221451">"Cambiar idioma"</string> <string name="global_font_change_title" msgid="1887126466191012035">"Cambiar tamaño de fuente"</string> - <string name="nfc_payment_settings_title" msgid="4226098386809754689">"Tocar y pagar"</string> + <string name="nfc_payment_settings_title" msgid="1121386157283141856">"Pagos"</string> <string name="nfc_payment_ask" msgid="1061129391464251903">"Preguntar siempre"</string> <string name="nfc_payment_set_default" msgid="1583397933053078296">"¿Establecer como preferencia?"</string> <string name="restriction_settings_title" msgid="4233515503765879736">"Restricciones"</string> diff --git a/res/values-et-rEE/strings.xml b/res/values-et-rEE/strings.xml index 272f2ea..8c5fc9c 100644 --- a/res/values-et-rEE/strings.xml +++ b/res/values-et-rEE/strings.xml @@ -1962,7 +1962,7 @@ <string name="global_change_warning" product="default" msgid="2461264421590324675">"Seade mõjutab kõiki telefoni kasutajaid."</string> <string name="global_locale_change_title" msgid="5956281361384221451">"Muuda keelt"</string> <string name="global_font_change_title" msgid="1887126466191012035">"Fondi suuruse muutmine"</string> - <string name="nfc_payment_settings_title" msgid="4226098386809754689">"Puuduta ja maksa"</string> + <string name="nfc_payment_settings_title" msgid="1121386157283141856">"Maksed"</string> <string name="nfc_payment_ask" msgid="1061129391464251903">"Küsi iga kord"</string> <string name="nfc_payment_set_default" msgid="1583397933053078296">"Kas määrata eelistuseks?"</string> <string name="restriction_settings_title" msgid="4233515503765879736">"Piirangud"</string> diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml index 682a09c..8e11bc8 100644 --- a/res/values-fa/strings.xml +++ b/res/values-fa/strings.xml @@ -1962,7 +1962,7 @@ <string name="global_change_warning" product="default" msgid="2461264421590324675">"این تنظیم روی همه کاربران موجود در این تلفن تأثیر میگذارد."</string> <string name="global_locale_change_title" msgid="5956281361384221451">"تغییر زبان"</string> <string name="global_font_change_title" msgid="1887126466191012035">"تغییر اندازه قلم"</string> - <string name="nfc_payment_settings_title" msgid="4226098386809754689">"پرداخت با یک ضربه"</string> + <string name="nfc_payment_settings_title" msgid="1121386157283141856">"پرداختها"</string> <string name="nfc_payment_ask" msgid="1061129391464251903">"هر بار پرسیده شود"</string> <string name="nfc_payment_set_default" msgid="1583397933053078296">"به عنوان روش ترجیحی شما تنظیم شود؟"</string> <string name="restriction_settings_title" msgid="4233515503765879736">"محدودیتها"</string> diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml index 5ed239e..9196476 100644 --- a/res/values-fi/strings.xml +++ b/res/values-fi/strings.xml @@ -1962,7 +1962,7 @@ <string name="global_change_warning" product="default" msgid="2461264421590324675">"Tämä asetus vaikuttaa kaikkiin tämän puhelimen käyttäjiin."</string> <string name="global_locale_change_title" msgid="5956281361384221451">"Vaihda kieltä"</string> <string name="global_font_change_title" msgid="1887126466191012035">"Muuta kirjasinkokoa"</string> - <string name="nfc_payment_settings_title" msgid="4226098386809754689">"Napauta ja maksa"</string> + <string name="nfc_payment_settings_title" msgid="1121386157283141856">"Maksut"</string> <string name="nfc_payment_ask" msgid="1061129391464251903">"Kysy aina"</string> <string name="nfc_payment_set_default" msgid="1583397933053078296">"Valitaanko asetukseksi?"</string> <string name="restriction_settings_title" msgid="4233515503765879736">"Rajoitukset"</string> diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml index 80262be..7540d28 100644 --- a/res/values-fr-rCA/strings.xml +++ b/res/values-fr-rCA/strings.xml @@ -1742,7 +1742,7 @@ <string name="debug_app" msgid="8349591734751384446">"Sélectionner une application à déboguer"</string> <string name="debug_app_not_set" msgid="718752499586403499">"Aucune application à déboguer définie"</string> <string name="debug_app_set" msgid="2063077997870280017">"Application à déboguer : <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> - <string name="select_application" msgid="5156029161289091703">"Sélectionner une application"</string> + <string name="select_application" msgid="5156029161289091703">"Sél. application"</string> <string name="no_application" msgid="2813387563129153880">"Aucune"</string> <string name="wait_for_debugger" msgid="1202370874528893091">"Attendre l\'intervention du débogueur"</string> <string name="wait_for_debugger_summary" msgid="1766918303462746804">"Avant de s\'exécuter, l\'application déboguée doit attendre que le débogueur soit attaché."</string> @@ -1768,7 +1768,7 @@ <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Enable OpenGL traces"</string> <string name="debug_layout" msgid="5981361776594526155">"Afficher les contours"</string> <string name="debug_layout_summary" msgid="2001775315258637682">"Afficher les limites, les marges de clip, etc."</string> - <string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"Forcer l\'orient.: g. à d."</string> + <string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"Forcer orient. : g. à d."</string> <string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"Forcer l\'orientation: g. à droite (toutes langues)"</string> <string name="show_cpu_usage" msgid="2389212910758076024">"Afficher mém. CPU utilisée"</string> <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Superposition écran indiquant mémoire CPU utilisée"</string> @@ -1786,7 +1786,7 @@ <string name="immediately_destroy_activities" msgid="8366775083630234121">"Ne pas conserver activités"</string> <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Supprimer immédiatement les activités abandonnées"</string> <string name="app_process_limit_title" msgid="4280600650253107163">"Limite processus arr.-plan"</string> - <string name="show_all_anrs" msgid="28462979638729082">"Afficher tous les messages « L\'application ne répond pas »"</string> + <string name="show_all_anrs" msgid="28462979638729082">"Afficher tous les messages «L\'application ne répond pas»"</string> <string name="show_all_anrs_summary" msgid="641908614413544127">"Afficher « L\'application ne répond plus » pour applis en arrière-plan"</string> <string name="experimental_webview" msgid="4492200819033780927">"Utiliser WebVie expérim."</string> <string name="experimental_webview_summary" msgid="3431620080869482446">"Applis utiliseront dernière version WebView (bêta)."</string> @@ -1964,7 +1964,7 @@ <string name="global_change_warning" product="default" msgid="2461264421590324675">"Ce paramètre affecte tous les utilisateurs de cette tablette."</string> <string name="global_locale_change_title" msgid="5956281361384221451">"Modifier la langue"</string> <string name="global_font_change_title" msgid="1887126466191012035">"Modifier la taille de la police"</string> - <string name="nfc_payment_settings_title" msgid="4226098386809754689">"Toucher-et-payer"</string> + <string name="nfc_payment_settings_title" msgid="1121386157283141856">"Paiements"</string> <string name="nfc_payment_ask" msgid="1061129391464251903">"Toujours demander"</string> <string name="nfc_payment_set_default" msgid="1583397933053078296">"Définir comme préférence?"</string> <string name="restriction_settings_title" msgid="4233515503765879736">"Restrictions"</string> diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml index 04f10a0..afcff85 100644 --- a/res/values-fr/strings.xml +++ b/res/values-fr/strings.xml @@ -1964,7 +1964,7 @@ <string name="global_change_warning" product="default" msgid="2461264421590324675">"Ce paramètre affecte tous les utilisateurs de ce téléphone."</string> <string name="global_locale_change_title" msgid="5956281361384221451">"Modifier la langue"</string> <string name="global_font_change_title" msgid="1887126466191012035">"Modifier la taille de la police"</string> - <string name="nfc_payment_settings_title" msgid="4226098386809754689">"Fonctionnalité tap-and-pay"</string> + <string name="nfc_payment_settings_title" msgid="1121386157283141856">"Paiements"</string> <string name="nfc_payment_ask" msgid="1061129391464251903">"Toujours demander"</string> <string name="nfc_payment_set_default" msgid="1583397933053078296">"Définir en tant que mode de paiement prioritaire ?"</string> <string name="restriction_settings_title" msgid="4233515503765879736">"Restrictions"</string> diff --git a/res/values-hi/arrays.xml b/res/values-hi/arrays.xml index ee4be93..d207831 100644 --- a/res/values-hi/arrays.xml +++ b/res/values-hi/arrays.xml @@ -332,7 +332,7 @@ <item msgid="2372711992605524591">"अधिक"</item> </string-array> <string-array name="captioning_typeface_selector_titles"> - <item msgid="1319652728542138112">"डिफ़ॉल्ट"</item> + <item msgid="1319652728542138112">"सामान्य"</item> <item msgid="1016452621833735880">"Sans-serif"</item> <item msgid="2496277987934654454">"Sans-serif condensed"</item> <item msgid="4406003087391086325">"Serif"</item> diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml index 73abe72..a9f596a 100644 --- a/res/values-hi/strings.xml +++ b/res/values-hi/strings.xml @@ -50,7 +50,7 @@ <string name="radioInfo_service_off" msgid="1434084741785525415">"रेडियो बंद"</string> <string name="radioInfo_roaming_in" msgid="9045363884600341051">"रोमिंग"</string> <string name="radioInfo_roaming_not" msgid="2851853244069662307">"रोमिंग नहीं"</string> - <string name="radioInfo_phone_idle" msgid="7489244938838742820">"निष्क्रिय"</string> + <string name="radioInfo_phone_idle" msgid="7489244938838742820">"प्रयोग में नहीं"</string> <string name="radioInfo_phone_ringing" msgid="4883724645684297895">"बज रहा है"</string> <string name="radioInfo_phone_offhook" msgid="4174402846862780998">"कॉल चल रही है"</string> <string name="radioInfo_data_disconnected" msgid="1959735267890719418">"डिस्कनेक्ट किया गया"</string> @@ -110,10 +110,10 @@ <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"अज्ञात त्रुटि"</string> <string name="battery_info_health_cold" msgid="3835692786176707318">"ठंडा"</string> <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string> - <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"आसपास के सब Bluetooth उप. के लिए दृश्यमान (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string> - <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"सभी आस-पास के Bluetooth उपकरणों के लिए दृश्यमान"</string> - <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"अन्य Bluetooth उपकरणों के लिए दृश्यमान नहीं"</string> - <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"केवल युग्मित उपकरणों के लिए दृश्यमान"</string> + <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"आसपास के सब Bluetooth उप. के लिए दिखाई दे रहा है (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string> + <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"सभी आस-पास के Bluetooth उपकरणों के लिए दिखाई दे रहा है"</string> + <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"अन्य Bluetooth उपकरणों के लिए दिखाई नहीं दे रहा है"</string> + <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"केवल युग्मित उपकरणों के लिए दिखाई दे रहा है"</string> <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"दृश्यता समयबाह्य"</string> <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"ध्वनि डायलिंग लॉक करें"</string> <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"जब स्क्रीन लॉक हो, तो bluetooth डायलर के उपयोग को रोकें"</string> @@ -173,7 +173,7 @@ <string name="choose_timezone" msgid="1362834506479536274">"समय क्षेत्र चुनें"</string> <string name="normal_date_format" msgid="7636406984925498359">"क्षेत्रीय (<xliff:g id="DATE">%s</xliff:g>)"</string> <string name="display_preview_label" msgid="1127597250917274792">"पूर्वावलोकन:"</string> - <string name="display_font_size_label" msgid="8941851418397475389">"फ़ॉन्ट आकार:"</string> + <string name="display_font_size_label" msgid="8941851418397475389">"अक्षरों का आकार:"</string> <!-- no translation found for intent_sender_data_label (6332324780477289261) --> <skip /> <string name="intent_sender_sendbroadcast_text" msgid="1415735148895872715">"<xliff:g id="BROADCAST">broadcast</xliff:g> भेजें"</string> @@ -463,7 +463,7 @@ <string name="bluetooth_preference_device_settings" msgid="907776049862799122">"उपकरण सेटिंग"</string> <string name="bluetooth_preference_paired_devices" msgid="1970524193086791964">"युग्मित उपकरण"</string> <string name="bluetooth_preference_found_devices" msgid="1647983835063249680">"उपलब्ध उपकरण"</string> - <string name="bluetooth_device_context_connect" msgid="3997659895003244941">"कनेक्ट करें"</string> + <string name="bluetooth_device_context_connect" msgid="3997659895003244941">"जोड़ दें"</string> <string name="bluetooth_device_context_disconnect" msgid="8220072022970148683">"डिस्कनेक्ट करें"</string> <string name="bluetooth_device_context_pair_connect" msgid="7611522504813927727">"युग्मित और कनेक्ट करें"</string> <string name="bluetooth_device_context_unpair" msgid="662992425948536144">"अयुग्मित करें"</string> @@ -486,7 +486,7 @@ <string name="bluetooth_disconnect_pan_nap_profile" product="tablet" msgid="5455448395850929200">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> को इस टेबलेट का इंटरनेट कनेक्शन शेयर करने से डिस्कनेक्ट कर दिया जाएगा."</string> <string name="bluetooth_disconnect_pan_nap_profile" product="default" msgid="5266851881175033601">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> को इस फ़ोन का इंटरनेट कनेक्शन शेयर करने से डिस्कनेक्ट कर दिया जाएगा."</string> <string name="bluetooth_device_advanced_title" msgid="6066342531927499308">"युग्मित Bluetooth उपकरण"</string> - <string name="bluetooth_device_advanced_online_mode_title" msgid="3689050071425683114">"कनेक्ट करें"</string> + <string name="bluetooth_device_advanced_online_mode_title" msgid="3689050071425683114">"जोड़ दें"</string> <string name="bluetooth_device_advanced_online_mode_summary" msgid="1204424107263248336">"Bluetooth उपकरण से कनेक्ट करें"</string> <string name="bluetooth_device_advanced_profile_header_title" msgid="3764437426089639639">"प्रोफ़ाइल"</string> <string name="bluetooth_device_advanced_rename_device" msgid="5148578059584955791">"नाम बदलें"</string> @@ -571,7 +571,7 @@ <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"स्थान सटीकता को बेहतर बनाने तथा अन्य प्रयोजनों के लिए, Google और अन्य एप्लिकेशन आसपास के नेटवर्क स्कैन कर सकते हैं, भले ही Wi-Fi बंद हो. यदि आप ऐसा नहीं होने देना चाहते हैं, तो उन्नत > स्कैनिंग हमेशा उपलब्ध पर जाएं."</string> <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"एप्लिकेशन आसपास के नेटवर्क स्कैन कर सकते हैं, भले ही Wi-Fi बंद हो. यदि आप ऐसा नहीं होने देना चाहते हैं, तो उन्नत > स्कैनिंग हमेशा उपलब्ध पर जाएं."</string> <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"फिर से न दिखाएं"</string> - <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"निष्क्रिय रहने के दौरान Wi-Fi चालू रखें"</string> + <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"प्रयोग में नहीं रहने के दौरान Wi-Fi चालू रखें"</string> <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"सेटिंग बदलने में एक समस्या थी"</string> <string name="wifi_suspend_optimizations" msgid="1220174276403689487">"Wi-Fi ऑप्टिमाइज़ेशन"</string> <string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"Wi-Fi के चालू रहने पर बैटरी उपयोग को न्यूनतम करें"</string> @@ -637,7 +637,7 @@ <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"स्थान की सटीकता को बेहतर बनाने और अन्य प्रयोजनों के लिए, Wi-Fi बंद होने पर भी <xliff:g id="APP_NAME">%1$s</xliff:g> नेटवर्क स्कैनिंग को चालू करना चाहता है.\n\nइसकी अनुमति उन सभी एप्लिकेशन के लिए दें जो स्कैन करना चाहते हैं?"</string> <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"अनुमति दें"</string> <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"अस्वीकार करें"</string> - <string name="wifi_connect" msgid="1076622875777072845">"कनेक्ट करें"</string> + <string name="wifi_connect" msgid="1076622875777072845">"जोड़ दें"</string> <string name="wifi_failed_connect_message" msgid="8491902558970292871">"नेटवर्क से कनेक्ट करने में विफल रहा"</string> <string name="wifi_forget" msgid="8168174695608386644">"भूलें"</string> <string name="wifi_failed_forget_message" msgid="1348172929201654986">"नेटवर्क भूलने में विफल रहा"</string> @@ -701,22 +701,22 @@ <string name="musicfx_title" msgid="3415566786340790345">"संगीत प्रभाव"</string> <string name="ring_volume_title" msgid="7938706566797464165">"रिंगर वॉल्यूम"</string> <string name="vibrate_in_silent_title" msgid="3897968069156767036">"मौन होने पर कंपन करें"</string> - <string name="notification_sound_title" msgid="5137483249425507572">"डिफ़ॉल्ट सूचना ध्वनि"</string> + <string name="notification_sound_title" msgid="5137483249425507572">"सामान्य सूचना ध्वनि"</string> <string name="notification_pulse_title" msgid="1247988024534030629">"पल्स सूचना लाइट"</string> <string name="incoming_call_volume_title" msgid="8073714801365904099">"रिंगटोन"</string> <string name="notification_volume_title" msgid="2012640760341080408">"सूचना"</string> <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"सूचनाओं के लिए इनकमिंग कॉल वॉल्यूम का उपयोग करें"</string> - <string name="notification_sound_dialog_title" msgid="3805140135741385667">"डिफ़ॉल्ट सूचना ध्वनि"</string> + <string name="notification_sound_dialog_title" msgid="3805140135741385667">"सामान्य सूचना ध्वनि"</string> <string name="media_volume_title" msgid="3576565767317118106">"मीडिया"</string> <string name="media_volume_summary" msgid="5363248930648849974">"संगीत और वीडियो के लिए वॉल्यूम सेट करें"</string> <string name="alarm_volume_title" msgid="2285597478377758706">"अलार्म"</string> <string name="dock_settings_summary" msgid="455802113668982481">"संलग्न किए गए डॉक के लिए ऑडियो सेटिंग"</string> - <string name="dtmf_tone_enable_title" msgid="8533399267725365088">"डायल पैड स्पर्श टोन"</string> + <string name="dtmf_tone_enable_title" msgid="8533399267725365088">"कॉल करते समय ध्वनी सुने"</string> <string name="sound_effects_enable_title" msgid="1171590821131077296">"स्पर्श ध्वनियां"</string> <string name="lock_sounds_enable_title" msgid="450098505659399520">"स्क्रीन लॉक ध्वनि"</string> <string name="haptic_feedback_enable_title" msgid="2438293710530828760">"स्पर्श पर कंपन करें"</string> <string name="audio_record_proc_title" msgid="4271091199976457534">"शोर रद्दीकरण"</string> - <string name="volume_media_description" msgid="7949355934788807863">"संगीत, वीडियो, गेम और अन्य मीडिया"</string> + <string name="volume_media_description" msgid="7949355934788807863">"संगीत, वीडियो,गेमऔर अन्य मीडिया"</string> <string name="volume_ring_description" msgid="5936851631698298989">"रिंगटोन और सूचनाएं"</string> <string name="volume_notification_description" msgid="5810902320215328321">"सूचनाएं"</string> <string name="volume_alarm_description" msgid="8322615148532654841">"अलार्म"</string> @@ -752,23 +752,23 @@ <string name="accelerometer_summary_off" product="default" msgid="5485489363715740761">"फ़ोन घुमाने पर अभिविन्यास स्वचालित रूप से स्विच करें"</string> <string name="brightness" msgid="2354961343555249270">"चमक"</string> <string name="brightness_summary" msgid="838917350127550703">"स्क्रीन की चमक एडजस्ट करें"</string> - <string name="screen_timeout" msgid="4351334843529712571">"निष्क्रिय"</string> + <string name="screen_timeout" msgid="4351334843529712571">"प्रयोग में नहीं"</string> <string name="screen_timeout_summary" msgid="327761329263064327">"निष्क्रियता के <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> के बाद"</string> <string name="wallpaper_settings_title" msgid="5449180116365824625">"वॉलपेपर"</string> <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"यहां से वॉलपेपर चुनें:"</string> - <string name="screensaver_settings_title" msgid="3349790120327233241">"Daydream"</string> - <string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"डॉक किए हुए या निष्क्रिय रहने और चार्ज करने पर"</string> + <string name="screensaver_settings_title" msgid="3349790120327233241">"दिवास्वप्न"</string> + <string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"डॉक किए हुए या प्रयोग में नहीं रहने और चार्ज करने पर"</string> <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"कोई एक"</string> <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"चार्ज करते समय"</string> <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"जब डॉक किया हुआ हो"</string> <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"बंद"</string> - <string name="screensaver_settings_disabled_prompt" msgid="3857507943322777651">"फ़ोन के डॉक रहते समय और/या निष्क्रिय रहते समय जो भी होता है, उसे नियंत्रित करने के लिए Daydream को चालू करें."</string> + <string name="screensaver_settings_disabled_prompt" msgid="3857507943322777651">"फ़ोन के डॉक रहते समय और/या प्रयोग में नहीं रहते समय जो भी होता है, उसे नियंत्रित करने के लिए दिवास्वप्न को चालू करें."</string> <string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"daydream कब करें"</string> <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"अब प्रारंभ करें"</string> <string name="screensaver_settings_button" msgid="7292214707625717013">"सेटिंग"</string> <string name="automatic_brightness" msgid="5014143533884135461">"स्वचालित चमक"</string> - <string name="title_font_size" msgid="4405544325522105222">"फ़ॉन्ट आकार"</string> - <string name="dialog_title_font_size" msgid="2231507851258955038">"फ़ॉन्ट आकार"</string> + <string name="title_font_size" msgid="4405544325522105222">"अक्षरों का आकार"</string> + <string name="dialog_title_font_size" msgid="2231507851258955038">"अक्षरों का आकार"</string> <string name="sim_lock_settings" msgid="3392331196873564292">"सिम कार्ड लॉक सेटिंग"</string> <string name="sim_lock_settings_category" msgid="5136244267576697004">"सिम कार्ड लॉक सेट करें"</string> <string name="sim_lock_settings_title" msgid="9018585580955414596">"सिम कार्ड लॉक"</string> @@ -832,20 +832,20 @@ <string name="status_unavailable" msgid="7862009036663793314">"अनुपलब्ध"</string> <string name="status_up_time" msgid="7294859476816760399">"चालू रहने का समय"</string> <string name="status_awake_time" msgid="2393949909051183652">"सचेत समय"</string> - <string name="internal_memory" msgid="9129595691484260784">"आंतरिक संग्रहण"</string> + <string name="internal_memory" msgid="9129595691484260784">"मोबाइल संग्रहण"</string> <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"USB संग्रहण"</string> <string name="sd_memory" product="default" msgid="151871913888051515">"SD कार्ड"</string> <string name="memory_available" msgid="5052397223077021181">"उपलब्ध"</string> <string name="memory_available_read_only" msgid="6497534390167920206">"उपलब्ध (केवल पढ़ने योग्य)"</string> <string name="memory_size" msgid="6629067715017232195">"कुल स्थान"</string> - <string name="memory_calculating_size" msgid="2188358544203768588">"गणना हो रही है..."</string> + <string name="memory_calculating_size" msgid="2188358544203768588">"गिनती हो रही है..."</string> <string name="memory_apps_usage" msgid="2348501997988663688">"एप्लिकेशन (एप्लिकेशन डेटा और मीडिया सामग्री)"</string> <string name="memory_media_usage" msgid="3738830697707880405">"मीडिया"</string> <string name="memory_downloads_usage" msgid="3755173051677533027">"डाउनलोड"</string> <string name="memory_dcim_usage" msgid="558887013613822577">"चित्र, वीडियो"</string> <string name="memory_music_usage" msgid="1363785144783011606">"ऑडियो (संगीत, रिंगटोन, पॉडकास्ट, आदि)"</string> <string name="memory_media_misc_usage" msgid="235452944021647124">"विविध"</string> - <string name="memory_media_cache_usage" msgid="6704293333141177910">"संचित डेटा"</string> + <string name="memory_media_cache_usage" msgid="6704293333141177910">"संग्रहित डेटा"</string> <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"शेयर किया गया संग्रहण अनमाउंट करें"</string> <string name="sd_eject" product="default" msgid="6915293408836853020">"SD कार्ड अनमाउंट करें"</string> <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"आंतरिक USB संग्रहण अनमाउंट करें"</string> @@ -860,8 +860,8 @@ <string name="sd_format" product="default" msgid="2576054280507119870">"SD कार्ड मिटाएं"</string> <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"आंतरिक USB संग्रहण का सभी डेटा मिटाता है, जैसे संगीत और फ़ोटो"</string> <string name="sd_format_summary" product="default" msgid="212703692181793109">"SD कार्ड का सभी डेटा मिटाता है, जैसे संगीत और फ़ोटो"</string> - <string name="memory_clear_cache_title" msgid="5423840272171286191">"संचित डेटा साफ़ करें?"</string> - <string name="memory_clear_cache_message" msgid="4550262490807415948">"इससे सभी एप्लिकेशन का संचित डेटा साफ़ हो जाएगा."</string> + <string name="memory_clear_cache_title" msgid="5423840272171286191">"संग्रहित डेटा साफ़ करें?"</string> + <string name="memory_clear_cache_message" msgid="4550262490807415948">"इससे सभी एप्लिकेशन का संग्रहित डेटा साफ़ हो जाएगा."</string> <string name="mtp_ptp_mode_summary" msgid="3710436114807789270">"MTP या PTP प्रकार्य सक्रिय है"</string> <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="3077285629197874055">"USB संग्रहण अनमाउंट करें?"</string> <string name="dlg_confirm_unmount_title" product="default" msgid="3634502237262534381">"SD कार्ड को अनमाउंट करें?"</string> @@ -932,8 +932,8 @@ <string name="master_clear_title" msgid="5907939616087039756">"फ़ैक्टरी डेटा रीसेट"</string> <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"टेबलेट से सभी डेटा मिटाएं"</string> <string name="master_clear_summary" product="default" msgid="4986154238001088492">"फ़ोन से सभी डेटा मिटाएं"</string> - <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"इससे आपके टेबलेट के "<b>"आंतरिक संग्रहण"</b>" से सभी डेटा मिट जाएगा, जिसमें शामिल है:\n\n"<li>"आपका Google खाता"</li>\n<li>"सिस्टम और एप्लिकेशन डेटा और सेटिंग"</li>\n<li>"डाउनलोड किए गए एप्लिकेशन"</li></string> - <string name="master_clear_desc" product="default" msgid="9165016501623540228">"इससे आपके फ़ोन के "<b>"आंतरिक संग्रहण"</b>" से सभी डेटा मिट जाएगा, जिसमें शामिल है:\n\n"<li>"आपका Google खाता"</li>\n<li>"सिस्टम और एप्लिकेशन डेटा और सेटिंग"</li>\n<li>"डाउनलोड किए गए एप्लिकेशन"</li></string> + <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"इससे आपके टेबलेट के "<b>"मोबाइल संग्रहण"</b>" से सभी डेटा मिट जाएगा, जिसमें शामिल है:\n\n"<li>"आपका Google खाता"</li>\n<li>"सिस्टम और एप्लिकेशन डेटा और सेटिंग"</li>\n<li>"डाउनलोड किए गए एप्लिकेशन"</li></string> + <string name="master_clear_desc" product="default" msgid="9165016501623540228">"इससे आपके फ़ोन के "<b>"मोबाइल संग्रहण"</b>" से सभी डेटा मिट जाएगा, जिसमें शामिल है:\n\n"<li>"आपका Google खाता"</li>\n<li>"सिस्टम और एप्लिकेशन डेटा और सेटिंग"</li>\n<li>"डाउनलोड किए गए एप्लिकेशन"</li></string> <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"आप वर्तमान में निम्न खातों में प्रवेश हैं:\n"</string> <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"संगीत"</li>\n<li>"फ़ोटो"</li>\n<li>"अन्य उपयोगकर्ता डेटा"</li></string> <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"संगीत, चित्र और अन्य उपयोगकर्ता डेटा साफ़ करने के लिए "<b>" USB संग्रहण"</b>" मिटाना होगा."</string> @@ -1148,7 +1148,7 @@ <string name="disabled" msgid="9206776641295849915">"अक्षम किया गया"</string> <string name="not_installed" msgid="1475144352069281880">"इंस्टॉल नहीं है"</string> <string name="no_applications" msgid="7336588977497084921">"कोई एप्लिकेशन नहीं."</string> - <string name="internal_storage" msgid="1584700623164275282">"आंतरिक संग्रहण"</string> + <string name="internal_storage" msgid="1584700623164275282">"मोबाइल संग्रहण"</string> <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"USB संग्रहण"</string> <string name="sd_card_storage" product="default" msgid="7623513618171928235">"SD कार्ड संग्रहण"</string> <string name="recompute_size" msgid="7722567982831691718">"आकार पुन: परिकलित कर रहा है…"</string> @@ -1261,13 +1261,13 @@ <string name="failed_to_open_app_settings_toast" msgid="1251067459298072462">"<xliff:g id="SPELL_APPLICATION_NAME">%1$s</xliff:g> के लिए सेटिंग खोलने में विफल रहा"</string> <string name="pointer_settings_category" msgid="8183819795164034286">"माउस/ट्रैकपैड"</string> <string name="pointer_speed" msgid="1221342330217861616">"सूचक गति"</string> - <string name="game_controller_settings_category" msgid="8794508575329923718">"गेम नियंत्रक"</string> + <string name="game_controller_settings_category" msgid="8794508575329923718">"गेमनियंत्रक"</string> <string name="vibrate_input_devices" msgid="2599591466928793082">"कंपनकर्ता का उपयोग करें"</string> - <string name="vibrate_input_devices_summary" msgid="4595570516865299153">"कनेक्ट होने पर कंपनकर्ता को गेम नियंत्रक पर रीडायरेक्ट करें."</string> + <string name="vibrate_input_devices_summary" msgid="4595570516865299153">"कनेक्ट होने पर कंपनकर्ता कोगेमनियंत्रक पर रीडायरेक्ट करें."</string> <string name="keyboard_layout_dialog_title" msgid="8030087214949381372">"कीबोर्ड लेआउट चुनें"</string> <string name="keyboard_layout_dialog_setup_button" msgid="8514583747236476384">"कीबोर्ड लेआउट सेट करें"</string> <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"स्विच करने हेतु, Control-Spacebar दबाएं"</string> - <string name="keyboard_layout_default_label" msgid="2952672513543482165">"डिफ़ॉल्ट"</string> + <string name="keyboard_layout_default_label" msgid="2952672513543482165">"सामान्य"</string> <string name="keyboard_layout_picker_title" msgid="556081931972771610">"कीबोर्ड लेआउट"</string> <string name="user_dict_settings_title" msgid="3427169369758733521">"व्यक्तिगत शब्दकोष"</string> <string name="user_dict_settings_summary" msgid="7965571192902870454"></string> @@ -1406,7 +1406,7 @@ <string name="captioning_typeface" msgid="1826169240566563259">"फ़ॉन्ट परिवार"</string> <string name="captioning_preview_text" msgid="4067935959797375065">"कैप्शन इस तरह दिखाई देंगे"</string> <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string> - <string name="locale_default" msgid="2593883646136326969">"डिफ़ॉल्ट"</string> + <string name="locale_default" msgid="2593883646136326969">"सामान्य"</string> <string name="color_none" msgid="3475640044925814795">"कोई नहीं"</string> <string name="color_white" msgid="8045195170201590239">"सफ़ेद"</string> <string name="color_gray" msgid="9192312087142726313">"धूसर"</string> @@ -1665,7 +1665,7 @@ <string name="wifi_setup_next" msgid="3388694784447820477">"अगला"</string> <string name="wifi_setup_back" msgid="144777383739164044">"वापस जाएं"</string> <string name="wifi_setup_detail" msgid="2336990478140503605">"नेटवर्क विवरण"</string> - <string name="wifi_setup_connect" msgid="7954456989590237049">"कनेक्ट करें"</string> + <string name="wifi_setup_connect" msgid="7954456989590237049">"जोड़ दें"</string> <string name="wifi_setup_forget" msgid="2562847595567347526">"भूलें"</string> <string name="wifi_setup_save" msgid="3659235094218508211">"सहेजें"</string> <string name="wifi_setup_cancel" msgid="3185216020264410239">"रद्द करें"</string> @@ -1755,7 +1755,7 @@ <string name="pointer_location" msgid="6084434787496938001">"सूचक स्थान"</string> <string name="pointer_location_summary" msgid="840819275172753713">"वर्तमान स्पर्श डेटा दिखाने वाला स्क्रीन ओवरले"</string> <string name="show_touches" msgid="1356420386500834339">"स्पर्श दिखाएं"</string> - <string name="show_touches_summary" msgid="6684407913145150041">"स्पर्श के लिए दृश्यमान फ़ीडबैक दिखाएं"</string> + <string name="show_touches_summary" msgid="6684407913145150041">"स्पर्श के लिए दिखाई देने वाले फ़ीडबैक दिखाएं"</string> <string name="show_screen_updates" msgid="5470814345876056420">"सतह अपडेट दिखाएं"</string> <string name="show_screen_updates_summary" msgid="2569622766672785529">"विंडो सतहें अपडेट होने पर उन सभी को फ़्लैश करें"</string> <string name="show_hw_screen_updates" msgid="5036904558145941590">"GPU दृश्य अपडेट दिखाएं"</string> @@ -1881,7 +1881,7 @@ <string name="vpn_no_server_cert" msgid="2167487440231913330">"(सर्वर से प्राप्त)"</string> <string name="vpn_cancel" msgid="1979937976123659332">"रद्द करें"</string> <string name="vpn_save" msgid="4233484051644764510">"सहेजें"</string> - <string name="vpn_connect" msgid="8469608541746132301">"कनेक्ट करें"</string> + <string name="vpn_connect" msgid="8469608541746132301">"जोड़ दें"</string> <string name="vpn_edit" msgid="8647191407179996943">"VPN प्रोफ़ाइल संपादित करें"</string> <string name="vpn_connect_to" msgid="5965299358485793260">" <xliff:g id="PROFILE">%s</xliff:g> से कनेक्ट करें"</string> <string name="vpn_title" msgid="6317731879966640551">"VPN"</string> @@ -1961,8 +1961,8 @@ <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"यह सेटिंग इस टेबलेट के सभी उपयोगकर्ताओं को प्रभावित करती है."</string> <string name="global_change_warning" product="default" msgid="2461264421590324675">"यह सेटिंग इस फ़ोन के सभी उपयोगकर्ताओं को प्रभावित करती है."</string> <string name="global_locale_change_title" msgid="5956281361384221451">"भाषा बदलें"</string> - <string name="global_font_change_title" msgid="1887126466191012035">"फ़ॉन्ट आकार बदलें"</string> - <string name="nfc_payment_settings_title" msgid="4226098386809754689">"टैप करें और भुगतान करें"</string> + <string name="global_font_change_title" msgid="1887126466191012035">"अक्षरों का आकार बदलें"</string> + <string name="nfc_payment_settings_title" msgid="1121386157283141856">"भुगतान"</string> <string name="nfc_payment_ask" msgid="1061129391464251903">"हर बार पूछें"</string> <string name="nfc_payment_set_default" msgid="1583397933053078296">"आपकी प्राथमिकता के रूप में सेट करें?"</string> <string name="restriction_settings_title" msgid="4233515503765879736">"प्रतिबंध"</string> diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml index 219262e..abb34c2 100644 --- a/res/values-hr/strings.xml +++ b/res/values-hr/strings.xml @@ -1962,7 +1962,7 @@ <string name="global_change_warning" product="default" msgid="2461264421590324675">"Ova postavka utječe na sve korisnike na ovom telefonu."</string> <string name="global_locale_change_title" msgid="5956281361384221451">"Promjena jezika"</string> <string name="global_font_change_title" msgid="1887126466191012035">"Promjena veličine fonta"</string> - <string name="nfc_payment_settings_title" msgid="4226098386809754689">"Dodirni i plati"</string> + <string name="nfc_payment_settings_title" msgid="1121386157283141856">"Plaćanja"</string> <string name="nfc_payment_ask" msgid="1061129391464251903">"Pitaj svaki put"</string> <string name="nfc_payment_set_default" msgid="1583397933053078296">"Želite li to postaviti kao željeni način?"</string> <string name="restriction_settings_title" msgid="4233515503765879736">"Ograničenja"</string> diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml index 8034f5b..a0e4396 100644 --- a/res/values-hu/strings.xml +++ b/res/values-hu/strings.xml @@ -1964,7 +1964,7 @@ <string name="global_change_warning" product="default" msgid="2461264421590324675">"Ez a beállítás minden felhasználót érint ezen a telefonon."</string> <string name="global_locale_change_title" msgid="5956281361384221451">"Nyelv módosítása"</string> <string name="global_font_change_title" msgid="1887126466191012035">"Betűméret módosítása"</string> - <string name="nfc_payment_settings_title" msgid="4226098386809754689">"Érintéssel való fizetés"</string> + <string name="nfc_payment_settings_title" msgid="1121386157283141856">"Fizetések"</string> <string name="nfc_payment_ask" msgid="1061129391464251903">"Mindig rákérdez"</string> <string name="nfc_payment_set_default" msgid="1583397933053078296">"Beállítja preferenciaként?"</string> <string name="restriction_settings_title" msgid="4233515503765879736">"Korlátozások"</string> diff --git a/res/values-hy-rAM/strings.xml b/res/values-hy-rAM/strings.xml index 31a5472..9589bd1 100644 --- a/res/values-hy-rAM/strings.xml +++ b/res/values-hy-rAM/strings.xml @@ -283,7 +283,7 @@ <string name="roaming_reenable_title" msgid="6068100976707316772">"Թույլատրե՞լ տվյալների ռոումինգը:"</string> <string name="networks" msgid="6333316876545927039">"Օպերատորի ընտրություն"</string> <string name="sum_carrier_select" msgid="3616956422251879163">"Ընտրել ցանցի օպերատորին"</string> - <string name="date_and_time_settings_title" msgid="3350640463596716780">"Ամսաթիվ & ժամ"</string> + <string name="date_and_time_settings_title" msgid="3350640463596716780">"Ամսաթիվ և ժամ"</string> <string name="date_and_time_settings_title_setup_wizard" msgid="2391530758339384324">"Սահմանել ամսաթիվն ու ժամը"</string> <string name="date_and_time_settings_summary" msgid="7095318986757583584">"Սահմանել ամսաթիվը, ժամը, ժամային գոտին, & ձևաչափերը"</string> <string name="date_time_auto" msgid="7076906458515908345">"Ինքնուրույն սահմանված ամսաթիվ & ժամ"</string> @@ -554,7 +554,7 @@ <string name="wifi_settings" msgid="29722149822540994">"Wi‑Fi"</string> <string name="wifi_settings_category" msgid="8719175790520448014">"Wi‑Fi կարգավորումներ"</string> <string name="wifi_settings_title" msgid="3103415012485692233">"Wi‑Fi"</string> - <string name="wifi_settings_summary" msgid="668767638556052820">"Կարգավորել & կառավարել անլար միացման կետերը"</string> + <string name="wifi_settings_summary" msgid="668767638556052820">"Կարգավորել և կառավարել անլար միացման կետերը"</string> <string name="wifi_setup_wizard_title" msgid="8242230950011819054">"Ընտրել Wi‑Fi"</string> <string name="wifi_starting" msgid="6732377932749942954">"Wi‑Fi-ի միացում…"</string> <string name="wifi_stopping" msgid="8952524572499500804">"Wi‑Fi-ն անջատվում է..."</string> @@ -1240,8 +1240,8 @@ <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"Դադարեցնե՞լ համակարգի ծառայությունը:"</string> <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="3371302398335665793">"Եթե դուք դադարեցնեք այս ծառայությունը, գրասալիկի որոշ հատկություններ կարող են դադարել ճիշտ գործել, մինչև այն չանջատեք և նորից միացնեք:"</string> <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"Եթե դուք կասեցնեք այս ծառայությունը, հեռախոսի որոշ հատկություններ կարող են դադարել ճիշտ գործել, մինչև այն չանջատեք և վերամիացնեք:"</string> - <string name="language_settings" msgid="5292716747264442359">"Լեզվի & ներմուծում"</string> - <string name="language_keyboard_settings_title" msgid="243220021717425813">"Լեզվի & ներմուծում"</string> + <string name="language_settings" msgid="5292716747264442359">"Լեզու և ներմուծում"</string> + <string name="language_keyboard_settings_title" msgid="243220021717425813">"Լեզու և ներմուծում"</string> <string name="language_settings_category" msgid="2288258489940617043">"Լեզվի կարգավորումներ"</string> <string name="keyboard_settings_category" msgid="8275523930352487827">"Ստեղնաշար & մուտքագրման եղանակներ"</string> <string name="phone_language" msgid="8870144109924299673">"Lեզուն"</string> @@ -1962,7 +1962,7 @@ <string name="global_change_warning" product="default" msgid="2461264421590324675">"Այս կարգավորումը ազդեցություն ունի այս հեռախոսի բոլոր օգտվողների վրա:"</string> <string name="global_locale_change_title" msgid="5956281361384221451">"Փոխել լեզուն"</string> <string name="global_font_change_title" msgid="1887126466191012035">"Փոխել տառաչափը"</string> - <string name="nfc_payment_settings_title" msgid="4226098386809754689">"Հպել և վճարել"</string> + <string name="nfc_payment_settings_title" msgid="1121386157283141856">"Վճարումներ"</string> <string name="nfc_payment_ask" msgid="1061129391464251903">"Հարցնել ամեն անգամ"</string> <string name="nfc_payment_set_default" msgid="1583397933053078296">"Սահմանե՞լ որպես նախընտրանք"</string> <string name="restriction_settings_title" msgid="4233515503765879736">"Սահմանափակումներ"</string> diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml index 6b0fc01..ed56a8a 100644 --- a/res/values-in/strings.xml +++ b/res/values-in/strings.xml @@ -1962,7 +1962,7 @@ <string name="global_change_warning" product="default" msgid="2461264421590324675">"Setelan ini memengaruhi semua pengguna di ponsel ini."</string> <string name="global_locale_change_title" msgid="5956281361384221451">"Ubah bahasa"</string> <string name="global_font_change_title" msgid="1887126466191012035">"Ubah ukuran font"</string> - <string name="nfc_payment_settings_title" msgid="4226098386809754689">"Ketuk dan Bayar"</string> + <string name="nfc_payment_settings_title" msgid="1121386157283141856">"Pembayaran"</string> <string name="nfc_payment_ask" msgid="1061129391464251903">"Tanyakan setiap kali"</string> <string name="nfc_payment_set_default" msgid="1583397933053078296">"Jadikan preferensi Anda?"</string> <string name="restriction_settings_title" msgid="4233515503765879736">"Batasan"</string> diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml index 4a0e68d..6577f0d 100644 --- a/res/values-it/strings.xml +++ b/res/values-it/strings.xml @@ -1962,7 +1962,7 @@ <string name="global_change_warning" product="default" msgid="2461264421590324675">"Questa impostazione influisce su tutti gli utenti di questo telefono."</string> <string name="global_locale_change_title" msgid="5956281361384221451">"Cambia lingua"</string> <string name="global_font_change_title" msgid="1887126466191012035">"Cambia le dimensioni del carattere"</string> - <string name="nfc_payment_settings_title" msgid="4226098386809754689">"Tocca e paga"</string> + <string name="nfc_payment_settings_title" msgid="1121386157283141856">"Pagamenti"</string> <string name="nfc_payment_ask" msgid="1061129391464251903">"Chiedi ogni volta"</string> <string name="nfc_payment_set_default" msgid="1583397933053078296">"Impostare come preferenza?"</string> <string name="restriction_settings_title" msgid="4233515503765879736">"Limitazioni"</string> diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml index cce2aa4..d832600 100644 --- a/res/values-iw/strings.xml +++ b/res/values-iw/strings.xml @@ -1962,7 +1962,7 @@ <string name="global_change_warning" product="default" msgid="2461264421590324675">"הגדרה זו משפיעה על כל המשתמשים בטלפון הזה."</string> <string name="global_locale_change_title" msgid="5956281361384221451">"שנה שפה"</string> <string name="global_font_change_title" msgid="1887126466191012035">"שנה גודל גופן"</string> - <string name="nfc_payment_settings_title" msgid="4226098386809754689">"הקש ושלם"</string> + <string name="nfc_payment_settings_title" msgid="1121386157283141856">"תשלומים"</string> <string name="nfc_payment_ask" msgid="1061129391464251903">"שאל בכל פעם"</string> <string name="nfc_payment_set_default" msgid="1583397933053078296">"האם להגדיר בתור ההעדפה שלך?"</string> <string name="restriction_settings_title" msgid="4233515503765879736">"הגבלות"</string> diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml index e8774cb..0f27b7c 100644 --- a/res/values-ja/strings.xml +++ b/res/values-ja/strings.xml @@ -1968,7 +1968,7 @@ <string name="global_change_warning" product="default" msgid="2461264421590324675">"この設定はこの端末上のすべてのユーザーに影響します。"</string> <string name="global_locale_change_title" msgid="5956281361384221451">"言語の変更"</string> <string name="global_font_change_title" msgid="1887126466191012035">"フォントサイズの変更"</string> - <string name="nfc_payment_settings_title" msgid="4226098386809754689">"タップしてお支払い"</string> + <string name="nfc_payment_settings_title" msgid="1121386157283141856">"支払い"</string> <string name="nfc_payment_ask" msgid="1061129391464251903">"その都度確認"</string> <string name="nfc_payment_set_default" msgid="1583397933053078296">"設定として保存しますか？"</string> <string name="restriction_settings_title" msgid="4233515503765879736">"制限"</string> diff --git a/res/values-ka-rGE/strings.xml b/res/values-ka-rGE/strings.xml index 23a4e7d..c742704 100644 --- a/res/values-ka-rGE/strings.xml +++ b/res/values-ka-rGE/strings.xml @@ -637,7 +637,7 @@ <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"მდებარეობის ზუსტი განსაზღვრის და სხვა ფუნქციების გასაუმჯობესებლად <xliff:g id="APP_NAME">%1$s</xliff:g>-ს სურს, გააქტიურდეს ქსელების მოძიება, მაშინაც კი, როცა გამორთულია Wi-Fi.\n\nმიეცეს ამის უფლება ყველა აპს?"</string> <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"ნებართვა"</string> <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"უარყოფა"</string> - <string name="wifi_connect" msgid="1076622875777072845">"მიმდინარეობს დაკავშირება"</string> + <string name="wifi_connect" msgid="1076622875777072845">"დაკავშირება"</string> <string name="wifi_failed_connect_message" msgid="8491902558970292871">"ქსელთან დაკავშირება ვერ ხერხდება"</string> <string name="wifi_forget" msgid="8168174695608386644">"წაშლა"</string> <string name="wifi_failed_forget_message" msgid="1348172929201654986">"ქსელის დავიწყება ვერ მოხერხდა"</string> @@ -766,7 +766,7 @@ <string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"როდის ჩაირთოს Daydream"</string> <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"დაწყება ახლავე"</string> <string name="screensaver_settings_button" msgid="7292214707625717013">"პარამეტრები"</string> - <string name="automatic_brightness" msgid="5014143533884135461">"ავტომატური განათება"</string> + <string name="automatic_brightness" msgid="5014143533884135461">"ავტომატური სიკაშკაშე"</string> <string name="title_font_size" msgid="4405544325522105222">"შრიფტის ზომა"</string> <string name="dialog_title_font_size" msgid="2231507851258955038">"შრიფტის ზომა"</string> <string name="sim_lock_settings" msgid="3392331196873564292">"SIM ბარათის დაბლოკვის პარამეტრები"</string> @@ -931,7 +931,7 @@ <string name="restore_default_apn_completed" msgid="2824775307377604897">"ნაგულისხმევი APN პარამეტრების აღდგენა დასრულებულია"</string> <string name="master_clear_title" msgid="5907939616087039756">"ქარხნული მონაცემების აღდგენა"</string> <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"წაიშლება ყველა მონაცემი ტაბლეტზე"</string> - <string name="master_clear_summary" product="default" msgid="4986154238001088492">"შლის ტელეფონის ყველა მონაცემს"</string> + <string name="master_clear_summary" product="default" msgid="4986154238001088492">"მთლიანად შლის ტელეფონზე არსებულ მონაცემებს და აღადგენს მას ქარნულ მდგომარეობაში"</string> <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"ეს მოქმედება წაშლის ყველა მონაცემებს თქვენი ტაბლეტის "<b>"შიდა მეხსიერებიდან"</b>", მათ შორის:\n\n"<li>"თქვენს Google-ის ანგარიშს"</li>\n<li>"სისტემისა და აპების მონაცემებს და პარამეტრებს"</li>\n<li>"ჩამოტვირთულ აპებს"</li></string> <string name="master_clear_desc" product="default" msgid="9165016501623540228">"ეს მოქმედება წაშლის ყველა მონაცემებს თქვენი ტელეფონის "<b>"შიდა მეხსიერებიდან"</b>", მათ შორის:\n\n"<li>"თქვენს Google-ის ანგარიშს"</li>\n<li>"სისტემისა და აპების მონაცემებს და პარამეტრებს"</li>\n<li>"ჩამოტვირთულ აპებს"</li></string> <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"ამჟამად შესული ხართ შემდეგ ანგარიშებში:\n"</string> @@ -1076,7 +1076,7 @@ <string name="lockpattern_settings_enable_summary" msgid="1165707416664252167">"ტელეფონის დასაცავად გრაფიკული გასაღების გამოყენება"</string> <string name="lockpattern_settings_enable_visible_pattern_title" msgid="2615606088906120711">"გამოჩნდეს გრაფიკული გასაღები"</string> <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="8898518337442601027">"შეხებისას ვიბრაცია"</string> - <string name="lockpattern_settings_enable_power_button_instantly_locks" msgid="5735444062633666327">"„ჩართვით“ მყისიერად იბლოკება"</string> + <string name="lockpattern_settings_enable_power_button_instantly_locks" msgid="5735444062633666327">"ჩართვის ღილაკი ბლოკავს"</string> <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"განბლოკვის ნიმუშის დაყენება"</string> <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"გასაღების ცვლილება"</string> <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"როგორ დახაზოთ განბლოკვის გრაფიკული გასაღები"</string> @@ -1213,8 +1213,8 @@ <string name="service_started_by_app" msgid="818675099014723551">"აპის მიერ დაწყებული."</string> <!-- no translation found for service_client_name (4037193625611815517) --> <skip /> - <string name="service_background_processes" msgid="6844156253576174488">"თავისუფალი <xliff:g id="MEMORY">%1$s</xliff:g>"</string> - <string name="service_foreground_processes" msgid="7583975676795574276">"გამოყენებ: <xliff:g id="MEMORY">%1$s</xliff:g>"</string> + <string name="service_background_processes" msgid="6844156253576174488">"<xliff:g id="MEMORY">%1$s</xliff:g> თავისუფალი"</string> + <string name="service_foreground_processes" msgid="7583975676795574276">"<xliff:g id="MEMORY">%1$s</xliff:g> დაკავ."</string> <string name="memory" msgid="6609961111091483458">"RAM"</string> <!-- no translation found for service_process_name (4098932168654826656) --> <skip /> @@ -1259,7 +1259,7 @@ <string name="spellchecker_quick_settings" msgid="246728645150092058">"პარამეტრები"</string> <string name="spellchecker_language" msgid="6041050114690541437">"ენა"</string> <string name="failed_to_open_app_settings_toast" msgid="1251067459298072462">"<xliff:g id="SPELL_APPLICATION_NAME">%1$s</xliff:g>-ისთვის პარამეტრების გახსნა ვერ მოხერხდა"</string> - <string name="pointer_settings_category" msgid="8183819795164034286">"მაუსი/ტრეკპედი"</string> + <string name="pointer_settings_category" msgid="8183819795164034286">"თაგუნა/ტრეკპედი"</string> <string name="pointer_speed" msgid="1221342330217861616">"მანიშნებლის სიჩქარე"</string> <string name="game_controller_settings_category" msgid="8794508575329923718">"თამაშის მეთვალყურე"</string> <string name="vibrate_input_devices" msgid="2599591466928793082">"ვიბრატორის გამოყენება"</string> @@ -1622,14 +1622,14 @@ <string name="emergency_tone_summary" msgid="722259232924572153">"ქცევის დაყენება, როცა განხორციელებულია გადაუდებელი ზარი"</string> <string name="privacy_settings" msgid="5446972770562918934">"აღდგენა და ჩამოყრა"</string> <string name="privacy_settings_title" msgid="4856282165773594890">"&amp სარეზერვო ასლის შექმნა; აღდგენა"</string> - <string name="backup_section_title" msgid="7952232291452882740">"დამარქაფება და აღდგენა"</string> + <string name="backup_section_title" msgid="7952232291452882740">"სარეზერვო კოპირება და აღდგენა"</string> <string name="personal_data_section_title" msgid="7815209034443782061">"პერსონალური მონაცემები"</string> - <string name="backup_data_title" msgid="1239105919852668016">"მონაცემთა რეზერვირება"</string> + <string name="backup_data_title" msgid="1239105919852668016">"მონაცემების სარეზერვო კოპირება"</string> <string name="backup_data_summary" msgid="708773323451655666">"Google სერვერებზე აპების მონაცემების, Wi-Fi პაროლების და სხვა პარამეტრების შენახვა"</string> <string name="backup_configure_account_title" msgid="3790872965773196615">"სარეზერვო ანგარიში"</string> <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"ამჟამად არცერთი ანგარიში არ ინახავს დამარქაფებულ მონაცემებს"</string> <string name="auto_restore_title" msgid="5397528966329126506">"ავტომატური აღდგენა"</string> - <string name="auto_restore_summary" msgid="4235615056371993807">"აპის ინსტალაციის გამეორების დროს აღადგინეთ დამარქაფებული პარამეტრები და მონაცემები"</string> + <string name="auto_restore_summary" msgid="4235615056371993807">"აპის ხელახალი ინსტალაციისას აღდგეს პარამეტრები და მონაცემები სარეზერვო კოპიიდან, თუ ის არსებობს"</string> <string name="local_backup_password_title" msgid="3860471654439418822">"დესკტოპის სარეზერვო ასლის პაროლი"</string> <string name="local_backup_password_summary_none" msgid="393503434408227110">"დესკტოპის სრული სარეზერვო ასლები ამჟამად დაცული არ არის"</string> <string name="local_backup_password_summary_change" msgid="2731163425081172638">"შეეხეთ დესკტოპის სრული სარეზერვო ასლების პაროლის შესაცვლელად ან წასაშლელად"</string> @@ -1699,8 +1699,8 @@ <string name="sync_error" msgid="5060969083117872149">"სინქრონიზაციის შეცდომა"</string> <string name="last_synced" msgid="4242919465367022234">"ბოლო სინქ: <xliff:g id="LAST_SYNC_TIME">%1$s</xliff:g>"</string> <string name="sync_in_progress" msgid="5151314196536070569">"მიმდინარეობს სინქრონიზაცია…"</string> - <string name="settings_backup" msgid="2274732978260797031">"პარამეტრების დამარქაფება"</string> - <string name="settings_backup_summary" msgid="7916877705938054035">"ჩემი პარამეტრების დამარქაფება"</string> + <string name="settings_backup" msgid="2274732978260797031">"პარამეტრების სარეზერვო კოპირება"</string> + <string name="settings_backup_summary" msgid="7916877705938054035">"ჩემი პარამეტრების სარეზერვო კოპირება"</string> <string name="sync_menu_sync_now" msgid="6154608350395805683">"სინქრონიზაცია ახლავე"</string> <string name="sync_menu_sync_cancel" msgid="8292379009626966949">"სინქრონიზაციის გაუქმება"</string> <string name="sync_one_time_sync" msgid="6766593624598183090">"შეეხეთ სინქრონიზაციას ეხლა<xliff:g id="LAST_SYNC_TIME"> @@ -1720,7 +1720,7 @@ <string name="really_remove_account_message" product="tablet" msgid="1936147502815641161">"ამ ანგარიშის წაშლის შედეგად ტაბლეტზე წაიშლება ყველა შეტყობინება, კონტაქტი და სხვა მონაცემები!"</string> <string name="really_remove_account_message" product="default" msgid="3483528757922948356">"ანგარიშის წაშლა გამოიწვევს მასთან დაკავშირებული შეტყობინებების, კონტაქტებისა და სხვა ინფორმაციის ტელეფონიდან წაშლას!"</string> <string name="remove_account_failed" product="tablet" msgid="3086620478225952725">"ეს ანგარიში გამოიყენება ზოგიერთი აპლიკაციის მიერ. მის წაშლას შესძლებთ მხოლოდ ტაბლეტის ქარხნული მონაცემების აღდგენაზე გადაყენებით (რითაც წაიშლება ყველა თქვენი პირადი მონაცემი) განყოფილებიდან პარამეტრები > სარეზერვო ასლის გადაღება და ჩამოყრა."</string> - <string name="remove_account_failed" product="default" msgid="6217238709175617517">"ეს ანგარიში ესაჭიროება ზოგიერთ აპს. მისი წაშლა შესაძლებელია მხოლოდ ტელეფონზე ქარხნული ნაგულისხმევი მონაცემების აღდგენით (ეს წაშლის თქვენს პერსონალურ მონაცემებს სრულად) განყოფილებიდან პარამეტრები > დამარქაფება და ჩამოყრა."</string> + <string name="remove_account_failed" product="default" msgid="6217238709175617517">"ეს ანგარიში აუცილებელია ზოგიერთი აპის მუშაობისათვის. მისი წაშლა შესაძლებელია მხოლოდ ტელეფონის ქარხნულ მდომარეობაში აღდგენისას (რაც მოწყობილობიდან წაშლის თქვენს პერსონალურ მონაცემებს). ტელეფონის ჩამოყრის ფუნქცია ხელმისაწვდომია პარამეტრებიდან > რეზერვული კოპირება და ჩამოყრა > ქარხნული მონაცემების აღდგენა."</string> <string name="provider_label" msgid="7724593781904508866">"ოპერატორის შეტყობინებების გამოწერა"</string> <!-- no translation found for sync_item_title (4782834606909853006) --> <skip /> @@ -1962,7 +1962,7 @@ <string name="global_change_warning" product="default" msgid="2461264421590324675">"ეს პარამეტრები გავრცელდება ამ ტელეფონის ყველა მომხმარებელზე."</string> <string name="global_locale_change_title" msgid="5956281361384221451">"ენის შეცვლა"</string> <string name="global_font_change_title" msgid="1887126466191012035">"შრიფტის ზომის შეცვლა"</string> - <string name="nfc_payment_settings_title" msgid="4226098386809754689">"შეეხეთ და გადაიხადეთ"</string> + <string name="nfc_payment_settings_title" msgid="1121386157283141856">"Payments"</string> <string name="nfc_payment_ask" msgid="1061129391464251903">"მკითხე ყოველ ჯერზე"</string> <string name="nfc_payment_set_default" msgid="1583397933053078296">"დაყენდეს, როგორც უპირატესი?"</string> <string name="restriction_settings_title" msgid="4233515503765879736">"შეზღუდვები"</string> diff --git a/res/values-km-rKH/strings.xml b/res/values-km-rKH/strings.xml index 41207e8..603e0b0 100644 --- a/res/values-km-rKH/strings.xml +++ b/res/values-km-rKH/strings.xml @@ -1962,7 +1962,7 @@ <string name="global_change_warning" product="default" msgid="2461264421590324675">"ការកំណត់នេះប៉ះពាល់ដល់អ្នកប្រើទាំងអស់លើទូរស័ព្ទនេះ។"</string> <string name="global_locale_change_title" msgid="5956281361384221451">"ប្ដូរភាសា"</string> <string name="global_font_change_title" msgid="1887126466191012035">"ប្ដូរទំហំពុម្ពអក្សរ"</string> - <string name="nfc_payment_settings_title" msgid="4226098386809754689">"ប៉ះ និងចាក់"</string> + <string name="nfc_payment_settings_title" msgid="1121386157283141856">"ការបង់ប្រាក់"</string> <string name="nfc_payment_ask" msgid="1061129391464251903">"សួររាល់ពេល"</string> <string name="nfc_payment_set_default" msgid="1583397933053078296">"កំណត់ជាចំណូលចិត្តរបស់អ្នក?"</string> <string name="restriction_settings_title" msgid="4233515503765879736">"ការដាក់កម្រិត"</string> diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml index 60ac064..f88fa8d 100644 --- a/res/values-ko/strings.xml +++ b/res/values-ko/strings.xml @@ -933,7 +933,7 @@ <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"태블릿의 모든 데이터 지우기"</string> <string name="master_clear_summary" product="default" msgid="4986154238001088492">"휴대전화의 모든 데이터 지우기"</string> <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"공장 초기화하면 태블릿의 "<b>"내부 저장소의 모든 데이터가 삭제됩니다."</b>\n\n<li>"Google 계정"</li>\n<li>"시스템과 앱 데이터 및 설정"</li>\n<li>"다운로드된 앱"</li></string> - <string name="master_clear_desc" product="default" msgid="9165016501623540228">"공장 초기화하면 휴대전화의 "<b>"내부 저장소의 모든 데이터가 삭제됩니다."</b>\n\n<li>"Google 계정"</li>\n<li>"시스템과 앱 데이터 및 설정"</li>\n<li>"다운로드된 앱"</li></string> + <string name="master_clear_desc" product="default" msgid="9165016501623540228">"공장 초기화하면 휴대전화 "<b>"내부 저장소의 모든 데이터가 삭제됩니다."</b>\n\n<li>"Google 계정"</li>\n<li>"시스템과 앱 데이터 및 설정"</li>\n<li>"다운로드된 앱"</li></string> <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"현재 로그인한 계정:\n"</string> <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"음악"</li>\n<li>"사진"</li>\n<li>"기타 사용자 데이터"</li></string> <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"음악이나 사진, 기타 사용자 데이터를 지우려면 "<b>"USB 저장소"</b>"를 삭제해야 합니다."</string> @@ -1962,7 +1962,7 @@ <string name="global_change_warning" product="default" msgid="2461264421590324675">"이 설정은 휴대전화의 모든 사용자에게 영향을 줍니다."</string> <string name="global_locale_change_title" msgid="5956281361384221451">"언어 변경"</string> <string name="global_font_change_title" msgid="1887126466191012035">"글꼴 크기 변경"</string> - <string name="nfc_payment_settings_title" msgid="4226098386809754689">"탭앤페이"</string> + <string name="nfc_payment_settings_title" msgid="1121386157283141856">"결제"</string> <string name="nfc_payment_ask" msgid="1061129391464251903">"항상 확인"</string> <string name="nfc_payment_set_default" msgid="1583397933053078296">"기본으로 설정하시겠습니까?"</string> <string name="restriction_settings_title" msgid="4233515503765879736">"제한사항"</string> diff --git a/res/values-lo-rLA/strings.xml b/res/values-lo-rLA/strings.xml index ff98f84..688d2e9 100644 --- a/res/values-lo-rLA/strings.xml +++ b/res/values-lo-rLA/strings.xml @@ -1962,7 +1962,7 @@ <string name="global_change_warning" product="default" msgid="2461264421590324675">"ການຕັ້ງຄ່ານີ້ຈະມີຜົນກັບທຸກຜູ່ໃຊ້ໃນໂທລະສັບນີ້."</string> <string name="global_locale_change_title" msgid="5956281361384221451">"ປ່ຽນພາສາ"</string> <string name="global_font_change_title" msgid="1887126466191012035">"ປ່ຽນຂະໜາດໂຕອັກສອນ"</string> - <string name="nfc_payment_settings_title" msgid="4226098386809754689">"ແຕະແລະຈ່າຍ"</string> + <string name="nfc_payment_settings_title" msgid="1121386157283141856">"ການຊຳລະເງິນ"</string> <string name="nfc_payment_ask" msgid="1061129391464251903">"ຖາມທຸກຄັ້ງ"</string> <string name="nfc_payment_set_default" msgid="1583397933053078296">"ກຳນົດເປັນຄ່າທີ່ທ່ານຕ້ອງການ?"</string> <string name="restriction_settings_title" msgid="4233515503765879736">"ການຈໍາກັດ"</string> diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml index 48c9b12..c71bc9d 100644 --- a/res/values-lt/strings.xml +++ b/res/values-lt/strings.xml @@ -1962,7 +1962,7 @@ <string name="global_change_warning" product="default" msgid="2461264421590324675">"Šis nustatymas turi įtakos visiems šio telefono naudotojams."</string> <string name="global_locale_change_title" msgid="5956281361384221451">"Keisti kalbą"</string> <string name="global_font_change_title" msgid="1887126466191012035">"Keisti šrifto dydį"</string> - <string name="nfc_payment_settings_title" msgid="4226098386809754689">"Paliesti ir mokėti"</string> + <string name="nfc_payment_settings_title" msgid="1121386157283141856">"Mokėjimai"</string> <string name="nfc_payment_ask" msgid="1061129391464251903">"Klausti kaskart"</string> <string name="nfc_payment_set_default" msgid="1583397933053078296">"Nustatyti kaip jūsų nuostatą?"</string> <string name="restriction_settings_title" msgid="4233515503765879736">"Apribojimai"</string> diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml index d5d6f39..058d20f 100644 --- a/res/values-lv/strings.xml +++ b/res/values-lv/strings.xml @@ -1962,7 +1962,7 @@ <string name="global_change_warning" product="default" msgid="2461264421590324675">"Šis iestatījums ietekmē visus šī tālruņa lietotājus."</string> <string name="global_locale_change_title" msgid="5956281361384221451">"Valodas maiņa"</string> <string name="global_font_change_title" msgid="1887126466191012035">"Fonta lieluma maiņa"</string> - <string name="nfc_payment_settings_title" msgid="4226098386809754689">"Pieskarties un maksāt"</string> + <string name="nfc_payment_settings_title" msgid="1121386157283141856">"Maksājumi"</string> <string name="nfc_payment_ask" msgid="1061129391464251903">"Jautāt katru reizi"</string> <string name="nfc_payment_set_default" msgid="1583397933053078296">"Vai iestatīt kā jūsu preferenci?"</string> <string name="restriction_settings_title" msgid="4233515503765879736">"Ierobežojumi"</string> diff --git a/res/values-mn-rMN/strings.xml b/res/values-mn-rMN/strings.xml index f920f2b..2e874db 100644 --- a/res/values-mn-rMN/strings.xml +++ b/res/values-mn-rMN/strings.xml @@ -308,7 +308,7 @@ <string name="lock_after_timeout_summary" msgid="6128431871360905631">"Идэвхгүй болсны дараа <xliff:g id="TIMEOUT_STRING">%1$s</xliff:g>"</string> <string name="show_owner_info_on_lockscreen_label" msgid="5074906168357568434">"Дэлгэц түгжигдэхэд эзэмшигчийн мэдээллийг харуулах"</string> <string name="owner_info_settings_title" msgid="2723190010708381889">"Эзэмшигчийн мэдээлэл"</string> - <string name="security_enable_widgets_title" msgid="2754833397070967846">"Виджет идэвхжүүлэх"</string> + <string name="security_enable_widgets_title" msgid="2754833397070967846">"Хэрэгсэл идэвхжүүлэх"</string> <string name="security_enable_widgets_disabled_summary" msgid="1557090442377855233">"Админ идэвхгүй болгосон"</string> <string name="owner_info_settings_summary" msgid="3800834657847339570"></string> <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Түгжих дэлгэцэн дээр харуулах текстийг оруулна уу"</string> @@ -1962,7 +1962,7 @@ <string name="global_change_warning" product="default" msgid="2461264421590324675">"Энэ тохиргоо энэ утасны бүх хэрэглэгчид хамаарна."</string> <string name="global_locale_change_title" msgid="5956281361384221451">"Хэл солих"</string> <string name="global_font_change_title" msgid="1887126466191012035">"Фонтын хэмжээг өөрчлөх"</string> - <string name="nfc_payment_settings_title" msgid="4226098386809754689">"Товшоод төлөөрэй"</string> + <string name="nfc_payment_settings_title" msgid="1121386157283141856">"Төлбөр"</string> <string name="nfc_payment_ask" msgid="1061129391464251903">"Тухай бүрт асуух"</string> <string name="nfc_payment_set_default" msgid="1583397933053078296">"Таны тохируулга болгох уу?"</string> <string name="restriction_settings_title" msgid="4233515503765879736">"Хязгаарлалтууд"</string> diff --git a/res/values-ms-rMY/strings.xml b/res/values-ms-rMY/strings.xml index 2700743..b771639 100644 --- a/res/values-ms-rMY/strings.xml +++ b/res/values-ms-rMY/strings.xml @@ -1962,7 +1962,7 @@ <string name="global_change_warning" product="default" msgid="2461264421590324675">"Tetapan ini melibatkan semua pengguna pada telefon ini."</string> <string name="global_locale_change_title" msgid="5956281361384221451">"Tukar bahasa"</string> <string name="global_font_change_title" msgid="1887126466191012035">"Tukar saiz fon"</string> - <string name="nfc_payment_settings_title" msgid="4226098386809754689">"Ketik dan Bayar"</string> + <string name="nfc_payment_settings_title" msgid="1121386157283141856">"Pembayaran"</string> <string name="nfc_payment_ask" msgid="1061129391464251903">"Tanya setiap kali"</string> <string name="nfc_payment_set_default" msgid="1583397933053078296">"Jadikan sebagai pilihan anda?"</string> <string name="restriction_settings_title" msgid="4233515503765879736">"Sekatan"</string> diff --git a/res/values-nb/arrays.xml b/res/values-nb/arrays.xml index 40d827c..69d7511 100644 --- a/res/values-nb/arrays.xml +++ b/res/values-nb/arrays.xml @@ -440,7 +440,7 @@ <string-array name="debug_hw_overdraw_entries"> <item msgid="8190572633763871652">"Av"</item> <item msgid="7688197031296835369">"Vis overtrekksområder"</item> - <item msgid="2290859360633824369">"Vis områder for Deuteranomaly"</item> + <item msgid="2290859360633824369">"Vis områder for deuteranomali"</item> <item msgid="3448087929560624983">"Vis overtrekksteller"</item> </string-array> <string-array name="app_process_limit_entries"> diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml index 3f5b427..8383f45 100644 --- a/res/values-nb/strings.xml +++ b/res/values-nb/strings.xml @@ -1335,7 +1335,7 @@ <string name="select_runtime_title" msgid="649783802363155346">"Velg kjøretid"</string> <string name="select_runtime_dialog_title" msgid="5314872813037493958">"Velg kjøretid"</string> <string name="select_runtime_warning_message" msgid="1937574953265648165">"Vil du starte på nytt for å endre kjøretiden fra <xliff:g id="OLD">%1$s</xliff:g> til <xliff:g id="NEW">%2$s</xliff:g>?"</string> - <string name="wifi_display_certification" msgid="8611569543791307533">"Trådløs skjerm-sertifisering"</string> + <string name="wifi_display_certification" msgid="8611569543791307533">"Trådløs skjermsertifisering"</string> <string name="wifi_display_certification_summary" msgid="1155182309166746973">"Vis alternativer for trådløs skjerm-sertifisering"</string> <string name="allow_mock_location" msgid="2787962564578664888">"Tillat simulert posisjon"</string> <string name="allow_mock_location_summary" msgid="317615105156345626">"Tillat bruk av simulerte GPS-koordinater"</string> @@ -1962,7 +1962,7 @@ <string name="global_change_warning" product="default" msgid="2461264421590324675">"Denne innstillingen påvirker alle brukerne på denne telefonen."</string> <string name="global_locale_change_title" msgid="5956281361384221451">"Bytt språk"</string> <string name="global_font_change_title" msgid="1887126466191012035">"Endre skriftstørrelse"</string> - <string name="nfc_payment_settings_title" msgid="4226098386809754689">"Berøringsbetaling"</string> + <string name="nfc_payment_settings_title" msgid="1121386157283141856">"Betalinger"</string> <string name="nfc_payment_ask" msgid="1061129391464251903">"Spør hver gang"</string> <string name="nfc_payment_set_default" msgid="1583397933053078296">"Angi som foretrukket?"</string> <string name="restriction_settings_title" msgid="4233515503765879736">"Begrensninger"</string> diff --git a/res/values-ne-rNP/strings.xml b/res/values-ne-rNP/strings.xml index b1546c7..1f3d67a 100644 --- a/res/values-ne-rNP/strings.xml +++ b/res/values-ne-rNP/strings.xml @@ -801,7 +801,7 @@ <string name="fcc_equipment_id" msgid="149114368246356737">"उपकरण ID"</string> <string name="baseband_version" msgid="1848990160763524801">"बेसब्यान्ड संस्करण"</string> <string name="kernel_version" msgid="9192574954196167602">"कर्नेल संस्करण"</string> - <string name="build_number" msgid="3075795840572241758">"संख्या बनाउनुहोस्"</string> + <string name="build_number" msgid="3075795840572241758">"बिल्ड संख्या"</string> <string name="selinux_status" msgid="6212165375172061672">"SELinux वस्तुस्थिति"</string> <string name="device_info_not_available" msgid="8062521887156825182">"अनुपलब्ध"</string> <string name="device_status_activity_title" msgid="1411201799384697904">"वस्तुस्थिति"</string> @@ -844,7 +844,7 @@ <string name="memory_downloads_usage" msgid="3755173051677533027">"डाउनलोडहरू"</string> <string name="memory_dcim_usage" msgid="558887013613822577">"तस्बिरहरू, भिडियोहरू"</string> <string name="memory_music_usage" msgid="1363785144783011606">"अडियो (संगीत, रिङ्गटोन, पडकास्ट, आदि)"</string> - <string name="memory_media_misc_usage" msgid="235452944021647124">"विविध।"</string> + <string name="memory_media_misc_usage" msgid="235452944021647124">"विविध"</string> <string name="memory_media_cache_usage" msgid="6704293333141177910">"क्यास गरेको डेटा"</string> <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"साझेदारी भण्डारण अनमाउन्ट गर्नुहोस्"</string> <string name="sd_eject" product="default" msgid="6915293408836853020">"SD कार्ड अनमाउन्ट गर्नुहोस्"</string> @@ -1371,7 +1371,7 @@ <string name="app_name_label" msgid="5440362857006046193">"अनुप्रयोग"</string> <string name="launch_count_label" msgid="4019444833263957024">"गणना गर्नुहोस्"</string> <string name="usage_time_label" msgid="295954901452833058">"उपयोग समय"</string> - <string name="accessibility_settings" msgid="3975902491934816215">"पहुँचता"</string> + <string name="accessibility_settings" msgid="3975902491934816215">"पहुँच"</string> <string name="accessibility_settings_title" msgid="2130492524656204459">"उपलब्धता सेटिङहरू"</string> <string name="accessibility_services_title" msgid="2592221829284342237">"सेवाहरू"</string> <string name="accessibility_system_title" msgid="7187919089874130484">"प्रणाली"</string> @@ -1962,7 +1962,7 @@ <string name="global_change_warning" product="default" msgid="2461264421590324675">"यो सेटिङले यस फोनमा सबै प्रयोगकर्ताहरूलाई प्रभाव पार्दछ।"</string> <string name="global_locale_change_title" msgid="5956281361384221451">"भाषा परिवर्तन गर्नुहोस्"</string> <string name="global_font_change_title" msgid="1887126466191012035">"फन्ट साइज परिवर्तन गर्नुहोस्"</string> - <string name="nfc_payment_settings_title" msgid="4226098386809754689">"ट्याप गर्नुहोस् र भुक्तान गर्नुहोस्"</string> + <string name="nfc_payment_settings_title" msgid="1121386157283141856">"भुक्तानी"</string> <string name="nfc_payment_ask" msgid="1061129391464251903">"प्रत्येक चोटि सोध्नुहोस्"</string> <string name="nfc_payment_set_default" msgid="1583397933053078296">"तपाईँको प्राथमिकताको रूपमा सेट गर्ने हो?"</string> <string name="restriction_settings_title" msgid="4233515503765879736">"प्रतिबन्धहरू"</string> diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml index e169222..e301fc6 100644 --- a/res/values-nl/strings.xml +++ b/res/values-nl/strings.xml @@ -1962,7 +1962,7 @@ <string name="global_change_warning" product="default" msgid="2461264421590324675">"Deze instelling is van invloed op alle gebruikers van deze telefoon."</string> <string name="global_locale_change_title" msgid="5956281361384221451">"Taal wijzigen"</string> <string name="global_font_change_title" msgid="1887126466191012035">"Lettergrootte wijzigen"</string> - <string name="nfc_payment_settings_title" msgid="4226098386809754689">"Tikken en betalen"</string> + <string name="nfc_payment_settings_title" msgid="1121386157283141856">"Betalingen"</string> <string name="nfc_payment_ask" msgid="1061129391464251903">"Altijd vragen"</string> <string name="nfc_payment_set_default" msgid="1583397933053078296">"Instellen als uw voorkeur?"</string> <string name="restriction_settings_title" msgid="4233515503765879736">"Beperkingen"</string> diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml index 561d1a6..26f4743 100644 --- a/res/values-pl/strings.xml +++ b/res/values-pl/strings.xml @@ -21,7 +21,7 @@ <string name="create" msgid="3578857613172647409">"Utwórz"</string> <string name="allow" msgid="3349662621170855910">"Zezwól"</string> <string name="deny" msgid="6947806159746484865">"Odmów"</string> - <string name="device_info_default" msgid="7847265875578739287">"Nieznany"</string> + <string name="device_info_default" msgid="7847265875578739287">"Nieznane"</string> <plurals name="show_dev_countdown"> <item quantity="one" msgid="5295687242294085452">"Od zostania programistą dzieli Cię już tylko <xliff:g id="STEP_COUNT">%1$d</xliff:g> krok."</item> <item quantity="other" msgid="6722953419953594148">"Od zostania programistą dzieli Cię już tylko tyle kroków: <xliff:g id="STEP_COUNT">%1$d</xliff:g>."</item> @@ -88,7 +88,7 @@ <string name="battery_info_awake_battery" msgid="2557725975486185849">"Czas działania na baterii:"</string> <string name="battery_info_awake_plugged" msgid="176716874713478188">"Czas pozostawania w stanie wybudzenia podczas ładowania:"</string> <string name="battery_info_screen_on" msgid="376277447175613889">"Czas włączenia ekranu:"</string> - <string name="battery_info_status_unknown" msgid="196130600938058547">"Nieznany"</string> + <string name="battery_info_status_unknown" msgid="196130600938058547">"Nieznane"</string> <string name="battery_info_status_charging" msgid="1705179948350365604">"Ładowanie"</string> <string name="battery_info_status_charging_ac" msgid="5874340256342956252">"(AC)"</string> <string name="battery_info_status_charging_usb" msgid="4059070156126770959">"(USB)"</string> @@ -381,9 +381,9 @@ <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Zmień kod PIN odblokowania"</string> <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Zmień hasło odblokowania"</string> <string name="lockpassword_password_too_short" msgid="7328975683669256660">"Liczba znaków w haśle musi wynosić co najmniej %d"</string> - <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"PIN musi mieć co najmniej %d cyfr"</string> - <string name="lockpassword_press_continue" msgid="122706614386757182">"Gdy skończysz, wybierz Kontynuuj"</string> - <string name="lockpassword_continue_label" msgid="4602203784934526940">"Kontynuuj"</string> + <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"PIN musi mieć co najmniej %d cyfr(y)"</string> + <string name="lockpassword_press_continue" msgid="122706614386757182">"Gdy skończysz, wybierz Dalej"</string> + <string name="lockpassword_continue_label" msgid="4602203784934526940">"Dalej"</string> <string name="lockpassword_password_too_long" msgid="7016906583950201704">"Hasło musi mieć mniej znaków niż <xliff:g id="NUMBER">%d</xliff:g>."</string> <string name="lockpassword_pin_too_long" msgid="6419879099090294052">"Kod PIN musi mieć mniej cyfr niż <xliff:g id="NUMBER">%d</xliff:g>."</string> <string name="lockpassword_pin_contains_non_digits" msgid="1079053457942945709">"Kod PIN musi zawierać wyłącznie cyfry 0-9."</string> @@ -1032,7 +1032,7 @@ <string name="about_settings_summary" msgid="3371517697156165959">"Wyświetl informacje prawne, stan, wersję oprogramowania"</string> <string name="legal_information" msgid="5769301644270604095">"Informacje prawne"</string> <string name="contributors_title" msgid="5917703088825286504">"Współautorzy"</string> - <string name="regulatory_information" msgid="5695464367088752150">"Informacje prawne"</string> + <string name="regulatory_information" msgid="5695464367088752150">"Certyfikaty"</string> <string name="copyright_title" msgid="865906688917260647">"Prawa autorskie"</string> <string name="license_title" msgid="1990487604356037871">"Licencja"</string> <string name="terms_title" msgid="7697580845616764642">"Warunki i zasady korzystania"</string> @@ -1221,7 +1221,7 @@ <string name="running_process_item_user_label" msgid="3129887865552025943">"Użytkownik: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string> <string name="running_process_item_removed_user_label" msgid="8250168004291472959">"Użytkownik usunięty"</string> <string name="running_processes_item_description_s_s" msgid="5790575965282023145">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> proces, <xliff:g id="NUMSERVICES">%2$d</xliff:g> usługa"</string> - <string name="running_processes_item_description_s_p" msgid="8019860457123222953">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> proces, <xliff:g id="NUMSERVICES">%2$d</xliff:g> usługi"</string> + <string name="running_processes_item_description_s_p" msgid="8019860457123222953">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> proces, <xliff:g id="NUMSERVICES">%2$d</xliff:g> usług(i)"</string> <string name="running_processes_item_description_p_s" msgid="744424668287252915">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> procesy, <xliff:g id="NUMSERVICES">%2$d</xliff:g> usługa"</string> <string name="running_processes_item_description_p_p" msgid="1607384595790852782">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> procesy, <xliff:g id="NUMSERVICES">%2$d</xliff:g> usługi"</string> <string name="runningservicedetails_settings_title" msgid="3224004818524731568">"Uruchomiona aplikacja"</string> @@ -1419,7 +1419,7 @@ <string name="color_magenta" msgid="5059212823607815549">"Amarantowy"</string> <string name="enable_service_title" msgid="3061307612673835592">"Użyć usługi <xliff:g id="SERVICE">%1$s</xliff:g>?"</string> <string name="capabilities_list_title" msgid="86713361724771971">"Wymagania usługi <xliff:g id="SERVICE">%1$s</xliff:g>:"</string> - <string name="capability_title_receiveAccessibilityEvents" msgid="1869032063969970755">"Obserwowanie Twoich działań"</string> + <string name="capability_title_receiveAccessibilityEvents" msgid="1869032063969970755">"Obserwuj swoje działania"</string> <string name="capability_desc_receiveAccessibilityEvents" msgid="2095111008854376237">"Otrzymywanie powiadomień podczas Twojej pracy z aplikacją."</string> <string name="disable_service_title" msgid="3624005212728512896">"Zatrzymać <xliff:g id="SERVICE">%1$s</xliff:g>?"</string> <string name="disable_service_message" msgid="2012273739481042318">"Dotknięcie OK spowoduje zatrzymanie usługi <xliff:g id="SERVICE">%1$s</xliff:g>."</string> @@ -1962,7 +1962,7 @@ <string name="global_change_warning" product="default" msgid="2461264421590324675">"To ustawienie obowiązuje wszystkich użytkowników tego telefonu."</string> <string name="global_locale_change_title" msgid="5956281361384221451">"Zmień język"</string> <string name="global_font_change_title" msgid="1887126466191012035">"Zmień rozmiar czcionki"</string> - <string name="nfc_payment_settings_title" msgid="4226098386809754689">"Dotknij i zapłać"</string> + <string name="nfc_payment_settings_title" msgid="1121386157283141856">"Płatności"</string> <string name="nfc_payment_ask" msgid="1061129391464251903">"Zawsze pytaj"</string> <string name="nfc_payment_set_default" msgid="1583397933053078296">"Ustawić jako Twoją preferencję?"</string> <string name="restriction_settings_title" msgid="4233515503765879736">"Ograniczenia"</string> diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml index 881e7a7..21833bd 100644 --- a/res/values-pt-rPT/strings.xml +++ b/res/values-pt-rPT/strings.xml @@ -1962,7 +1962,7 @@ <string name="global_change_warning" product="default" msgid="2461264421590324675">"Esta definição afeta todos os utilizadores deste telemóvel."</string> <string name="global_locale_change_title" msgid="5956281361384221451">"Alterar idioma"</string> <string name="global_font_change_title" msgid="1887126466191012035">"Alterar tamanho da letra"</string> - <string name="nfc_payment_settings_title" msgid="4226098386809754689">"Tocar e Pagar"</string> + <string name="nfc_payment_settings_title" msgid="1121386157283141856">"Pagamentos"</string> <string name="nfc_payment_ask" msgid="1061129391464251903">"Perguntar sempre"</string> <string name="nfc_payment_set_default" msgid="1583397933053078296">"Definir como preferência?"</string> <string name="restriction_settings_title" msgid="4233515503765879736">"Restrições"</string> diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml index a662274..e408c1e 100644 --- a/res/values-pt/strings.xml +++ b/res/values-pt/strings.xml @@ -1962,7 +1962,7 @@ <string name="global_change_warning" product="default" msgid="2461264421590324675">"Esta configuração afeta todos os usuários do telefone."</string> <string name="global_locale_change_title" msgid="5956281361384221451">"Alterar idioma"</string> <string name="global_font_change_title" msgid="1887126466191012035">"Alterar tamanho da fonte"</string> - <string name="nfc_payment_settings_title" msgid="4226098386809754689">"Tocar e pagar"</string> + <string name="nfc_payment_settings_title" msgid="1121386157283141856">"Pagamentos"</string> <string name="nfc_payment_ask" msgid="1061129391464251903">"Perguntar sempre"</string> <string name="nfc_payment_set_default" msgid="1583397933053078296">"Definir como preferência?"</string> <string name="restriction_settings_title" msgid="4233515503765879736">"Restrições"</string> diff --git a/res/values-rm/strings.xml b/res/values-rm/strings.xml index 37a3b16..aecdad9 100644 --- a/res/values-rm/strings.xml +++ b/res/values-rm/strings.xml @@ -3208,7 +3208,7 @@ <skip /> <!-- no translation found for global_font_change_title (1887126466191012035) --> <skip /> - <!-- no translation found for nfc_payment_settings_title (4226098386809754689) --> + <!-- no translation found for nfc_payment_settings_title (1121386157283141856) --> <skip /> <!-- no translation found for nfc_payment_ask (1061129391464251903) --> <skip /> diff --git a/res/values-ro/arrays.xml b/res/values-ro/arrays.xml index e801514..55cf382 100644 --- a/res/values-ro/arrays.xml +++ b/res/values-ro/arrays.xml @@ -194,7 +194,7 @@ <item msgid="628395202971532382">"Static"</item> </string-array> <string-array name="wifi_proxy_settings"> - <item msgid="4473276491748503377">"Niciunul"</item> + <item msgid="4473276491748503377">"Niciuna"</item> <item msgid="8673874894887358090">"Manual"</item> </string-array> <string-array name="emergency_tone_entries"> diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml index 9acc8eb..729f884 100644 --- a/res/values-ro/strings.xml +++ b/res/values-ro/strings.xml @@ -562,7 +562,7 @@ <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"În modul Avion"</string> <string name="wifi_fail_to_scan" msgid="1265540342578081461">"Nu se poate scana pentru reţele"</string> <string name="wifi_notify_open_networks" msgid="3755768188029653293">"Notificare de reţea"</string> - <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"Doresc să fiu notificat când este disponibilă o reţea deschisă"</string> + <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"Anunță-mă când este disponibilă o rețea deschisă"</string> <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Evitaţi conexiunile slabe"</string> <string name="wifi_poor_network_detection_summary" msgid="7843672905900544785">"Nu utilizați o reţea Wi-Fi, cu excepția cazului în care aceasta are o conexiune la internet adecvată"</string> <string name="wifi_scan_always_available" msgid="3470564139944368030">"Scanare mereu disponibilă"</string> @@ -611,7 +611,7 @@ <string name="wifi_security" msgid="6603611185592956936">"Securitatea"</string> <string name="wifi_signal" msgid="5514120261628065287">"Putere semnal"</string> <string name="wifi_status" msgid="4824568012414605414">"Stare"</string> - <string name="wifi_speed" msgid="3526198708812322037">"Viteză link"</string> + <string name="wifi_speed" msgid="3526198708812322037">"Viteză"</string> <string name="wifi_ip_address" msgid="1440054061044402918">"Adresă IP"</string> <string name="wifi_eap_method" msgid="8529436133640730382">"Metodă EAP"</string> <string name="please_select_phase2" msgid="5231074529772044898">"Autentificare faza 2"</string> @@ -1963,7 +1963,7 @@ <string name="global_change_warning" product="default" msgid="2461264421590324675">"Această setare afectează toţi utilizatorii de pe acest telefon."</string> <string name="global_locale_change_title" msgid="5956281361384221451">"Schimbaţi limba"</string> <string name="global_font_change_title" msgid="1887126466191012035">"Modificaţi dimensiunea fontului"</string> - <string name="nfc_payment_settings_title" msgid="4226098386809754689">"Atingeți și plătiți"</string> + <string name="nfc_payment_settings_title" msgid="1121386157283141856">"Plăți"</string> <string name="nfc_payment_ask" msgid="1061129391464251903">"Întreabă de fiecare dată"</string> <string name="nfc_payment_set_default" msgid="1583397933053078296">"Setați ca preferință?"</string> <string name="restriction_settings_title" msgid="4233515503765879736">"Restricții"</string> diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml index 21a0b11..02d63e2 100644 --- a/res/values-ru/strings.xml +++ b/res/values-ru/strings.xml @@ -1964,7 +1964,7 @@ <string name="global_change_warning" product="default" msgid="2461264421590324675">"Настройки будут изменены для всех пользователей устройства."</string> <string name="global_locale_change_title" msgid="5956281361384221451">"Измените язык"</string> <string name="global_font_change_title" msgid="1887126466191012035">"Измените размер шрифта"</string> - <string name="nfc_payment_settings_title" msgid="4226098386809754689">"Нажать и оплатить"</string> + <string name="nfc_payment_settings_title" msgid="1121386157283141856">"Платежи"</string> <string name="nfc_payment_ask" msgid="1061129391464251903">"Всегда спрашивать"</string> <string name="nfc_payment_set_default" msgid="1583397933053078296">"Сохранить настройку?"</string> <string name="restriction_settings_title" msgid="4233515503765879736">"Ограничения"</string> diff --git a/res/values-si-rLK/strings.xml b/res/values-si-rLK/strings.xml index 482a2d5..0699f0d 100644 --- a/res/values-si-rLK/strings.xml +++ b/res/values-si-rLK/strings.xml @@ -1964,7 +1964,7 @@ <string name="global_change_warning" product="default" msgid="2461264421590324675">"මෙම දුරකථනයේ සියලු පරිශීලකයන්ට මෙම සැකසීම් බලපායි."</string> <string name="global_locale_change_title" msgid="5956281361384221451">"භාෂාව වෙනස් කරන්න"</string> <string name="global_font_change_title" msgid="1887126466191012035">"අකුරු ප්රමාණය වෙනස් කරන්න"</string> - <string name="nfc_payment_settings_title" msgid="4226098386809754689">"තට්ටු කර ගෙවන්න"</string> + <string name="nfc_payment_settings_title" msgid="1121386157283141856">"ගෙවීම්"</string> <string name="nfc_payment_ask" msgid="1061129391464251903">"සෑම වේලාවේම අසන්න"</string> <string name="nfc_payment_set_default" msgid="1583397933053078296">"ඔබගේ මනාපය ලෙස සකසන්නද?"</string> <string name="restriction_settings_title" msgid="4233515503765879736">"සිමා"</string> diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml index 9094f2d..dc18744 100644 --- a/res/values-sk/strings.xml +++ b/res/values-sk/strings.xml @@ -536,7 +536,7 @@ <string name="wifi_display_autonomous_go" msgid="140864379216673466">"Povoliť autonómneho vlastníka skupiny"</string> <string name="wifi_display_pause" msgid="6037110530682927245">"Pozastaviť"</string> <string name="wifi_display_resume" msgid="8195590160258469425">"Obnoviť"</string> - <string name="wifi_display_listen_channel" msgid="4146320990898147857">"Kanál pre počúvanie"</string> + <string name="wifi_display_listen_channel" msgid="4146320990898147857">"Kanál na počúvanie"</string> <string name="wifi_display_operating_channel" msgid="233535284689144515">"Operačný kanál"</string> <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string> <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Povoliť výmenu údajov, ak sa tablet dotýka iného zariadenia"</string> @@ -1962,7 +1962,7 @@ <string name="global_change_warning" product="default" msgid="2461264421590324675">"Toto nastavenie ovplyvní všetkých používateľov tohto telefónu."</string> <string name="global_locale_change_title" msgid="5956281361384221451">"Zmeniť jazyk"</string> <string name="global_font_change_title" msgid="1887126466191012035">"Zmeniť veľkosť písma"</string> - <string name="nfc_payment_settings_title" msgid="4226098386809754689">"Platenie priložením"</string> + <string name="nfc_payment_settings_title" msgid="1121386157283141856">"Platby"</string> <string name="nfc_payment_ask" msgid="1061129391464251903">"Vždy sa opýtať"</string> <string name="nfc_payment_set_default" msgid="1583397933053078296">"Nastaviť ako predvoľbu?"</string> <string name="restriction_settings_title" msgid="4233515503765879736">"Obmedzenia"</string> diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml index 44cc6d3..9f937ff 100644 --- a/res/values-sl/strings.xml +++ b/res/values-sl/strings.xml @@ -1962,7 +1962,7 @@ <string name="global_change_warning" product="default" msgid="2461264421590324675">"Nastavitev vpliva na vse uporabnike v tem telefonu."</string> <string name="global_locale_change_title" msgid="5956281361384221451">"Spremenjen jezik"</string> <string name="global_font_change_title" msgid="1887126466191012035">"Spremenjena velikost pisave"</string> - <string name="nfc_payment_settings_title" msgid="4226098386809754689">"Plačilo z dotikom"</string> + <string name="nfc_payment_settings_title" msgid="1121386157283141856">"Plačila"</string> <string name="nfc_payment_ask" msgid="1061129391464251903">"Vedno vprašaj"</string> <string name="nfc_payment_set_default" msgid="1583397933053078296">"Želite nastaviti kot prednostno?"</string> <string name="restriction_settings_title" msgid="4233515503765879736">"Omejitve"</string> diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml index bb90032..d763ce8 100644 --- a/res/values-sr/strings.xml +++ b/res/values-sr/strings.xml @@ -1962,7 +1962,7 @@ <string name="global_change_warning" product="default" msgid="2461264421590324675">"Ово подешавање утиче на све кориснике овог телефона."</string> <string name="global_locale_change_title" msgid="5956281361384221451">"Промена језика"</string> <string name="global_font_change_title" msgid="1887126466191012035">"Промена величине фонта"</string> - <string name="nfc_payment_settings_title" msgid="4226098386809754689">"Додирни и плати"</string> + <string name="nfc_payment_settings_title" msgid="1121386157283141856">"Уплате"</string> <string name="nfc_payment_ask" msgid="1061129391464251903">"Питај сваки пут"</string> <string name="nfc_payment_set_default" msgid="1583397933053078296">"Желите ли да поставите као жељено подешавање?"</string> <string name="restriction_settings_title" msgid="4233515503765879736">"Ограничења"</string> diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml index 4ac1c8f..cc0d349 100644 --- a/res/values-sv/strings.xml +++ b/res/values-sv/strings.xml @@ -1962,7 +1962,7 @@ <string name="global_change_warning" product="default" msgid="2461264421590324675">"Den här inställningen påverkar samtliga användare."</string> <string name="global_locale_change_title" msgid="5956281361384221451">"Ändra språk"</string> <string name="global_font_change_title" msgid="1887126466191012035">"Ändra teckenstorlek"</string> - <string name="nfc_payment_settings_title" msgid="4226098386809754689">"Snudda och betala"</string> + <string name="nfc_payment_settings_title" msgid="1121386157283141856">"Betalningar"</string> <string name="nfc_payment_ask" msgid="1061129391464251903">"Fråga varje gång"</string> <string name="nfc_payment_set_default" msgid="1583397933053078296">"Vill du ange den här som standard?"</string> <string name="restriction_settings_title" msgid="4233515503765879736">"Begränsningar"</string> diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml index 938d253..aa5d68f 100644 --- a/res/values-sw/strings.xml +++ b/res/values-sw/strings.xml @@ -551,7 +551,7 @@ <string name="wifi_starting" msgid="6732377932749942954">"Inawasha Wi-Fi..."</string> <string name="wifi_stopping" msgid="8952524572499500804">"Inazima Wi-Fi..."</string> <string name="wifi_error" msgid="3207971103917128179">"Hitilafu"</string> - <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"Katika modi ya ndege"</string> + <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"Hali ya ndege imewashwa"</string> <string name="wifi_fail_to_scan" msgid="1265540342578081461">"Haiwezi kutambaza mitandao"</string> <string name="wifi_notify_open_networks" msgid="3755768188029653293">"Arifa ya mtandao"</string> <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"Nijulishe wakati kuna mtandao huru"</string> @@ -1154,7 +1154,7 @@ <string name="app_not_found_dlg_text" msgid="8333723538280257243">"Programu haikupatikana katika orodha ya programu za kompyuta zilizosakinishwa."</string> <string name="clear_data_failed" msgid="1907582169616856698">"Haikuweza kufuta data ya programu."</string> <string name="app_factory_reset_dlg_title" msgid="7441012826373143593">"Unataka kusanidua masasisho?"</string> - <string name="app_factory_reset_dlg_text" msgid="6371247225487725860">"Usasisho zote kwa mfumo wa programu ya Android zitasakinishuliwa."</string> + <string name="app_factory_reset_dlg_text" msgid="6371247225487725860">"Masasisho yote ya programu hii ya mfumo wa Android yataondolewa."</string> <string name="clear_failed_dlg_title" msgid="2387060805294783175">"Futa data"</string> <string name="clear_failed_dlg_text" msgid="1092177570631523106">"Haikuweza kufuta data ya programu."</string> <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"Programu hii inaweza kufikia yafuatayo kwenye kompyuta kibao yako:"</string> @@ -1489,7 +1489,7 @@ <string name="battery_desc_standby" product="tablet" msgid="6284747418668280364">"Betri inayotumiwa wakati kompyuta kibao haitumiki"</string> <string name="battery_desc_standby" product="default" msgid="3009080001948091424">"Betri imetumiwa wakati simu haitumiki"</string> <string name="battery_desc_radio" msgid="5479196477223185367">"Betri inayotumiwa na redio ya seli"</string> - <string name="battery_sugg_radio" msgid="8211336978326295047">"Ingia kwenye modi ya ndege na uokoe nishati katika maeneo ambamo hakuna mtandao wa simu ya mkononi"</string> + <string name="battery_sugg_radio" msgid="8211336978326295047">"Ingia katika hali ya ndege na uokoe nishati katika maeneo ambamo hakuna mtandao wa simu ya mkononi"</string> <string name="battery_desc_display" msgid="5432795282958076557">"Betri uliyotumiwa na kizinza na taa ya nyuma"</string> <string name="battery_sugg_display" msgid="3370202402045141760">"Punguza mwangaza wa skrini na/au muda wa kuisha wa skrini"</string> <string name="battery_desc_wifi" msgid="2375567464707394131">"Betri imetumiwa na Wi-Fi"</string> @@ -1956,7 +1956,7 @@ <string name="global_change_warning" product="default" msgid="2461264421590324675">"Mpangilio huu unaathiri watumiaji wote kwenye simu hii."</string> <string name="global_locale_change_title" msgid="5956281361384221451">"Badilisha lugha"</string> <string name="global_font_change_title" msgid="1887126466191012035">"Badilisha ukubwa wa fonti"</string> - <string name="nfc_payment_settings_title" msgid="4226098386809754689">"Gonga na Ulipe"</string> + <string name="nfc_payment_settings_title" msgid="1121386157283141856">"Malipo"</string> <string name="nfc_payment_ask" msgid="1061129391464251903">"Uliza kila wakati"</string> <string name="nfc_payment_set_default" msgid="1583397933053078296">"Ungependa kuweka kama mapendeleo yako?"</string> <string name="restriction_settings_title" msgid="4233515503765879736">"Vikwazo"</string> diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml index 237ffbf..5a1ef9e 100644 --- a/res/values-th/strings.xml +++ b/res/values-th/strings.xml @@ -1962,7 +1962,7 @@ <string name="global_change_warning" product="default" msgid="2461264421590324675">"การตั้งค่านี้ส่งผลต่อผู้ใช้โทรศัพท์นี้ทุกราย"</string> <string name="global_locale_change_title" msgid="5956281361384221451">"เปลี่ยนภาษา"</string> <string name="global_font_change_title" msgid="1887126466191012035">"เปลี่ยนขนาดแบบอักษร"</string> - <string name="nfc_payment_settings_title" msgid="4226098386809754689">"แตะและจ่าย"</string> + <string name="nfc_payment_settings_title" msgid="1121386157283141856">"การชำระเงิน"</string> <string name="nfc_payment_ask" msgid="1061129391464251903">"ถามทุกครั้ง"</string> <string name="nfc_payment_set_default" msgid="1583397933053078296">"ตั้งเป็นค่ากำหนดของคุณไหม"</string> <string name="restriction_settings_title" msgid="4233515503765879736">"ข้อจำกัด"</string> diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml index 58a0a32..cf1fc17 100644 --- a/res/values-tl/strings.xml +++ b/res/values-tl/strings.xml @@ -1962,7 +1962,7 @@ <string name="global_change_warning" product="default" msgid="2461264421590324675">"Nakakaapekto ang setting na ito sa lahat ng user sa teleponong ito."</string> <string name="global_locale_change_title" msgid="5956281361384221451">"Baguhin ang wika"</string> <string name="global_font_change_title" msgid="1887126466191012035">"Baguhin ang laki ng font"</string> - <string name="nfc_payment_settings_title" msgid="4226098386809754689">"Mag-tap at Magbayad"</string> + <string name="nfc_payment_settings_title" msgid="1121386157283141856">"Mga Pagbabayad"</string> <string name="nfc_payment_ask" msgid="1061129391464251903">"Itanong palagi"</string> <string name="nfc_payment_set_default" msgid="1583397933053078296">"Itakda bilang iyong kagustuhan?"</string> <string name="restriction_settings_title" msgid="4233515503765879736">"Mga Paghihigpit"</string> diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml index ba7c837..9708c25 100644 --- a/res/values-tr/strings.xml +++ b/res/values-tr/strings.xml @@ -1962,7 +1962,7 @@ <string name="global_change_warning" product="default" msgid="2461264421590324675">"Bu ayar bu telefondaki tüm kullanıcıları etkiler."</string> <string name="global_locale_change_title" msgid="5956281361384221451">"Dili değiştir"</string> <string name="global_font_change_title" msgid="1887126466191012035">"Yazı tipi boyutunu değiştir"</string> - <string name="nfc_payment_settings_title" msgid="4226098386809754689">"Dokun ve Öde"</string> + <string name="nfc_payment_settings_title" msgid="1121386157283141856">"Ödemeler"</string> <string name="nfc_payment_ask" msgid="1061129391464251903">"Her zaman sor"</string> <string name="nfc_payment_set_default" msgid="1583397933053078296">"Tercihiniz olarak ayarlansın mı?"</string> <string name="restriction_settings_title" msgid="4233515503765879736">"Kısıtlamalar"</string> diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml index 36c49f1..0b27ca1 100644 --- a/res/values-uk/strings.xml +++ b/res/values-uk/strings.xml @@ -533,7 +533,7 @@ <string name="wifi_display_certification_heading" msgid="3125105883233765652">"Сертифікація"</string> <string name="wifi_display_session_info" msgid="4733627902691604836">"Дані сеансу"</string> <string name="wifi_display_listen_mode" msgid="2962301785910874273">"Увімкнути режим слухання"</string> - <string name="wifi_display_autonomous_go" msgid="140864379216673466">"Увімкнути автономного власника групи"</string> + <string name="wifi_display_autonomous_go" msgid="140864379216673466">"Увімкнути незалежного власника групи"</string> <string name="wifi_display_pause" msgid="6037110530682927245">"Призупинити"</string> <string name="wifi_display_resume" msgid="8195590160258469425">"Відновити"</string> <string name="wifi_display_listen_channel" msgid="4146320990898147857">"Канал для слухання"</string> @@ -1962,7 +1962,7 @@ <string name="global_change_warning" product="default" msgid="2461264421590324675">"Це налаштування впливає на всіх користувачів цього телефону."</string> <string name="global_locale_change_title" msgid="5956281361384221451">"Змінити мову"</string> <string name="global_font_change_title" msgid="1887126466191012035">"Змінити розмір шрифту"</string> - <string name="nfc_payment_settings_title" msgid="4226098386809754689">"Натиснути й оплатити"</string> + <string name="nfc_payment_settings_title" msgid="1121386157283141856">"Платежі"</string> <string name="nfc_payment_ask" msgid="1061129391464251903">"Запитувати щоразу"</string> <string name="nfc_payment_set_default" msgid="1583397933053078296">"Установити як вибраний?"</string> <string name="restriction_settings_title" msgid="4233515503765879736">"Обмеження"</string> diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml index 24fe360..5c4947d 100644 --- a/res/values-vi/strings.xml +++ b/res/values-vi/strings.xml @@ -1962,7 +1962,7 @@ <string name="global_change_warning" product="default" msgid="2461264421590324675">"Cài đặt này ảnh hưởng đến tất cả người dùng trên điện thoại này."</string> <string name="global_locale_change_title" msgid="5956281361384221451">"Thay đổi ngôn ngữ"</string> <string name="global_font_change_title" msgid="1887126466191012035">"Thay đổi cỡ chữ"</string> - <string name="nfc_payment_settings_title" msgid="4226098386809754689">"Nhấn và thanh toán"</string> + <string name="nfc_payment_settings_title" msgid="1121386157283141856">"Thanh toán"</string> <string name="nfc_payment_ask" msgid="1061129391464251903">"Luôn hỏi"</string> <string name="nfc_payment_set_default" msgid="1583397933053078296">"Đặt làm tùy chọn của bạn?"</string> <string name="restriction_settings_title" msgid="4233515503765879736">"Hạn chế"</string> diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml index 4a2fed0..6d09a0f 100644 --- a/res/values-zh-rCN/strings.xml +++ b/res/values-zh-rCN/strings.xml @@ -1962,7 +1962,7 @@ <string name="global_change_warning" product="default" msgid="2461264421590324675">"此设置会影响这部手机上的所有用户。"</string> <string name="global_locale_change_title" msgid="5956281361384221451">"更改语言"</string> <string name="global_font_change_title" msgid="1887126466191012035">"更改字体大小"</string> - <string name="nfc_payment_settings_title" msgid="4226098386809754689">"触碰付款"</string> + <string name="nfc_payment_settings_title" msgid="1121386157283141856">"付款"</string> <string name="nfc_payment_ask" msgid="1061129391464251903">"每次都询问"</string> <string name="nfc_payment_set_default" msgid="1583397933053078296">"要设为您的偏好设置吗？"</string> <string name="restriction_settings_title" msgid="4233515503765879736">"限制"</string> diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml index 5c83d1f..503ca09 100644 --- a/res/values-zh-rHK/strings.xml +++ b/res/values-zh-rHK/strings.xml @@ -1966,7 +1966,7 @@ <string name="global_change_warning" product="default" msgid="2461264421590324675">"這項設定會影響這部手機的所有用戶。"</string> <string name="global_locale_change_title" msgid="5956281361384221451">"更改語言"</string> <string name="global_font_change_title" msgid="1887126466191012035">"更改字型大小"</string> - <string name="nfc_payment_settings_title" msgid="4226098386809754689">"輕按即付"</string> + <string name="nfc_payment_settings_title" msgid="1121386157283141856">"付款"</string> <string name="nfc_payment_ask" msgid="1061129391464251903">"每次都詢問"</string> <string name="nfc_payment_set_default" msgid="1583397933053078296">"設為您的喜好設定？"</string> <string name="restriction_settings_title" msgid="4233515503765879736">"限制"</string> diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml index 18512ff..dcdbf79 100644 --- a/res/values-zh-rTW/strings.xml +++ b/res/values-zh-rTW/strings.xml @@ -1966,7 +1966,7 @@ <string name="global_change_warning" product="default" msgid="2461264421590324675">"這項設定會影響這支手機的所有使用者。"</string> <string name="global_locale_change_title" msgid="5956281361384221451">"變更語言"</string> <string name="global_font_change_title" msgid="1887126466191012035">"變更字型大小"</string> - <string name="nfc_payment_settings_title" msgid="4226098386809754689">"隨點即付"</string> + <string name="nfc_payment_settings_title" msgid="1121386157283141856">"付款"</string> <string name="nfc_payment_ask" msgid="1061129391464251903">"每次都詢問"</string> <string name="nfc_payment_set_default" msgid="1583397933053078296">"設為您的偏好設定？"</string> <string name="restriction_settings_title" msgid="4233515503765879736">"限制"</string> diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml index 020b677..134dd09 100644 --- a/res/values-zu/strings.xml +++ b/res/values-zu/strings.xml @@ -1969,7 +1969,7 @@ <string name="global_change_warning" product="default" msgid="2461264421590324675">"Lesi silungiselelo sithinta bonke abasebenzisi kule foni."</string> <string name="global_locale_change_title" msgid="5956281361384221451">"Shintsha ulimi"</string> <string name="global_font_change_title" msgid="1887126466191012035">"Shintsha usayizi wefonti"</string> - <string name="nfc_payment_settings_title" msgid="4226098386809754689">"Thepha bese uyadlala"</string> + <string name="nfc_payment_settings_title" msgid="1121386157283141856">"Izinkokhelo"</string> <string name="nfc_payment_ask" msgid="1061129391464251903">"Buza ngaso sonke isikhathi"</string> <string name="nfc_payment_set_default" msgid="1583397933053078296">"Setha njengokuncanyelwayo kwakho?"</string> <string name="restriction_settings_title" msgid="4233515503765879736">"Izinciphiso"</string> diff --git a/res/values/strings.xml b/res/values/strings.xml index d263e70..ded01d9 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -1274,6 +1274,8 @@ <string name="wifi_display_pause">Pause</string> <!-- Wifi Display settings. The button text for sending play (resume) trigger during certification process. [CHAR LIMIT=40] --> <string name="wifi_display_resume">Resume</string> + <!-- Wifi Display settings. The dropdown menu title for choosing WPS configuration during certification process. [CHAR LIMIT=40] --> + <string name="wifi_display_wps_config">WPS configuration</string> <!-- Wifi Display settings. The dropdown menu title for choosing listen channel during certification process. [CHAR LIMIT=40] --> <string name="wifi_display_listen_channel">Listen channel</string> <!-- Wifi Display settings. The dropdown menu title for choosing operating channel during certification process. [CHAR LIMIT=40] --> @@ -2400,8 +2402,8 @@ <string name="location_category_recent_location_requests">Recent location requests</string> <!-- Location settings screen, displayed when there's no recent app accessing location --> <string name="location_no_recent_apps">No apps have requested location in the last 15 minutes.</string> - <!-- [CHAR LIMIT=30] Location settings screen, sub category for location services --> - <string name="location_category_location_services">Location services</string> + <!-- [CHAR LIMIT=30] Location settings screen, sub category for app settings --> + <string name="location_category_app_settings">App settings</string> <!-- [CHAR LIMIT=30] Location settings screen, recent location requests high battery use--> <string name="location_high_battery_use">High battery use</string> <!-- [CHAR LIMIT=30] Location settings screen, recent location requests low battery use--> @@ -3612,6 +3614,12 @@ <!-- [CHAR LIMIT=NONE] Label for process stats, duration of time the stats are over --> <string name="process_stats_memory_status">Device memory is currently <xliff:g id="memstate">%1$s</xliff:g></string> + <!-- [CHAR LIMIT=NONE] Label for item showing details of average RAM use --> + <string name="process_stats_ram_use">Average RAM use</string> + <!-- [CHAR LIMIT=NONE] Label for item showing percent of time spent running --> + <string name="process_stats_run_time">Run time</string> + <!-- [CHAR LIMIT=NONE] Subtitle for process stats services list --> + <string name="services_subtitle">Services</string> <!-- Voice input/output settings --><skip /> <!-- Title of setting on main settings screen. This item will take the user to the screen to tweak settings related to speech functionality --> diff --git a/res/values/styles.xml b/res/values/styles.xml index 96dcf21..adf406b 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -82,11 +82,6 @@ <style name="Theme.CreateShortCut" parent="android:Theme.Holo.DialogWhenLarge"> </style> - <style name="setup_wizard_theme" parent="android:Theme.Holo.NoActionBar"> - <item name="android:windowSoftInputMode">adjustPan</item> - <item name="@*android:preferencePanelStyle">@*android:style/PreferencePanel.Dialog</item> - </style> - <style name="PreferenceHeaderPanelSinglePane"> <item name="android:layout_marginStart">0dp</item> <item name="android:layout_marginEnd">0dp</item> diff --git a/res/values/themes.xml b/res/values/themes.xml index 805214f..b8b1ad2 100644 --- a/res/values/themes.xml +++ b/res/values/themes.xml @@ -15,9 +15,45 @@ --> <resources> + <attr name="ic_menu_add" format="reference" /> + <attr name="ic_menu_moreoverflow" format="reference" /> + <attr name="ic_wps" format="reference" /> + <attr name="wifi_signal" format="reference" /> + + <style name="SetupWizardWifiTheme" parent="android:Theme.Holo.NoActionBar"> + <item name="android:windowSoftInputMode">adjustPan</item> + <item name="@*android:preferencePanelStyle">@*android:style/PreferencePanel.Dialog</item> + <item name="android:alertDialogTheme">@style/Theme.WifiDialog</item> + <item name="ic_menu_add">@drawable/ic_menu_add_dark</item> + <item name="ic_menu_moreoverflow">@*android:drawable/ic_menu_moreoverflow_holo_dark</item> + <item name="ic_wps">@drawable/ic_wps_dark</item> + <item name="wifi_signal">@drawable/wifi_signal_dark</item> + </style> + + <style name="SetupWizardWifiTheme.Light" parent="android:Theme.Holo.Light.NoActionBar"> + <item name="android:windowSoftInputMode">adjustPan</item> + <item name="@*android:preferencePanelStyle">@*android:style/PreferencePanel.Dialog</item> + <item name="android:alertDialogTheme">@style/Theme.Light.WifiDialog</item> + <item name="ic_menu_add">@drawable/ic_menu_add_light</item> + <item name="ic_menu_moreoverflow">@*android:drawable/ic_menu_moreoverflow_holo_light</item> + <item name="ic_wps">@drawable/ic_wps_light</item> + <item name="wifi_signal">@drawable/wifi_signal_light</item> + </style> <style name="Theme.WifiDialog" parent="@*android:style/Theme.Holo.Dialog.Alert"> <item name="android:windowSoftInputMode">adjustResize</item> + <item name="ic_menu_add">@drawable/ic_menu_add_dark</item> + <item name="ic_menu_moreoverflow">@*android:drawable/ic_menu_moreoverflow_holo_dark</item> + <item name="ic_wps">@drawable/ic_wps_dark</item> + <item name="wifi_signal">@drawable/wifi_signal_dark</item> + </style> + + <style name="Theme.Light.WifiDialog" parent="@*android:style/Theme.Holo.Light.Dialog.Alert"> + <item name="android:windowSoftInputMode">adjustResize</item> + <item name="ic_menu_add">@drawable/ic_menu_add_light</item> + <item name="ic_menu_moreoverflow">@*android:drawable/ic_menu_moreoverflow_holo_light</item> + <item name="ic_wps">@drawable/ic_wps_light</item> + <item name="wifi_signal">@drawable/wifi_signal_light</item> </style> <style name="Theme.Settings" parent="@android:style/Theme.Holo"> @@ -27,5 +63,9 @@ <item name="@*android:preferenceFragmentListStyle">@style/PreferenceFragmentListSinglePane</item> <item name="@*android:preferenceFragmentPaddingSide">@dimen/settings_side_margin</item> <item name="apnPreferenceStyle">@style/ApnPreference</item> + <item name="ic_menu_add">@drawable/ic_menu_add_dark</item> + <item name="ic_menu_moreoverflow">@*android:drawable/ic_menu_moreoverflow_holo_dark</item> + <item name="ic_wps">@drawable/ic_wps_dark</item> + <item name="wifi_signal">@drawable/wifi_signal_dark</item> </style> </resources> diff --git a/res/xml/location_settings.xml b/res/xml/location_settings.xml index 83b80b1..5be6bd3 100644 --- a/res/xml/location_settings.xml +++ b/res/xml/location_settings.xml @@ -26,7 +26,7 @@ android:title="@string/location_category_recent_location_requests" /> <PreferenceCategory - android:key="location_services" - android:title="@string/location_category_location_services" /> + android:key="app_settings" + android:title="@string/location_category_app_settings" /> </PreferenceScreen> diff --git a/res/xml/settings_headers.xml b/res/xml/settings_headers.xml index a8b0a29..6aa6691 100644 --- a/res/xml/settings_headers.xml +++ b/res/xml/settings_headers.xml @@ -158,7 +158,7 @@ <header android:id="@+id/account_add" android:title="@string/add_account_label" - android:icon="@drawable/ic_menu_add"> + android:icon="@drawable/ic_menu_add_dark"> <intent android:action="android.settings.ADD_ACCOUNT_SETTINGS"/> </header> diff --git a/res/xml/user_settings.xml b/res/xml/user_settings.xml index cf393b3..3a0ab74 100644 --- a/res/xml/user_settings.xml +++ b/res/xml/user_settings.xml @@ -26,6 +26,6 @@ <Preference android:key="user_add" android:title="@string/user_add_user_menu" - android:icon="@drawable/ic_menu_add" /> + android:icon="@drawable/ic_menu_add_dark" /> </PreferenceScreen> diff --git a/src/com/android/settings/DeviceInfoSettings.java b/src/com/android/settings/DeviceInfoSettings.java index ac74221..7e94741 100644 --- a/src/com/android/settings/DeviceInfoSettings.java +++ b/src/com/android/settings/DeviceInfoSettings.java @@ -37,7 +37,7 @@ import java.io.IOException; import java.util.regex.Matcher; import java.util.regex.Pattern; -public class DeviceInfoSettings extends SettingsPreferenceFragment { +public class DeviceInfoSettings extends RestrictedSettingsFragment { private static final String LOG_TAG = "DeviceInfoSettings"; @@ -70,12 +70,20 @@ public class DeviceInfoSettings extends SettingsPreferenceFragment { int mDevHitCountdown; Toast mDevHitToast; + public DeviceInfoSettings() { + super(null /* Don't PIN protect the entire screen */); + } + @Override public void onCreate(Bundle icicle) { super.onCreate(icicle); addPreferencesFromResource(R.xml.device_info_settings); + // We only call ensurePinRestrictedPreference() when mDevHitCountdown == 0. + // This will keep us from entering developer mode without a PIN. + protectByRestrictions(KEY_BUILD_NUMBER); + setStringSummary(KEY_FIRMWARE_VERSION, Build.VERSION.RELEASE); findPreference(KEY_FIRMWARE_VERSION).setEnabled(true); setValueSummary(KEY_BASEBAND_VERSION, "gsm.version.baseband"); @@ -178,6 +186,11 @@ public class DeviceInfoSettings extends SettingsPreferenceFragment { if (UserHandle.myUserId() != UserHandle.USER_OWNER) return true; if (mDevHitCountdown > 0) { + if (mDevHitCountdown == 1) { + if (super.ensurePinRestrictedPreference(preference)) { + return true; + } + } mDevHitCountdown--; if (mDevHitCountdown == 0) { getActivity().getSharedPreferences(DevelopmentSettings.PREF_FILE, diff --git a/src/com/android/settings/RegulatoryInfoDisplayActivity.java b/src/com/android/settings/RegulatoryInfoDisplayActivity.java index 8adecf1..171059c 100644 --- a/src/com/android/settings/RegulatoryInfoDisplayActivity.java +++ b/src/com/android/settings/RegulatoryInfoDisplayActivity.java @@ -22,7 +22,11 @@ import android.content.DialogInterface; import android.content.res.Resources; import android.graphics.drawable.Drawable; import android.os.Bundle; +import android.os.SystemProperties; +import android.text.TextUtils; import android.view.Gravity; +import android.view.View; +import android.widget.ImageView; import android.widget.TextView; /** @@ -30,11 +34,14 @@ import android.widget.TextView; * preference item, and when "*#07#" is dialed on the Phone keypad. To enable this feature, * set the "config_show_regulatory_info" boolean to true in a device overlay resource, and in the * same overlay, either add a drawable named "regulatory_info.png" containing a graphical version - * of the required regulatory info, or add a string resource named "regulatory_info_text" with - * an HTML version of the required information (text will be centered in the dialog). + * of the required regulatory info (If ro.bootloader.hardware.sku property is set use + * "regulatory_info_<sku>.png where sku is ro.bootloader.hardware.sku property value in lowercase"), + * or add a string resource named "regulatory_info_text" with an HTML version of the required + * information (text will be centered in the dialog). */ public class RegulatoryInfoDisplayActivity extends Activity implements DialogInterface.OnDismissListener { + private final String REGULATORY_INFO_RESOURCE = "regulatory_info"; /** * Display the regulatory info graphic in a dialog window. @@ -52,21 +59,27 @@ public class RegulatoryInfoDisplayActivity extends Activity implements .setTitle(R.string.regulatory_information) .setOnDismissListener(this); - boolean regulatoryInfoDrawableExists; - try { - Drawable d = resources.getDrawable(R.drawable.regulatory_info); - // set to false if the width or height is <= 2 - // (missing PNG can return an empty 2x2 pixel Drawable) - regulatoryInfoDrawableExists = (d.getIntrinsicWidth() > 2 - && d.getIntrinsicHeight() > 2); - } catch (Resources.NotFoundException ignored) { - regulatoryInfoDrawableExists = false; + boolean regulatoryInfoDrawableExists = false; + int resId = getResourceId(); + if (resId != 0) { + try { + Drawable d = resources.getDrawable(resId); + // set to false if the width or height is <= 2 + // (missing PNG can return an empty 2x2 pixel Drawable) + regulatoryInfoDrawableExists = (d.getIntrinsicWidth() > 2 + && d.getIntrinsicHeight() > 2); + } catch (Resources.NotFoundException ignored) { + regulatoryInfoDrawableExists = false; + } } CharSequence regulatoryText = resources.getText(R.string.regulatory_info_text); if (regulatoryInfoDrawableExists) { - builder.setView(getLayoutInflater().inflate(R.layout.regulatory_info, null)); + View view = getLayoutInflater().inflate(R.layout.regulatory_info, null); + ImageView image = (ImageView) view.findViewById(R.id.regulatoryInfo); + image.setImageResource(resId); + builder.setView(view); builder.show(); } else if (regulatoryText.length() > 0) { builder.setMessage(regulatoryText); @@ -80,6 +93,24 @@ public class RegulatoryInfoDisplayActivity extends Activity implements } } + private int getResourceId() { + // Use regulatory_info by default. + int resId = getResources().getIdentifier( + REGULATORY_INFO_RESOURCE, "drawable", getPackageName()); + + // When hardware sku property exists, use regulatory_info_<sku> resource if valid. + String sku = SystemProperties.get("ro.boot.hardware.sku", ""); + if (!TextUtils.isEmpty(sku)) { + String regulatory_info_res = REGULATORY_INFO_RESOURCE + "_" + sku.toLowerCase(); + int id = getResources().getIdentifier( + regulatory_info_res, "drawable", getPackageName()); + if (id != 0) { + resId = id; + } + } + return resId; + } + @Override public void onDismiss(DialogInterface dialog) { finish(); // close the activity diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java index 29945be..62d4aa8 100644 --- a/src/com/android/settings/Settings.java +++ b/src/com/android/settings/Settings.java @@ -66,6 +66,7 @@ import com.android.settings.deviceinfo.Memory; import com.android.settings.deviceinfo.UsbSettings; import com.android.settings.fuelgauge.PowerUsageSummary; import com.android.settings.inputmethod.InputMethodAndLanguageSettings; +import com.android.settings.inputmethod.KeyboardLayoutPickerFragment; import com.android.settings.inputmethod.SpellCheckersSettings; import com.android.settings.inputmethod.UserDictionaryList; import com.android.settings.location.LocationSettings; @@ -332,7 +333,8 @@ public class Settings extends PreferenceActivity ManageAccountsSettings.class.getName(), PrintSettingsFragment.class.getName(), TrustedCredentialsSettings.class.getName(), - PaymentSettings.class.getName() + PaymentSettings.class.getName(), + KeyboardLayoutPickerFragment.class.getName() }; @Override diff --git a/src/com/android/settings/UserDictionarySettings.java b/src/com/android/settings/UserDictionarySettings.java index 9f6df50..da12004 100644 --- a/src/com/android/settings/UserDictionarySettings.java +++ b/src/com/android/settings/UserDictionarySettings.java @@ -16,6 +16,9 @@ package com.android.settings; +import com.android.settings.inputmethod.UserDictionaryAddWordContents; +import com.android.settings.inputmethod.UserDictionarySettingsUtils; + import android.app.ListFragment; import android.content.ContentResolver; import android.content.Context; @@ -37,9 +40,6 @@ import android.widget.SectionIndexer; import android.widget.SimpleCursorAdapter; import android.widget.TextView; -import com.android.settings.inputmethod.UserDictionaryAddWordContents; -import com.android.settings.inputmethod.UserDictionarySettingsUtils; - import java.util.Locale; public class UserDictionarySettings extends ListFragment { @@ -165,7 +165,7 @@ public class UserDictionarySettings extends ListFragment { public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) { MenuItem actionItem = menu.add(0, OPTIONS_MENU_ADD, 0, R.string.user_dict_settings_add_menu_title) - .setIcon(R.drawable.ic_menu_add); + .setIcon(R.drawable.ic_menu_add_dark); actionItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM | MenuItem.SHOW_AS_ACTION_WITH_TEXT); } @@ -236,8 +236,9 @@ public class UserDictionarySettings extends ListFragment { private AlphabetIndexer mIndexer; - private ViewBinder mViewBinder = new ViewBinder() { + private final ViewBinder mViewBinder = new ViewBinder() { + @Override public boolean setViewValue(View v, Cursor c, int columnIndex) { if (columnIndex == INDEX_SHORTCUT) { final String shortcut = c.getString(INDEX_SHORTCUT); @@ -268,14 +269,17 @@ public class UserDictionarySettings extends ListFragment { setViewBinder(mViewBinder); } + @Override public int getPositionForSection(int section) { return null == mIndexer ? 0 : mIndexer.getPositionForSection(section); } + @Override public int getSectionForPosition(int position) { return null == mIndexer ? 0 : mIndexer.getSectionForPosition(position); } + @Override public Object[] getSections() { return null == mIndexer ? null : mIndexer.getSections(); } diff --git a/src/com/android/settings/applications/ProcStatsEntry.java b/src/com/android/settings/applications/ProcStatsEntry.java index e180205..cbbfbb7 100644 --- a/src/com/android/settings/applications/ProcStatsEntry.java +++ b/src/com/android/settings/applications/ProcStatsEntry.java @@ -16,11 +16,22 @@ package com.android.settings.applications; +import android.content.pm.ApplicationInfo; +import android.content.pm.PackageInfo; +import android.content.pm.PackageManager; +import android.os.Parcel; +import android.os.Parcelable; +import android.util.Log; +import android.util.SparseArray; import com.android.internal.app.ProcessStats; import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; + +public final class ProcStatsEntry implements Parcelable { + private static final String TAG = "ProcStatsEntry"; -public final class ProcStatsEntry { final String mPackage; final int mUid; final String mName; @@ -29,7 +40,14 @@ public final class ProcStatsEntry { final long mAvgPss; final long mWeight; - ArrayList<Service> mServices; + String mBestTargetPackage; + + ArrayList<Service> mServices = new ArrayList<Service>(2); + + public ApplicationInfo mUiTargetApp; + public String mUiLabel; + public String mUiBaseLabel; + public String mUiPackage; public ProcStatsEntry(ProcessStats.ProcessState proc, ProcessStats.ProcessDataCollection tmpTotals) { @@ -43,18 +61,156 @@ public final class ProcStatsEntry { mWeight = mDuration * mAvgPss; } + public ProcStatsEntry(Parcel in) { + mPackage = in.readString(); + mUid = in.readInt(); + mName = in.readString(); + mUnique = in.readInt() != 0; + mDuration = in.readLong(); + mAvgPss = in.readLong(); + mWeight = in.readLong(); + mBestTargetPackage = in.readString(); + in.readTypedList(mServices, Service.CREATOR); + } + + public void evaluateTargetPackage(ProcessStats stats, + ProcessStats.ProcessDataCollection totals, Comparator<ProcStatsEntry> compare) { + mBestTargetPackage = null; + if (mUnique) { + mBestTargetPackage = mPackage; + addServices(stats.getPackageStateLocked(mPackage, mUid)); + } else { + // See if there is one significant package that was running here. + ArrayList<ProcStatsEntry> subProcs = new ArrayList<ProcStatsEntry>(); + for (int ipkg=0, NPKG=stats.mPackages.getMap().size(); ipkg<NPKG; ipkg++) { + SparseArray<ProcessStats.PackageState> uids + = stats.mPackages.getMap().valueAt(ipkg); + for (int iu=0, NU=uids.size(); iu<NU; iu++) { + if (uids.keyAt(iu) != mUid) { + continue; + } + ProcessStats.PackageState pkgState = uids.valueAt(iu); + boolean match = false; + for (int iproc=0, NPROC=pkgState.mProcesses.size(); iproc<NPROC; iproc++) { + ProcessStats.ProcessState subProc = + pkgState.mProcesses.valueAt(iproc); + if (subProc.mName.equals(mName)) { + match = true; + subProcs.add(new ProcStatsEntry(subProc, totals)); + } + } + if (match) { + addServices(stats.getPackageStateLocked(mPackage, mUid)); + } + } + } + if (subProcs.size() > 1) { + Collections.sort(subProcs, compare); + if (subProcs.get(0).mWeight > (subProcs.get(1).mWeight*3)) { + mBestTargetPackage = subProcs.get(0).mPackage; + } + } + } + } + + public void retrieveUiData(PackageManager pm) { + mUiTargetApp = null; + mUiLabel = mUiBaseLabel = mName; + mUiPackage = mBestTargetPackage; + if (mUiPackage != null) { + // Only one app associated with this process. + try { + mUiTargetApp = pm.getApplicationInfo(mUiPackage, + PackageManager.GET_DISABLED_COMPONENTS | + PackageManager.GET_DISABLED_UNTIL_USED_COMPONENTS | + PackageManager.GET_UNINSTALLED_PACKAGES); + String name = mUiBaseLabel = mUiTargetApp.loadLabel(pm).toString(); + if (mName.equals(mUiPackage)) { + mUiLabel = name; + } else { + if (mName.startsWith(mUiPackage)) { + int off = mUiPackage.length(); + if (mName.length() > off) { + off++; + } + mUiLabel = name + " (" + mName.substring(off) + ")"; + } else { + mUiLabel = name + " (" + mName + ")"; + } + } + } catch (PackageManager.NameNotFoundException e) { + } + } + if (mUiTargetApp == null) { + String[] packages = pm.getPackagesForUid(mUid); + if (packages != null) { + for (String curPkg : packages) { + try { + final PackageInfo pi = pm.getPackageInfo(curPkg, + PackageManager.GET_DISABLED_COMPONENTS | + PackageManager.GET_DISABLED_UNTIL_USED_COMPONENTS | + PackageManager.GET_UNINSTALLED_PACKAGES); + if (pi.sharedUserLabel != 0) { + mUiTargetApp = pi.applicationInfo; + final CharSequence nm = pm.getText(curPkg, + pi.sharedUserLabel, pi.applicationInfo); + if (nm != null) { + mUiBaseLabel = nm.toString(); + mUiLabel = mUiBaseLabel + " (" + mName + ")"; + } else { + mUiBaseLabel = mUiTargetApp.loadLabel(pm).toString(); + mUiLabel = mUiBaseLabel + " (" + mName + ")"; + } + break; + } + } catch (PackageManager.NameNotFoundException e) { + } + } + } else { + // no current packages for this uid, typically because of uninstall + Log.i(TAG, "No package for uid " + mUid); + } + } + } + public void addServices(ProcessStats.PackageState pkgState) { for (int isvc=0, NSVC=pkgState.mServices.size(); isvc<NSVC; isvc++) { ProcessStats.ServiceState svc = pkgState.mServices.valueAt(isvc); // XXX can't tell what process it is in! - if (mServices == null) { - mServices = new ArrayList<Service>(); - } mServices.add(new Service(svc)); } } - public static final class Service { + @Override + public int describeContents() { + return 0; + } + + @Override + public void writeToParcel(Parcel dest, int flags) { + dest.writeString(mPackage); + dest.writeInt(mUid); + dest.writeString(mName); + dest.writeInt(mUnique ? 1 : 0); + dest.writeLong(mDuration); + dest.writeLong(mAvgPss); + dest.writeLong(mWeight); + dest.writeString(mBestTargetPackage); + dest.writeTypedList(mServices); + } + + public static final Parcelable.Creator<ProcStatsEntry> CREATOR + = new Parcelable.Creator<ProcStatsEntry>() { + public ProcStatsEntry createFromParcel(Parcel in) { + return new ProcStatsEntry(in); + } + + public ProcStatsEntry[] newArray(int size) { + return new ProcStatsEntry[size]; + } + }; + + public static final class Service implements Parcelable { final String mPackage; final String mName; final long mDuration; @@ -62,15 +218,51 @@ public final class ProcStatsEntry { public Service(ProcessStats.ServiceState service) { mPackage = service.mPackage; mName = service.mName; - mDuration = ProcessStats.dumpSingleServiceTime(null, null, service, + long startDuration = ProcessStats.dumpSingleServiceTime(null, null, service, ProcessStats.ServiceState.SERVICE_STARTED, - ProcessStats.STATE_NOTHING, 0, 0) - + ProcessStats.dumpSingleServiceTime(null, null, service, + ProcessStats.STATE_NOTHING, 0, 0); + long bindDuration = ProcessStats.dumpSingleServiceTime(null, null, service, ProcessStats.ServiceState.SERVICE_BOUND, - ProcessStats.STATE_NOTHING, 0, 0) - + ProcessStats.dumpSingleServiceTime(null, null, service, + ProcessStats.STATE_NOTHING, 0, 0); + long execDuration = ProcessStats.dumpSingleServiceTime(null, null, service, ProcessStats.ServiceState.SERVICE_EXEC, ProcessStats.STATE_NOTHING, 0, 0); + if (bindDuration > startDuration) { + startDuration = bindDuration; + } + if (execDuration > startDuration) { + startDuration = execDuration; + } + mDuration = startDuration; } + + public Service(Parcel in) { + mPackage = in.readString(); + mName = in.readString(); + mDuration = in.readLong(); + } + + @Override + public int describeContents() { + return 0; + } + + @Override + public void writeToParcel(Parcel dest, int flags) { + dest.writeString(mPackage); + dest.writeString(mName); + dest.writeLong(mDuration); + } + + public static final Parcelable.Creator<Service> CREATOR + = new Parcelable.Creator<Service>() { + public Service createFromParcel(Parcel in) { + return new Service(in); + } + + public Service[] newArray(int size) { + return new Service[size]; + } + }; } } diff --git a/src/com/android/settings/applications/ProcessStatsDetail.java b/src/com/android/settings/applications/ProcessStatsDetail.java new file mode 100644 index 0000000..5ec3b07 --- /dev/null +++ b/src/com/android/settings/applications/ProcessStatsDetail.java @@ -0,0 +1,258 @@ +/* + * Copyright (C) 2013 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.settings.applications; + +import android.app.Activity; +import android.app.ActivityManager; +import android.app.Fragment; +import android.app.admin.DevicePolicyManager; +import android.content.BroadcastReceiver; +import android.content.Context; +import android.content.Intent; +import android.content.pm.ApplicationInfo; +import android.content.pm.PackageManager; +import android.content.res.Resources; +import android.net.Uri; +import android.os.Bundle; +import android.os.Process; +import android.preference.PreferenceActivity; +import android.text.format.Formatter; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.Button; +import android.widget.ImageView; +import android.widget.ProgressBar; +import android.widget.TextView; +import com.android.settings.R; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; + +import static com.android.settings.Utils.prepareCustomPreferencesList; + +public class ProcessStatsDetail extends Fragment implements Button.OnClickListener { + private static final String TAG = "ProcessStatsDetail"; + + public static final int ACTION_FORCE_STOP = 1; + + public static final String EXTRA_ENTRY = "entry"; + public static final String EXTRA_MAX_WEIGHT = "max_weight"; + public static final String EXTRA_TOTAL_TIME = "total_time"; + + private PackageManager mPm; + private DevicePolicyManager mDpm; + + private ProcStatsEntry mEntry; + private long mMaxWeight; + private long mTotalTime; + + private View mRootView; + private TextView mTitleView; + private ViewGroup mTwoButtonsPanel; + private Button mForceStopButton; + private Button mReportButton; + private ViewGroup mDetailsParent; + private ViewGroup mServicesParent; + + public static String makePercentString(Resources res, long amount, long total) { + final double percent = (((double)amount) / total) * 100; + return res.getString(R.string.percentage, (int) Math.ceil(percent)); + } + + @Override + public void onCreate(Bundle icicle) { + super.onCreate(icicle); + mPm = getActivity().getPackageManager(); + mDpm = (DevicePolicyManager)getActivity().getSystemService(Context.DEVICE_POLICY_SERVICE); + final Bundle args = getArguments(); + mEntry = (ProcStatsEntry)args.getParcelable(EXTRA_ENTRY); + mEntry.retrieveUiData(mPm); + mMaxWeight = args.getLong(EXTRA_MAX_WEIGHT); + mTotalTime = args.getLong(EXTRA_TOTAL_TIME); + } + + @Override + public View onCreateView( + LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { + final View view = inflater.inflate(R.layout.process_stats_details, container, false); + prepareCustomPreferencesList(container, view, view, false); + + mRootView = view; + createDetails(); + return view; + } + + @Override + public void onResume() { + super.onResume(); + checkForceStop(); + } + + @Override + public void onPause() { + super.onPause(); + } + + private void createDetails() { + final double percentOfWeight = (((double)mEntry.mWeight) / mMaxWeight) * 100; + + int appLevel = (int) Math.ceil(percentOfWeight); + String appLevelText = makePercentString(getResources(), mEntry.mDuration, mTotalTime); + + // Set all values in the header. + final TextView summary = (TextView) mRootView.findViewById(android.R.id.summary); + summary.setText(mEntry.mName); + summary.setVisibility(View.VISIBLE); + mTitleView = (TextView) mRootView.findViewById(android.R.id.title); + mTitleView.setText(mEntry.mUiBaseLabel); + final TextView text1 = (TextView)mRootView.findViewById(android.R.id.text1); + text1.setText(appLevelText); + final ProgressBar progress = (ProgressBar) mRootView.findViewById(android.R.id.progress); + progress.setProgress(appLevel); + final ImageView icon = (ImageView) mRootView.findViewById(android.R.id.icon); + if (mEntry.mUiTargetApp != null) { + icon.setImageDrawable(mEntry.mUiTargetApp.loadIcon(mPm)); + } + + mTwoButtonsPanel = (ViewGroup)mRootView.findViewById(R.id.two_buttons_panel); + mForceStopButton = (Button)mRootView.findViewById(R.id.right_button); + mReportButton = (Button)mRootView.findViewById(R.id.left_button); + mForceStopButton.setEnabled(false); + mReportButton.setVisibility(View.INVISIBLE); + + mDetailsParent = (ViewGroup)mRootView.findViewById(R.id.details); + mServicesParent = (ViewGroup)mRootView.findViewById(R.id.services); + + fillDetailsSection(); + fillServicesSection(); + + if (mEntry.mUid >= android.os.Process.FIRST_APPLICATION_UID) { + mForceStopButton.setText(R.string.force_stop); + mForceStopButton.setTag(ACTION_FORCE_STOP); + mForceStopButton.setOnClickListener(this); + mTwoButtonsPanel.setVisibility(View.VISIBLE); + } else { + mTwoButtonsPanel.setVisibility(View.GONE); + } + } + + public void onClick(View v) { + doAction((Integer) v.getTag()); + } + + private void doAction(int action) { + PreferenceActivity pa = (PreferenceActivity)getActivity(); + switch (action) { + case ACTION_FORCE_STOP: + killProcesses(); + break; + } + } + + private void addDetailsItem(ViewGroup parent, CharSequence label, CharSequence value) { + LayoutInflater inflater = getActivity().getLayoutInflater(); + ViewGroup item = (ViewGroup) inflater.inflate(R.layout.power_usage_detail_item_text, + null); + parent.addView(item); + TextView labelView = (TextView) item.findViewById(R.id.label); + TextView valueView = (TextView) item.findViewById(R.id.value); + labelView.setText(label); + valueView.setText(value); + } + + private void fillDetailsSection() { + addDetailsItem(mDetailsParent, getResources().getText(R.string.process_stats_ram_use), + Formatter.formatShortFileSize(getActivity(), mEntry.mAvgPss * 1024)); + addDetailsItem(mDetailsParent, getResources().getText(R.string.process_stats_run_time), + makePercentString(getResources(), mEntry.mDuration, mTotalTime)); + } + + final static Comparator<ProcStatsEntry.Service> sServiceCompare + = new Comparator<ProcStatsEntry.Service>() { + @Override + public int compare(ProcStatsEntry.Service lhs, ProcStatsEntry.Service rhs) { + if (lhs.mDuration < rhs.mDuration) { + return 1; + } else if (lhs.mDuration > rhs.mDuration) { + return -1; + } + return 0; + } + }; + + private void fillServicesSection() { + LayoutInflater inflater = getActivity().getLayoutInflater(); + if (mEntry.mServices.size() > 0) { + ArrayList<ProcStatsEntry.Service> services = + (ArrayList<ProcStatsEntry.Service>)mEntry.mServices.clone(); + Collections.sort(services, sServiceCompare); + for (int i=0; i<services.size(); i++) { + ProcStatsEntry.Service service = services.get(i); + String label = service.mName; + int tail = label.lastIndexOf('.'); + if (tail >= 0 && tail < (label.length()-1)) { + label = label.substring(tail+1); + } + long duration = service.mDuration; + final double percentOfTime = (((double)duration) / mTotalTime) * 100; + addDetailsItem(mServicesParent, label, getActivity().getResources().getString( + R.string.percentage, (int) Math.ceil(percentOfTime))); + } + } + } + + private void killProcesses() { + ActivityManager am = (ActivityManager)getActivity().getSystemService( + Context.ACTIVITY_SERVICE); + am.forceStopPackage(mEntry.mUiPackage); + checkForceStop(); + } + + private final BroadcastReceiver mCheckKillProcessesReceiver = new BroadcastReceiver() { + @Override + public void onReceive(Context context, Intent intent) { + mForceStopButton.setEnabled(getResultCode() != Activity.RESULT_CANCELED); + } + }; + + private void checkForceStop() { + if (mEntry.mUiPackage == null || mEntry.mUid < Process.FIRST_APPLICATION_UID) { + mForceStopButton.setEnabled(false); + return; + } + if (mDpm.packageHasActiveAdmins(mEntry.mUiPackage)) { + mForceStopButton.setEnabled(false); + return; + } + try { + ApplicationInfo info = mPm.getApplicationInfo(mEntry.mUiPackage, 0); + if ((info.flags&ApplicationInfo.FLAG_STOPPED) == 0) { + mForceStopButton.setEnabled(true); + } + } catch (PackageManager.NameNotFoundException e) { + } + Intent intent = new Intent(Intent.ACTION_QUERY_PACKAGE_RESTART, + Uri.fromParts("package", mEntry.mUiPackage, null)); + intent.putExtra(Intent.EXTRA_PACKAGES, new String[] { mEntry.mUiPackage }); + intent.putExtra(Intent.EXTRA_UID, mEntry.mUid); + intent.putExtra(Intent.EXTRA_USER_HANDLE, mEntry.mUid); + getActivity().sendOrderedBroadcast(intent, null, mCheckKillProcessesReceiver, null, + Activity.RESULT_CANCELED, null, null); + } +} diff --git a/src/com/android/settings/applications/ProcessStatsPreference.java b/src/com/android/settings/applications/ProcessStatsPreference.java index 64ab0b6..2dea96a 100644 --- a/src/com/android/settings/applications/ProcessStatsPreference.java +++ b/src/com/android/settings/applications/ProcessStatsPreference.java @@ -27,15 +27,21 @@ import android.widget.TextView; import com.android.settings.R; public class ProcessStatsPreference extends Preference { + private final ProcStatsEntry mEntry; private int mProgress; private CharSequence mProgressText; - public ProcessStatsPreference(Context context, Drawable icon) { + public ProcessStatsPreference(Context context, Drawable icon, ProcStatsEntry entry) { super(context); + mEntry = entry; setLayoutResource(R.layout.app_percentage_item); setIcon(icon != null ? icon : new ColorDrawable(0)); } + public ProcStatsEntry getEntry() { + return mEntry; + } + public void setPercent(double percentOfWeight, double percentOfTime) { mProgress = (int) Math.ceil(percentOfWeight); mProgressText = getContext().getResources().getString( diff --git a/src/com/android/settings/applications/ProcessStatsUi.java b/src/com/android/settings/applications/ProcessStatsUi.java index 8e98d23..49682ed 100644 --- a/src/com/android/settings/applications/ProcessStatsUi.java +++ b/src/com/android/settings/applications/ProcessStatsUi.java @@ -17,8 +17,6 @@ package com.android.settings.applications; import android.content.Context; -import android.content.pm.ApplicationInfo; -import android.content.pm.PackageInfo; import android.content.pm.PackageManager; import android.os.Bundle; import android.os.Parcel; @@ -28,10 +26,10 @@ import android.os.ServiceManager; import android.os.SystemClock; import android.os.UserManager; import android.preference.Preference; +import android.preference.PreferenceActivity; import android.preference.PreferenceFragment; import android.preference.PreferenceGroup; import android.preference.PreferenceScreen; -import android.text.format.DateFormat; import android.util.Log; import android.util.SparseArray; import android.util.TimeUtils; @@ -83,6 +81,7 @@ public class ProcessStatsUi extends PreferenceFragment { private PreferenceGroup mAppListGroup; private Preference mMemStatusPref; + long mMaxWeight; long mTotalTime; @Override @@ -127,11 +126,13 @@ public class ProcessStatsUi extends PreferenceFragment { return false; } - /* - PreferenceActivity pa = (PreferenceActivity)getActivity(); - pa.startPreferencePanel(PowerUsageDetail.class.getName(), args, - R.string.details_title, null, null, 0); - */ + ProcessStatsPreference pgp = (ProcessStatsPreference) preference; + Bundle args = new Bundle(); + args.putParcelable(ProcessStatsDetail.EXTRA_ENTRY, pgp.getEntry()); + args.putLong(ProcessStatsDetail.EXTRA_MAX_WEIGHT, mMaxWeight); + args.putLong(ProcessStatsDetail.EXTRA_TOTAL_TIME, mTotalTime); + ((PreferenceActivity) getActivity()).startPreferencePanel( + ProcessStatsDetail.class.getName(), args, R.string.details_title, null, null, 0); return super.onPreferenceTreeClick(preferenceScreen, preference); } @@ -263,108 +264,19 @@ public class ProcessStatsUi extends PreferenceFragment { maxWeight = proc.mWeight; } } + mMaxWeight = maxWeight; for (int i=0, N=(procs != null ? procs.size() : 0); i<N; i++) { ProcStatsEntry proc = procs.get(i); final double percentOfWeight = (((double)proc.mWeight) / maxWeight) * 100; final double percentOfTime = (((double)proc.mDuration) / mTotalTime) * 100; if (percentOfWeight < 1) continue; - ProcessStatsPreference pref = new ProcessStatsPreference(getActivity(), null); - ApplicationInfo targetApp = null; - String label = proc.mName; - String pkgName = null; - if (proc.mUnique) { - pkgName = proc.mPackage; - proc.addServices(mStats.getPackageStateLocked(proc.mPackage, proc.mUid)); - } else { - // See if there is one significant package that was running here. - ArrayList<ProcStatsEntry> subProcs = new ArrayList<ProcStatsEntry>(); - for (int ipkg=0, NPKG=mStats.mPackages.getMap().size(); ipkg<NPKG; ipkg++) { - SparseArray<ProcessStats.PackageState> uids - = mStats.mPackages.getMap().valueAt(ipkg); - for (int iu=0, NU=uids.size(); iu<NU; iu++) { - if (uids.keyAt(iu) != proc.mUid) { - continue; - } - ProcessStats.PackageState pkgState = uids.valueAt(iu); - boolean match = false; - for (int iproc=0, NPROC=pkgState.mProcesses.size(); iproc<NPROC; iproc++) { - ProcessStats.ProcessState subProc = - pkgState.mProcesses.valueAt(iproc); - if (subProc.mName.equals(proc.mName)) { - match = true; - subProcs.add(new ProcStatsEntry(subProc, totals)); - } - } - if (match) { - proc.addServices(mStats.getPackageStateLocked(proc.mPackage, - proc.mUid)); - } - } - } - if ( subProcs.size() > 1) { - Collections.sort(subProcs, sEntryCompare); - if (subProcs.get(0).mWeight > (subProcs.get(1).mWeight*3)) { - pkgName = subProcs.get(0).mPackage; - } - } - } - if (pkgName != null) { - // Only one app associated with this process. - try { - targetApp = pm.getApplicationInfo(pkgName, - PackageManager.GET_DISABLED_COMPONENTS | - PackageManager.GET_DISABLED_UNTIL_USED_COMPONENTS | - PackageManager.GET_UNINSTALLED_PACKAGES); - String name = targetApp.loadLabel(pm).toString(); - if (proc.mName.equals(pkgName)) { - label = name; - } else { - if (proc.mName.startsWith(pkgName)) { - int off = pkgName.length(); - if (proc.mName.length() > off) { - off++; - } - label = name + " (" + proc.mName.substring(off) + ")"; - } else { - label = name + " (" + proc.mName + ")"; - } - } - } catch (PackageManager.NameNotFoundException e) { - } - } - if (targetApp == null) { - String[] packages = pm.getPackagesForUid(proc.mUid); - if (packages != null) { - for (String curPkg : packages) { - try { - final PackageInfo pi = pm.getPackageInfo(curPkg, - PackageManager.GET_DISABLED_COMPONENTS | - PackageManager.GET_DISABLED_UNTIL_USED_COMPONENTS | - PackageManager.GET_UNINSTALLED_PACKAGES); - if (pi.sharedUserLabel != 0) { - targetApp = pi.applicationInfo; - final CharSequence nm = pm.getText(curPkg, - pi.sharedUserLabel, pi.applicationInfo); - if (nm != null) { - label = nm.toString() + " (" + proc.mName + ")"; - } else { - label = targetApp.loadLabel(pm).toString() + " (" - + proc.mName + ")"; - } - break; - } - } catch (PackageManager.NameNotFoundException e) { - } - } - } else { - // no current packages for this uid, typically because of uninstall - Log.i(TAG, "No package for uid " + proc.mUid); - } - } - pref.setTitle(label); - if (targetApp != null) { - pref.setIcon(targetApp.loadIcon(pm)); + ProcessStatsPreference pref = new ProcessStatsPreference(getActivity(), null, proc); + proc.evaluateTargetPackage(mStats, totals, sEntryCompare); + proc.retrieveUiData(pm); + pref.setTitle(proc.mUiLabel); + if (proc.mUiTargetApp != null) { + pref.setIcon(proc.mUiTargetApp.loadIcon(pm)); } pref.setOrder(i); pref.setPercent(percentOfWeight, percentOfTime); diff --git a/src/com/android/settings/fuelgauge/BatteryStatsHelper.java b/src/com/android/settings/fuelgauge/BatteryStatsHelper.java index 3b1ea93..953ff3d 100644 --- a/src/com/android/settings/fuelgauge/BatteryStatsHelper.java +++ b/src/com/android/settings/fuelgauge/BatteryStatsHelper.java @@ -320,7 +320,12 @@ public class BatteryStatsHelper { R.string.details_title, null, null, 0); } - public void refreshStats() { + /** + * Refreshes the power usage list. + * @param includeZeroConsumption whether includes those applications which have consumed very + * little power up till now. + */ + public void refreshStats(boolean includeZeroConsumption) { // Initialize mStats if necessary. getStats(); @@ -336,7 +341,7 @@ public class BatteryStatsHelper { mUserSippers.clear(); mUserPower.clear(); - processAppUsage(); + processAppUsage(includeZeroConsumption); processMiscUsage(); Collections.sort(mUsageList); @@ -356,7 +361,7 @@ public class BatteryStatsHelper { } } - private void processAppUsage() { + private void processAppUsage(boolean includeZeroConsumption) { SensorManager sensorManager = (SensorManager) mActivity.getSystemService( Context.SENSOR_SERVICE); final int which = mStatsType; @@ -522,7 +527,7 @@ public class BatteryStatsHelper { // Add the app to the list if it is consuming power boolean isOtherUser = false; final int userId = UserHandle.getUserId(u.getUid()); - if (power != 0 || u.getUid() == 0) { + if (power != 0 || includeZeroConsumption || u.getUid() == 0) { BatterySipper app = new BatterySipper(mActivity, mRequestQueue, mHandler, packageWithHighestDrain, DrainType.APP, 0, u, new double[] {power}); diff --git a/src/com/android/settings/fuelgauge/PowerUsageDetail.java b/src/com/android/settings/fuelgauge/PowerUsageDetail.java index e9b8106..ca159dc 100644 --- a/src/com/android/settings/fuelgauge/PowerUsageDetail.java +++ b/src/com/android/settings/fuelgauge/PowerUsageDetail.java @@ -36,6 +36,7 @@ import android.graphics.drawable.Drawable; import android.net.Uri; import android.os.Bundle; import android.os.Process; +import android.os.UserHandle; import android.preference.PreferenceActivity; import android.provider.Settings; import android.text.TextUtils; @@ -470,7 +471,7 @@ public class PowerUsageDetail extends Fragment implements Button.OnClickListener Uri.fromParts("package", mPackages[0], null)); intent.putExtra(Intent.EXTRA_PACKAGES, mPackages); intent.putExtra(Intent.EXTRA_UID, mUid); - intent.putExtra(Intent.EXTRA_USER_HANDLE, mUid); + intent.putExtra(Intent.EXTRA_USER_HANDLE, UserHandle.getUserId(mUid)); getActivity().sendOrderedBroadcast(intent, null, mCheckKillProcessesReceiver, null, Activity.RESULT_CANCELED, null, null); } diff --git a/src/com/android/settings/fuelgauge/PowerUsageSummary.java b/src/com/android/settings/fuelgauge/PowerUsageSummary.java index 480bb4e..740fdb5 100644 --- a/src/com/android/settings/fuelgauge/PowerUsageSummary.java +++ b/src/com/android/settings/fuelgauge/PowerUsageSummary.java @@ -210,7 +210,7 @@ public class PowerUsageSummary extends PreferenceFragment { addNotAvailableMessage(); return; } - mStatsHelper.refreshStats(); + mStatsHelper.refreshStats(false); List<BatterySipper> usageList = mStatsHelper.getUsageList(); for (BatterySipper sipper : usageList) { if (sipper.getSortValue() < MIN_POWER_THRESHOLD) continue; diff --git a/src/com/android/settings/location/LocationSettings.java b/src/com/android/settings/location/LocationSettings.java index 815be41..6dceea9 100644 --- a/src/com/android/settings/location/LocationSettings.java +++ b/src/com/android/settings/location/LocationSettings.java @@ -55,7 +55,7 @@ public class LocationSettings extends LocationSettingsBase /** Key for preference category "Recent location requests" */ private static final String KEY_RECENT_LOCATION_REQUESTS = "recent_location_requests"; /** Key for preference category "Location services" */ - private static final String KEY_LOCATION_SERVICES = "location_services"; + private static final String KEY_APP_SETTINGS = "app_settings"; private Switch mSwitch; private boolean mValidListener; @@ -165,10 +165,10 @@ public class LocationSettings extends LocationSettingsBase categoryRecentLocationRequests.addPreference(banner); } - PreferenceCategory categoryLocationServices = - (PreferenceCategory) root.findPreference(KEY_LOCATION_SERVICES); + PreferenceCategory categoryAppSettings = + (PreferenceCategory) root.findPreference(KEY_APP_SETTINGS); final SettingsInjector injector = new SettingsInjector(activity); - List<Preference> locationServices = injector.getInjectedSettings(); + List<Preference> appSettings = injector.getInjectedSettings(); mReceiver = new BroadcastReceiver() { @Override @@ -182,11 +182,11 @@ public class LocationSettings extends LocationSettingsBase activity.registerReceiver(mReceiver, new IntentFilter(SettingInjectorService.ACTION_INJECTED_SETTING_CHANGED)); - if (locationServices.size() > 0) { - addPreferencesSorted(locationServices, categoryLocationServices); + if (appSettings.size() > 0) { + addPreferencesSorted(appSettings, categoryAppSettings); } else { // If there's no item to display, remove the whole category. - root.removePreference(categoryLocationServices); + root.removePreference(categoryAppSettings); } // Only show the master switch when we're not in multi-pane mode, and not being used as @@ -233,9 +233,12 @@ public class LocationSettings extends LocationSettingsBase break; } - boolean enabled = (mode != Settings.Secure.LOCATION_MODE_OFF) && !restricted; + // Restricted user can't change the location mode, so disable the master switch. But in some + // corner cases, the location might still be enabled. In such case the master switch should + // be disabled but checked. + boolean enabled = (mode != Settings.Secure.LOCATION_MODE_OFF); mSwitch.setEnabled(!restricted); - mLocationMode.setEnabled(enabled); + mLocationMode.setEnabled(enabled && !restricted); if (enabled != mSwitch.isChecked()) { // set listener to null so that that code below doesn't trigger onCheckedChanged() diff --git a/src/com/android/settings/location/LocationSettingsBase.java b/src/com/android/settings/location/LocationSettingsBase.java index 81e841a..9ceefe7 100644 --- a/src/com/android/settings/location/LocationSettingsBase.java +++ b/src/com/android/settings/location/LocationSettingsBase.java @@ -38,12 +38,29 @@ public abstract class LocationSettingsBase extends SettingsPreferenceFragment private static final int LOADER_ID_LOCATION_MODE = 1; + /** + * Whether the fragment is actively running. + */ + private boolean mActive = false; + @Override public void onCreate(Bundle icicle) { super.onCreate(icicle); getLoaderManager().initLoader(LOADER_ID_LOCATION_MODE, null, this); } + @Override + public void onResume() { + super.onResume(); + mActive = true; + } + + @Override + public void onPause() { + super.onPause(); + mActive = false; + } + /** Called when location mode has changed. */ public abstract void onModeChanged(int mode, boolean restricted); @@ -61,7 +78,9 @@ public abstract class LocationSettingsBase extends SettingsPreferenceFragment } mode = Settings.Secure.getInt(getContentResolver(), Settings.Secure.LOCATION_MODE, Settings.Secure.LOCATION_MODE_OFF); - onModeChanged(mode, true); + if (mActive) { + onModeChanged(mode, true); + } return; } Settings.Secure.putInt(getContentResolver(), Settings.Secure.LOCATION_MODE, mode); @@ -69,9 +88,11 @@ public abstract class LocationSettingsBase extends SettingsPreferenceFragment } public void refreshLocationMode() { - int mode = Settings.Secure.getInt(getContentResolver(), Settings.Secure.LOCATION_MODE, - Settings.Secure.LOCATION_MODE_OFF); - onModeChanged(mode, isRestricted()); + if (mActive) { + int mode = Settings.Secure.getInt(getContentResolver(), Settings.Secure.LOCATION_MODE, + Settings.Secure.LOCATION_MODE_OFF); + onModeChanged(mode, isRestricted()); + } } @Override diff --git a/src/com/android/settings/location/RecentLocationApps.java b/src/com/android/settings/location/RecentLocationApps.java index 23e6dcf..1fa8aac 100644 --- a/src/com/android/settings/location/RecentLocationApps.java +++ b/src/com/android/settings/location/RecentLocationApps.java @@ -140,7 +140,7 @@ public class RecentLocationApps { public List<Preference> getAppList() { // Retrieve Uid-based battery blaming info and generate a package to BatterySipper HashMap // for later faster looking up. - mStatsHelper.refreshStats(); + mStatsHelper.refreshStats(true); List<BatterySipper> usageList = mStatsHelper.getUsageList(); // Key: package Uid. Value: BatterySipperWrapper. HashMap<Integer, BatterySipperWrapper> sipperMap = @@ -243,11 +243,22 @@ public class RecentLocationApps { try { ApplicationInfo appInfo = mPackageManager.getApplicationInfo( packageName, PackageManager.GET_META_DATA); - pref = createRecentLocationEntry( - mPackageManager.getApplicationIcon(appInfo), - mPackageManager.getApplicationLabel(appInfo), - highBattery, - new PackageEntryClickedListener(packageName)); + // Multiple users can install the same package. Each user gets a different Uid for + // the same package. + // + // Here we retrieve the Uid with package name, that will be the Uid for that package + // associated with the current active user. If the Uid differs from the Uid in ops, + // that means this entry belongs to another inactive user and we should ignore that. + if (appInfo.uid == ops.getUid()) { + pref = createRecentLocationEntry( + mPackageManager.getApplicationIcon(appInfo), + mPackageManager.getApplicationLabel(appInfo), + highBattery, + new PackageEntryClickedListener(packageName)); + } else if (Log.isLoggable(TAG, Log.VERBOSE)) { + Log.v(TAG, "package " + packageName + " with Uid " + ops.getUid() + + " belongs to another inactive account, ignored."); + } } catch (PackageManager.NameNotFoundException e) { Log.wtf(TAG, "Package not found: " + packageName); } diff --git a/src/com/android/settings/location/SettingsInjector.java b/src/com/android/settings/location/SettingsInjector.java index 7bd190c..5929466 100644 --- a/src/com/android/settings/location/SettingsInjector.java +++ b/src/com/android/settings/location/SettingsInjector.java @@ -30,6 +30,7 @@ import android.os.Bundle; import android.os.Handler; import android.os.Message; import android.os.Messenger; +import android.os.SystemClock; import android.preference.Preference; import android.util.AttributeSet; import android.util.Log; @@ -42,7 +43,6 @@ import java.io.IOException; import java.util.ArrayList; import java.util.HashSet; import java.util.Iterator; -import java.util.LinkedHashSet; import java.util.List; import java.util.Set; @@ -67,22 +67,6 @@ class SettingsInjector { private static final long INJECTED_STATUS_UPDATE_TIMEOUT_MILLIS = 1000; /** - * Intent action marking the receiver as injecting a setting - */ - public static final String RECEIVER_INTENT = "com.android.settings.InjectedLocationSetting"; - - /** - * Name of the meta-data tag used to specify the resource file that includes the settings - * attributes. - */ - public static final String META_DATA_NAME = "com.android.settings.InjectedLocationSetting"; - - /** - * Name of the XML tag that includes the attributes for the setting. - */ - public static final String ATTRIBUTES_NAME = "injected-location-setting"; - - /** * {@link Message#what} value for starting to load status values * in case we aren't already in the process of loading them. */ @@ -115,7 +99,8 @@ class SettingsInjector { /** * Returns a list with one {@link InjectedSetting} object for each {@link android.app.Service} - * that responds to {@link #RECEIVER_INTENT} and provides the expected setting metadata. + * that responds to {@link SettingInjectorService#ACTION_SERVICE_INTENT} and provides the + * expected setting metadata. * * Duplicates some code from {@link android.content.pm.RegisteredServicesCache}. * @@ -123,37 +108,38 @@ class SettingsInjector { */ private List<InjectedSetting> getSettings() { PackageManager pm = mContext.getPackageManager(); - Intent receiverIntent = new Intent(RECEIVER_INTENT); + Intent intent = new Intent(SettingInjectorService.ACTION_SERVICE_INTENT); List<ResolveInfo> resolveInfos = - pm.queryIntentServices(receiverIntent, PackageManager.GET_META_DATA); + pm.queryIntentServices(intent, PackageManager.GET_META_DATA); if (Log.isLoggable(TAG, Log.DEBUG)) { Log.d(TAG, "Found services: " + resolveInfos); } List<InjectedSetting> settings = new ArrayList<InjectedSetting>(resolveInfos.size()); - for (ResolveInfo receiver : resolveInfos) { + for (ResolveInfo resolveInfo : resolveInfos) { try { - InjectedSetting info = parseServiceInfo(receiver, pm); - if (info == null) { - Log.w(TAG, "Unable to load service info " + receiver); + InjectedSetting setting = parseServiceInfo(resolveInfo, pm); + if (setting == null) { + Log.w(TAG, "Unable to load service info " + resolveInfo); } else { - if (Log.isLoggable(TAG, Log.INFO)) { - Log.i(TAG, "Loaded service info: " + info); - } - settings.add(info); + settings.add(setting); } } catch (XmlPullParserException e) { - Log.w(TAG, "Unable to load service info " + receiver, e); + Log.w(TAG, "Unable to load service info " + resolveInfo, e); } catch (IOException e) { - Log.w(TAG, "Unable to load service info " + receiver, e); + Log.w(TAG, "Unable to load service info " + resolveInfo, e); } } + if (Log.isLoggable(TAG, Log.DEBUG)) { + Log.d(TAG, "Loaded settings: " + settings); + } return settings; } /** - * Parses {@link InjectedSetting} from the attributes of the {@link #META_DATA_NAME} tag. + * Parses {@link InjectedSetting} from the attributes of the + * {@link SettingInjectorService#META_DATA_NAME} tag. * * Duplicates some code from {@link android.content.pm.RegisteredServicesCache}. */ @@ -164,9 +150,9 @@ class SettingsInjector { XmlResourceParser parser = null; try { - parser = si.loadXmlMetaData(pm, META_DATA_NAME); + parser = si.loadXmlMetaData(pm, SettingInjectorService.META_DATA_NAME); if (parser == null) { - throw new XmlPullParserException("No " + META_DATA_NAME + throw new XmlPullParserException("No " + SettingInjectorService.META_DATA_NAME + " meta-data for " + service + ": " + si); } @@ -178,9 +164,9 @@ class SettingsInjector { } String nodeName = parser.getName(); - if (!ATTRIBUTES_NAME.equals(nodeName)) { + if (!SettingInjectorService.ATTRIBUTES_NAME.equals(nodeName)) { throw new XmlPullParserException("Meta-data does not start with " - + ATTRIBUTES_NAME + " tag"); + + SettingInjectorService.ATTRIBUTES_NAME + " tag"); } Resources res = pm.getResourcesForApplication(si.applicationInfo); @@ -201,15 +187,15 @@ class SettingsInjector { private static InjectedSetting parseAttributes( String packageName, String className, Resources res, AttributeSet attrs) { - TypedArray sa = res.obtainAttributes(attrs, android.R.styleable.InjectedLocationSetting); + TypedArray sa = res.obtainAttributes(attrs, android.R.styleable.SettingInjectorService); try { // Note that to help guard against malicious string injection, we do not allow dynamic // specification of the label (setting title) - final String label = sa.getString(android.R.styleable.InjectedLocationSetting_label); + final String label = sa.getString(android.R.styleable.SettingInjectorService_title); final int iconId = sa.getResourceId( - android.R.styleable.InjectedLocationSetting_icon, 0); + android.R.styleable.SettingInjectorService_icon, 0); final String settingsActivity = - sa.getString(android.R.styleable.InjectedLocationSetting_settingsActivity); + sa.getString(android.R.styleable.SettingInjectorService_settingsActivity); if (Log.isLoggable(TAG, Log.DEBUG)) { Log.d(TAG, "parsed label: " + label + ", iconId: " + iconId + ", settingsActivity: " + settingsActivity); @@ -306,6 +292,7 @@ class SettingsInjector { break; case WHAT_RECEIVED_STATUS: final Setting receivedSetting = (Setting) msg.obj; + receivedSetting.maybeLogElapsedTime(); mSettingsBeingLoaded.remove(receivedSetting); mTimedOutSettings.remove(receivedSetting); removeMessages(WHAT_TIMEOUT, receivedSetting); @@ -357,8 +344,7 @@ class SettingsInjector { iter.remove(); // Request the status value - Intent intent = setting.createUpdatingIntent(); - mContext.startService(intent); + setting.startService(); mSettingsBeingLoaded.add(setting); // Ensure that if receiving the status value takes too long, we start loading the @@ -390,6 +376,7 @@ class SettingsInjector { public final InjectedSetting setting; public final Preference preference; + public long startMillis; private Setting(InjectedSetting setting, Preference preference) { this.setting = setting; @@ -406,7 +393,7 @@ class SettingsInjector { /** * Returns true if they both have the same {@link #setting} value. Ignores mutable - * preference so that it's safe to use in sets. + * {@link #preference} and {@link #startMillis} so that it's safe to use in sets. */ @Override public boolean equals(Object o) { @@ -419,11 +406,10 @@ class SettingsInjector { } /** - * Creates an Intent to ask the receiver for the current status for the setting, and display - * it when it replies. + * Starts the service to fetch for the current status for the setting, and updates the + * preference when the service replies. */ - public Intent createUpdatingIntent() { - final Intent receiverIntent = setting.getServiceIntent(); + public void startService() { Handler handler = new Handler() { @Override public void handleMessage(Message msg) { @@ -440,12 +426,25 @@ class SettingsInjector { } }; Messenger messenger = new Messenger(handler); - receiverIntent.putExtra(SettingInjectorService.MESSENGER_KEY, messenger); + + Intent intent = setting.getServiceIntent(); + intent.putExtra(SettingInjectorService.MESSENGER_KEY, messenger); + if (Log.isLoggable(TAG, Log.DEBUG)) { - Log.d(TAG, setting + ": sending rcv-intent: " + receiverIntent + Log.d(TAG, setting + ": sending update intent: " + intent + ", handler: " + handler); + startMillis = SystemClock.elapsedRealtime(); + } else { + startMillis = 0; + } + mContext.startService(intent); + } + + public void maybeLogElapsedTime() { + if (Log.isLoggable(TAG, Log.DEBUG) && startMillis != 0) { + long end = SystemClock.elapsedRealtime(); + Log.d(TAG, this + " update took " + (end - startMillis) + " millis"); } - return receiverIntent; } } } diff --git a/src/com/android/settings/nfc/PaymentBackend.java b/src/com/android/settings/nfc/PaymentBackend.java index 3c2c3ce..e2f110f 100644 --- a/src/com/android/settings/nfc/PaymentBackend.java +++ b/src/com/android/settings/nfc/PaymentBackend.java @@ -22,7 +22,7 @@ import android.content.pm.PackageManager; import android.graphics.drawable.Drawable; import android.nfc.NfcAdapter; import android.nfc.cardemulation.ApduServiceInfo; -import android.nfc.cardemulation.CardEmulationManager; +import android.nfc.cardemulation.CardEmulation; import android.provider.Settings; import java.util.ArrayList; @@ -40,19 +40,19 @@ public class PaymentBackend { private final Context mContext; private final NfcAdapter mAdapter; - private final CardEmulationManager mCardEmuManager; + private final CardEmulation mCardEmuManager; public PaymentBackend(Context context) { mContext = context; mAdapter = NfcAdapter.getDefaultAdapter(context); - mCardEmuManager = CardEmulationManager.getInstance(mAdapter); + mCardEmuManager = CardEmulation.getInstance(mAdapter); } public List<PaymentAppInfo> getPaymentAppInfos() { PackageManager pm = mContext.getPackageManager(); List<ApduServiceInfo> serviceInfos = - mCardEmuManager.getServices(CardEmulationManager.CATEGORY_PAYMENT); + mCardEmuManager.getServices(CardEmulation.CATEGORY_PAYMENT); List<PaymentAppInfo> appInfos = new ArrayList<PaymentAppInfo>(); if (serviceInfos == null) return appInfos; diff --git a/src/com/android/settings/nfc/PaymentDefaultDialog.java b/src/com/android/settings/nfc/PaymentDefaultDialog.java index a6887a3..ae2f4c1 100644 --- a/src/com/android/settings/nfc/PaymentDefaultDialog.java +++ b/src/com/android/settings/nfc/PaymentDefaultDialog.java @@ -22,7 +22,7 @@ import android.content.Intent; import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; import android.content.pm.PackageManager.NameNotFoundException; -import android.nfc.cardemulation.CardEmulationManager; +import android.nfc.cardemulation.CardEmulation; import android.os.Bundle; import android.util.Log; @@ -47,8 +47,8 @@ public final class PaymentDefaultDialog extends AlertActivity implements mBackend = new PaymentBackend(this); Intent intent = getIntent(); ComponentName component = intent.getParcelableExtra( - CardEmulationManager.EXTRA_SERVICE_COMPONENT); - String category = intent.getStringExtra(CardEmulationManager.EXTRA_CATEGORY); + CardEmulation.EXTRA_SERVICE_COMPONENT); + String category = intent.getStringExtra(CardEmulation.EXTRA_CATEGORY); setResult(RESULT_CANCELED); if (!buildDialog(component, category)) { @@ -75,7 +75,7 @@ public final class PaymentDefaultDialog extends AlertActivity implements return false; } - if (!CardEmulationManager.CATEGORY_PAYMENT.equals(category)) { + if (!CardEmulation.CATEGORY_PAYMENT.equals(category)) { Log.e(TAG, "Don't support defaults for category " + category); return false; } diff --git a/src/com/android/settings/nfc/PaymentSettings.java b/src/com/android/settings/nfc/PaymentSettings.java index 41bcc2c..af569ac 100644 --- a/src/com/android/settings/nfc/PaymentSettings.java +++ b/src/com/android/settings/nfc/PaymentSettings.java @@ -55,23 +55,10 @@ public class PaymentSettings extends SettingsPreferenceFragment implements for (PaymentAppInfo appInfo : appInfos) { PaymentAppPreference preference = new PaymentAppPreference(getActivity(), appInfo, this); - // If for some reason isAuto gets out of sync, clear out app default preference.setIcon(appInfo.icon); preference.setTitle(appInfo.caption); screen.addPreference(preference); } - if (appInfos.size() > 1) { - PaymentAppInfo appInfo = new PaymentAppInfo(); - appInfo.icon = null; - appInfo.componentName = null; - appInfo.isDefault = !(mPaymentBackend.getDefaultPaymentApp() != null); - // Add "Ask every time" option - PaymentAppPreference preference = - new PaymentAppPreference(getActivity(), appInfo, this); - preference.setIcon(null); - preference.setTitle(R.string.nfc_payment_ask); - screen.addPreference(preference); - } } setPreferenceScreen(screen); } @@ -82,8 +69,6 @@ public class PaymentSettings extends SettingsPreferenceFragment implements PaymentAppInfo appInfo = (PaymentAppInfo) v.getTag(); if (appInfo.componentName != null) { mPaymentBackend.setDefaultPaymentApp(appInfo.componentName); - } else { - mPaymentBackend.setDefaultPaymentApp(null); } refresh(); } diff --git a/src/com/android/settings/tts/TextToSpeechSettings.java b/src/com/android/settings/tts/TextToSpeechSettings.java index c697661..52ee4fd 100644 --- a/src/com/android/settings/tts/TextToSpeechSettings.java +++ b/src/com/android/settings/tts/TextToSpeechSettings.java @@ -288,7 +288,7 @@ public class TextToSpeechSettings extends SettingsPreferenceFragment implements if (defaultAvailable == TextToSpeech.LANG_NOT_SUPPORTED || defaultAvailable == TextToSpeech.LANG_MISSING_DATA || - mAvailableStrLocals != null && notInAvailableLangauges) { + mAvailableStrLocals == null || notInAvailableLangauges) { if (DBG) Log.d(TAG, "Default locale for this TTS engine is not supported."); updateEngineStatus(R.string.tts_status_not_supported); updateWidgetState(false); diff --git a/src/com/android/settings/wfd/WifiDisplaySettings.java b/src/com/android/settings/wfd/WifiDisplaySettings.java index 7f560b3..6ec79f3 100755 --- a/src/com/android/settings/wfd/WifiDisplaySettings.java +++ b/src/com/android/settings/wfd/WifiDisplaySettings.java @@ -33,6 +33,7 @@ import android.net.Uri; import android.net.wifi.p2p.WifiP2pManager; import android.net.wifi.p2p.WifiP2pManager.ActionListener; import android.net.wifi.p2p.WifiP2pManager.Channel; +import android.net.wifi.WpsInfo; import android.os.Bundle; import android.os.Handler; import android.os.Looper; @@ -94,6 +95,7 @@ public final class WifiDisplaySettings extends SettingsPreferenceFragment { private PreferenceGroup mCertCategory; private boolean mListen; private boolean mAutoGO; + private int mWpsConfig = WpsInfo.INVALID; private int mListenChannel; private int mOperatingChannel; @@ -160,6 +162,8 @@ public final class WifiDisplaySettings extends SettingsPreferenceFragment { Settings.Global.WIFI_DISPLAY_ON), false, mSettingsObserver); getContentResolver().registerContentObserver(Settings.Global.getUriFor( Settings.Global.WIFI_DISPLAY_CERTIFICATION_ON), false, mSettingsObserver); + getContentResolver().registerContentObserver(Settings.Global.getUriFor( + Settings.Global.WIFI_DISPLAY_WPS_CONFIG), false, mSettingsObserver); mDisplayManager.scanWifiDisplays(); @@ -222,6 +226,8 @@ public final class WifiDisplaySettings extends SettingsPreferenceFragment { Settings.Global.WIFI_DISPLAY_ON, 0) != 0; mWifiDisplayCertificationOn = Settings.Global.getInt(getContentResolver(), Settings.Global.WIFI_DISPLAY_CERTIFICATION_ON, 0) != 0; + mWpsConfig = Settings.Global.getInt(getContentResolver(), + Settings.Global.WIFI_DISPLAY_WPS_CONFIG, WpsInfo.INVALID); mWifiDisplayStatus = mDisplayManager.getWifiDisplayStatus(); applyState(); @@ -367,12 +373,41 @@ public final class WifiDisplaySettings extends SettingsPreferenceFragment { cbp.setChecked(mAutoGO); mCertCategory.addPreference(cbp); - // Drop down list for choosing listen channel + // Drop down list for choosing WPS method (PBC/KEYPAD/DISPLAY) ListPreference lp = new ListPreference(getActivity()) { @Override protected void onDialogClosed(boolean positiveResult) { super.onDialogClosed(positiveResult); if (positiveResult) { + mWpsConfig = Integer.parseInt(getValue()); + setSummary("%1$s"); + getActivity().invalidateOptionsMenu(); + Settings.Global.putInt(getActivity().getContentResolver(), + Settings.Global.WIFI_DISPLAY_WPS_CONFIG, mWpsConfig); + } + } + }; + mWpsConfig = Settings.Global.getInt(getActivity().getContentResolver(), + Settings.Global.WIFI_DISPLAY_WPS_CONFIG, WpsInfo.INVALID); + String[] wpsEntries = { "Default", "PBC", "KEYPAD", "DISPLAY" }; + String[] wpsValues = { + "" + WpsInfo.INVALID, + "" + WpsInfo.PBC, + "" + WpsInfo.KEYPAD, + "" + WpsInfo.DISPLAY }; + lp.setTitle(R.string.wifi_display_wps_config); + lp.setEntries(wpsEntries); + lp.setEntryValues(wpsValues); + lp.setValue("" + mWpsConfig); + lp.setSummary("%1$s"); + mCertCategory.addPreference(lp); + + // Drop down list for choosing listen channel + lp = new ListPreference(getActivity()) { + @Override + protected void onDialogClosed(boolean positiveResult) { + super.onDialogClosed(positiveResult); + if (positiveResult) { mListenChannel = Integer.parseInt(getValue()); setSummary("%1$s"); getActivity().invalidateOptionsMenu(); diff --git a/src/com/android/settings/widget/SettingsAppWidgetProvider.java b/src/com/android/settings/widget/SettingsAppWidgetProvider.java index bf3f497..85a0494 100644 --- a/src/com/android/settings/widget/SettingsAppWidgetProvider.java +++ b/src/com/android/settings/widget/SettingsAppWidgetProvider.java @@ -800,7 +800,7 @@ public class SettingsAppWidgetProvider extends AppWidgetProvider { sWifiState.onActualStateChange(context, intent); } else if (BluetoothAdapter.ACTION_STATE_CHANGED.equals(action)) { sBluetoothState.onActualStateChange(context, intent); - } else if (LocationManager.PROVIDERS_CHANGED_ACTION.equals(action)) { + } else if (LocationManager.MODE_CHANGED_ACTION.equals(action)) { sLocationState.onActualStateChange(context, intent); } else if (ContentResolver.ACTION_SYNC_CONN_STATUS_CHANGED.equals(action)) { sSyncState.onActualStateChange(context, intent); diff --git a/src/com/android/settings/wifi/AccessPoint.java b/src/com/android/settings/wifi/AccessPoint.java index 20146eb..c4d1f7c 100644 --- a/src/com/android/settings/wifi/AccessPoint.java +++ b/src/com/android/settings/wifi/AccessPoint.java @@ -16,6 +16,8 @@ package com.android.settings.wifi; +import com.android.settings.R; + import android.content.Context; import android.net.NetworkInfo.DetailedState; import android.net.wifi.ScanResult; @@ -29,8 +31,6 @@ import android.util.Log; import android.view.View; import android.widget.ImageView; -import com.android.settings.R; - class AccessPoint extends Preference { static final String TAG = "Settings.AccessPoint"; @@ -211,7 +211,8 @@ class AccessPoint extends Preference { signal.setImageDrawable(null); } else { signal.setImageLevel(getLevel()); - signal.setImageResource(R.drawable.wifi_signal); + signal.setImageDrawable(getContext().getTheme().obtainStyledAttributes( + new int[] {R.attr.wifi_signal}).getDrawable(0)); signal.setImageState((security != SECURITY_NONE) ? STATE_SECURED : STATE_NONE, true); } diff --git a/src/com/android/settings/wifi/WifiDialog.java b/src/com/android/settings/wifi/WifiDialog.java index 82b0cc6..f1720c1 100644 --- a/src/com/android/settings/wifi/WifiDialog.java +++ b/src/com/android/settings/wifi/WifiDialog.java @@ -38,7 +38,7 @@ class WifiDialog extends AlertDialog implements WifiConfigUiBase { public WifiDialog(Context context, DialogInterface.OnClickListener listener, AccessPoint accessPoint, boolean edit) { - super(context, R.style.Theme_WifiDialog); + super(context); mEdit = edit; mListener = listener; mAccessPoint = accessPoint; diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java index 9fc1010..1caf58b 100644 --- a/src/com/android/settings/wifi/WifiSettings.java +++ b/src/com/android/settings/wifi/WifiSettings.java @@ -19,12 +19,9 @@ package com.android.settings.wifi; import static android.net.wifi.WifiConfiguration.INVALID_NETWORK_ID; import static android.os.UserManager.DISALLOW_CONFIG_WIFI; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.concurrent.atomic.AtomicBoolean; +import com.android.settings.R; +import com.android.settings.RestrictedSettingsFragment; +import com.android.settings.wifi.p2p.WifiP2pSettings; import android.app.ActionBar; import android.app.Activity; @@ -37,6 +34,7 @@ import android.content.Intent; import android.content.IntentFilter; import android.content.pm.PackageManager; import android.content.res.Resources; +import android.content.res.TypedArray; import android.location.LocationManager; import android.net.ConnectivityManager; import android.net.NetworkInfo; @@ -76,9 +74,12 @@ import android.widget.Switch; import android.widget.TextView; import android.widget.Toast; -import com.android.settings.R; -import com.android.settings.RestrictedSettingsFragment; -import com.android.settings.wifi.p2p.WifiP2pSettings; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.concurrent.atomic.AtomicBoolean; /** * Two types of UI are provided here. @@ -134,7 +135,7 @@ public class WifiSettings extends RestrictedSettingsFragment private DetailedState mLastState; private WifiInfo mLastInfo; - private AtomicBoolean mConnected = new AtomicBoolean(false); + private final AtomicBoolean mConnected = new AtomicBoolean(false); private WifiDialog mDialog; @@ -447,10 +448,11 @@ public class WifiSettings extends RestrictedSettingsFragment if (isRestrictedAndNotPinProtected()) return; final boolean wifiIsEnabled = mWifiManager.isWifiEnabled(); + TypedArray ta = getActivity().getTheme().obtainStyledAttributes( + new int[] {R.attr.ic_menu_add, R.attr.ic_wps}); if (mSetupWizardMode) { - // FIXME: add setIcon() when graphics are available menu.add(Menu.NONE, MENU_ID_WPS_PBC, 0, R.string.wifi_menu_wps_pbc) - .setIcon(R.drawable.ic_wps) + .setIcon(ta.getDrawable(1)) .setEnabled(wifiIsEnabled) .setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS); menu.add(Menu.NONE, MENU_ID_ADD_NETWORK, 0, R.string.wifi_add_network) @@ -458,11 +460,11 @@ public class WifiSettings extends RestrictedSettingsFragment .setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS); } else { menu.add(Menu.NONE, MENU_ID_WPS_PBC, 0, R.string.wifi_menu_wps_pbc) - .setIcon(R.drawable.ic_wps) + .setIcon(ta.getDrawable(1)) .setEnabled(wifiIsEnabled) .setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM); menu.add(Menu.NONE, MENU_ID_ADD_NETWORK, 0, R.string.wifi_add_network) - .setIcon(R.drawable.ic_menu_add) + .setIcon(ta.getDrawable(0)) .setEnabled(wifiIsEnabled) .setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM); menu.add(Menu.NONE, MENU_ID_SCAN, 0, R.string.wifi_menu_scan) @@ -481,6 +483,7 @@ public class WifiSettings extends RestrictedSettingsFragment //.setIcon(android.R.drawable.ic_menu_manage) .setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER); } + ta.recycle(); super.onCreateOptionsMenu(menu, inflater); } @@ -808,7 +811,7 @@ public class WifiSettings extends RestrictedSettingsFragment /** A restricted multimap for use in constructAccessPoints */ private class Multimap<K,V> { - private HashMap<K,List<V>> store = new HashMap<K,List<V>>(); + private final HashMap<K,List<V>> store = new HashMap<K,List<V>>(); /** retrieve a non-null list of values with key K */ List<V> getAll(K key) { List<V> values = store.get(key); diff --git a/src/com/android/settings/wifi/WifiSetupActivity.java b/src/com/android/settings/wifi/WifiSetupActivity.java index 8415954..1739750 100644 --- a/src/com/android/settings/wifi/WifiSetupActivity.java +++ b/src/com/android/settings/wifi/WifiSetupActivity.java @@ -17,7 +17,25 @@ package com.android.settings.wifi; import com.android.settings.ButtonBarHandler; -// dummy class for setup wizard theme +import android.content.res.Resources; + public class WifiSetupActivity extends WifiPickerActivity implements ButtonBarHandler { + // Extra containing the resource name of the theme to be used + private static final String EXTRA_THEME = "theme"; + private static final String THEME_HOLO = "holo"; + private static final String THEME_HOLO_LIGHT = "holo_light"; + + // Style resources containing theme settings + private static final String RESOURCE_THEME_DARK = "SetupWizardWifiTheme"; + private static final String RESOURCE_THEME_LIGHT = "SetupWizardWifiTheme.Light"; -}
\ No newline at end of file + @Override + protected void onApplyThemeResource(Resources.Theme theme, int resid, boolean first) { + String themeName = getIntent().getStringExtra(EXTRA_THEME); + if (themeName != null && themeName.equalsIgnoreCase(THEME_HOLO_LIGHT)) { + resid = getResources().getIdentifier(RESOURCE_THEME_LIGHT, "style", + getPackageName()); + } + super.onApplyThemeResource(theme, resid, first); + } +} diff --git a/src/com/android/settings/wifi/p2p/WifiP2pPeer.java b/src/com/android/settings/wifi/p2p/WifiP2pPeer.java index 1eb810e..a364021 100644 --- a/src/com/android/settings/wifi/p2p/WifiP2pPeer.java +++ b/src/com/android/settings/wifi/p2p/WifiP2pPeer.java @@ -20,21 +20,18 @@ import com.android.settings.R; import android.content.Context; import android.net.wifi.WifiManager; -import android.net.wifi.p2p.WifiP2pManager; import android.net.wifi.p2p.WifiP2pDevice; import android.preference.Preference; import android.text.TextUtils; import android.view.View; import android.widget.ImageView; -import java.util.Comparator; - public class WifiP2pPeer extends Preference { private static final int[] STATE_SECURED = {R.attr.state_encrypted}; public WifiP2pDevice device; - private int mRssi; + private final int mRssi; private ImageView mSignal; private static final int SIGNAL_LEVELS = 4; @@ -57,7 +54,7 @@ public class WifiP2pPeer extends Preference { if (mRssi == Integer.MAX_VALUE) { mSignal.setImageDrawable(null); } else { - mSignal.setImageResource(R.drawable.wifi_signal); + mSignal.setImageResource(R.drawable.wifi_signal_dark); mSignal.setImageState(STATE_SECURED, true); } refresh(); |
