diff options
Diffstat (limited to 'res')
19 files changed, 154 insertions, 49 deletions
diff --git a/res/drawable/ic_settings_about.png b/res/drawable/ic_settings_about.png Binary files differnew file mode 100755 index 0000000..16db056 --- /dev/null +++ b/res/drawable/ic_settings_about.png diff --git a/res/drawable/ic_settings_accessibility.png b/res/drawable/ic_settings_accessibility.png Binary files differnew file mode 100755 index 0000000..16db056 --- /dev/null +++ b/res/drawable/ic_settings_accessibility.png diff --git a/res/drawable/ic_settings_applications.png b/res/drawable/ic_settings_applications.png Binary files differnew file mode 100755 index 0000000..16db056 --- /dev/null +++ b/res/drawable/ic_settings_applications.png diff --git a/res/drawable/ic_settings_call.png b/res/drawable/ic_settings_call.png Binary files differnew file mode 100755 index 0000000..16db056 --- /dev/null +++ b/res/drawable/ic_settings_call.png diff --git a/res/drawable/ic_settings_date_time.png b/res/drawable/ic_settings_date_time.png Binary files differnew file mode 100755 index 0000000..16db056 --- /dev/null +++ b/res/drawable/ic_settings_date_time.png diff --git a/res/drawable/ic_settings_language.png b/res/drawable/ic_settings_language.png Binary files differnew file mode 100755 index 0000000..16db056 --- /dev/null +++ b/res/drawable/ic_settings_language.png diff --git a/res/drawable/ic_settings_search.png b/res/drawable/ic_settings_search.png Binary files differnew file mode 100755 index 0000000..16db056 --- /dev/null +++ b/res/drawable/ic_settings_search.png diff --git a/res/drawable/ic_settings_security.png b/res/drawable/ic_settings_security.png Binary files differnew file mode 100755 index 0000000..16db056 --- /dev/null +++ b/res/drawable/ic_settings_security.png diff --git a/res/drawable/ic_settings_sound_display.png b/res/drawable/ic_settings_sound_display.png Binary files differnew file mode 100755 index 0000000..16db056 --- /dev/null +++ b/res/drawable/ic_settings_sound_display.png diff --git a/res/drawable/ic_settings_speech.png b/res/drawable/ic_settings_speech.png Binary files differnew file mode 100755 index 0000000..16db056 --- /dev/null +++ b/res/drawable/ic_settings_speech.png diff --git a/res/drawable/ic_settings_storage.png b/res/drawable/ic_settings_storage.png Binary files differnew file mode 100755 index 0000000..16db056 --- /dev/null +++ b/res/drawable/ic_settings_storage.png diff --git a/res/drawable/ic_settings_sync.png b/res/drawable/ic_settings_sync.png Binary files differnew file mode 100755 index 0000000..16db056 --- /dev/null +++ b/res/drawable/ic_settings_sync.png diff --git a/res/drawable/ic_settings_wireless.png b/res/drawable/ic_settings_wireless.png Binary files differnew file mode 100755 index 0000000..16db056 --- /dev/null +++ b/res/drawable/ic_settings_wireless.png diff --git a/res/layout/preference_icon.xml b/res/layout/preference_icon.xml new file mode 100644 index 0000000..d6bce0e --- /dev/null +++ b/res/layout/preference_icon.xml @@ -0,0 +1,63 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2006 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. +--> + +<!-- Layout for a Preference in a PreferenceActivity. The + Preference is able to place a specific widget for its particular + type in the "widget_frame" layout. --> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+android:id/widget_frame" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:minHeight="?android:attr/listPreferredItemHeight" + android:gravity="center_vertical" + android:paddingRight="?android:attr/scrollbarSize"> + + <ImageView + android:id="@+id/icon" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginLeft="12dip" + android:layout_marginRight="6dip" + android:layout_gravity="center" /> + + <RelativeLayout + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginLeft="6dip" + android:layout_marginRight="6dip" + android:layout_marginTop="6dip" + android:layout_marginBottom="6dip" + android:layout_weight="1"> + + <TextView android:id="@+android:id/title" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:singleLine="true" + android:textAppearance="?android:attr/textAppearanceLarge" + android:ellipsize="marquee" + android:fadingEdge="horizontal" /> + + <TextView android:id="@+android:id/summary" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_below="@android:id/title" + android:layout_alignLeft="@android:id/title" + android:textAppearance="?android:attr/textAppearanceSmall" + android:maxLines="2" /> + + </RelativeLayout> + +</LinearLayout> diff --git a/res/values/attrs.xml b/res/values/attrs.xml index 9bf79f9..0a2c5c5 100644 --- a/res/values/attrs.xml +++ b/res/values/attrs.xml @@ -18,4 +18,7 @@ <declare-styleable name="WifiEncryptionState"> <attr name="state_encrypted" format="boolean" /> </declare-styleable> + <declare-styleable name="IconPreferenceScreen"> + <attr name="icon" format="reference" /> + </declare-styleable> </resources> diff --git a/res/values/strings.xml b/res/values/strings.xml index 3091f7a..5a72057 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -489,6 +489,8 @@ <string name="security_settings_title">Security & location</string> <!-- Main Settings screen setting option summary text for the item tot ake you to the security and location screen --> <string name="security_settings_summary">Set My Location, screen unlock, SIM card lock, credential storage lock</string> + <!-- Main Settings screen setting option summary text for the item to take you to the CDMA security and location screen --> + <string name="cdma_security_settings_summary">Set My Location, screen unlock, credential storage lock</string> <!-- In the security screen, the header title for settings related to Passwords--> <string name="security_passwords_title">Passwords</string> @@ -508,15 +510,24 @@ <string name="bluetooth_pin_entry">Bluetooth pairing request</string> <!-- Title for the bluetooth device info screen. --> <string name="bluetooth_device_info">Bluetooth device info</string> - <!-- Message when bluetooth dialog for pin entry is shwoing --> + <!-- Message when bluetooth dialog for pin entry is showing --> <string name="bluetooth_enter_pin_msg"><xliff:g id="device_name">%1$s</xliff:g>\n\nType PIN to pair.\n(Try 0000 or 1234.)</string> + <!-- Message when bluetooth dialog for passkey entry is showing --> + <string name="bluetooth_enter_passkey_msg"><xliff:g id="device_name">%1$s</xliff:g>\n\nType passkey to pair.\n</string> + <!-- Message when bluetooth dialog for confirmation of passkey is showing --> + <string name="bluetooth_confirm_passkey_msg">To pair with \u0022<xliff:g id="device_name">%1$s</xliff:g>\u0022, confirm that it is showing the passkey: <xliff:g id="passkey">%2$d</xliff:g>.</string> + <!-- Button text for accepting an incoming pairing request --> + <string name="bluetooth_pairing_accept">Pair</string> + <!-- Button text for declining an incoming pairing request --> + <string name="bluetooth_pairing_decline">Don\u0027t Pair</string> <!-- Title for BT error dialogs. --> <string name="bluetooth_error_title">Attention</string> <!-- Message for the error dialog when BT pairing fails generically. --> <string name="bluetooth_pairing_error_message">There was a problem pairing with <xliff:g id="device_name">%1$s</xliff:g>.</string> - <!-- Message for the error dialog when BT pairing fails because the PIN entered is incorrect. --> - <string name="bluetooth_pairing_pin_error_message">There was a problem pairing with <xliff:g id="device_name">%1$s</xliff:g> because the typed PIN is incorrect.</string> + <!-- Message for the error dialog when BT pairing fails because the PIN / + Passkey entered is incorrect. --> + <string name="bluetooth_pairing_pin_error_message">There was a problem pairing with <xliff:g id="device_name">%1$s</xliff:g> because the typed PIN or Passkey is incorrect.</string> <!-- Message for the error dialog when BT pairing fails because the other device is down. --> <string name="bluetooth_pairing_device_down_error_message">Cannot establish communication with <xliff:g id="device_name">%1$s</xliff:g>.</string> <!-- Message for the error dialog when BT pairing fails because the other device rejected the pairing. --> @@ -856,10 +867,10 @@ <!-- Sound settings screen, setting option summary text when check box is clear --> <string name="play_media_notification_sounds_enable_summary_off">Play sound for SD card notifications</string> - <!-- Main Settings screen setting option name to go into the screen for data sync settings--> - <string name="sync_settings">Data synchronization</string> + <!-- Acounts & Sync settings screen setting option name to go into the screen for data sync settings--> + <string name="sync_settings">Accounts & synchronization</string> <!-- Main Settings screen setting option summary text for the itme to go into the screen with data sync settings--> - <string name="sync_settings_summary">Select which applications are synchronized</string> + <string name="sync_settings_summary">Add or remove accounts and change account settings</string> <!-- Main Settings screen, setting option name to go into search settings --> <string name="search_settings">Search</string> @@ -1142,6 +1153,12 @@ <string name="location_street_level">When locating, accurate to street level (deselect to conserve battery)</string> <!-- Security & location settings screen, setting summary when Enable GPS satellites check box is clear --> <string name="location_gps_disabled">Locate to street-level (requires more battery plus view of sky)</string> + <!-- Security & location settings screen, setting check box label if Assisted GPS should be enabled --> + <string name="assisted_gps">Enable assisted GPS</string> + <!-- Security & location settings screen, setting summary when Assisted GPS check box is selected --> + <string name="assisted_gps_enabled">Use server to assist GPS (deselect to reduce network usage)</string> + <!-- Security & location settings screen, setting summary when Assisted GPS check box is clear --> + <string name="assisted_gps_disabled">Use server to assist GPS (select to improve GPS performance)</string> <!-- Setting title for allow sending location to google --> <string name="use_location_title">Share with Google</string> <!-- Title of dialog to user requesting use of location information to improve services --> @@ -1372,7 +1389,7 @@ found in the list of installed applications.</string> <string name="computing_size">Computing\u2026</string> <string name="invalid_size_value">Unable to compute package size</string> <!-- String displayed when list is empty --> - <string name="empty_list_msg">You do not have any third-party apps installed.</string> + <string name="empty_list_msg">You do not have any third-party applications installed.</string> <!-- Manage applications, version string displayed in app snippet --> <string name="version_text">version <xliff:g id="version_num">%1$s</xliff:g></string> @@ -1811,6 +1828,8 @@ found in the list of installed applications.</string> <!-- Power Control Widget --> <string name="gadget_title">Power Control</string> + <string name="gadget_toggle_wifi">Updating Wi-Fi setting</string> + <string name="gadget_toggle_bluetooth">Updating Bluetooth setting</string> <string name="vpn_settings_activity_title">VPN settings</string> diff --git a/res/xml/security_settings.xml b/res/xml/security_settings.xml index 8dd9d89..5b90dba 100644 --- a/res/xml/security_settings.xml +++ b/res/xml/security_settings.xml @@ -33,6 +33,12 @@ android:summaryOff="@string/location_gps_disabled"/> <CheckBoxPreference + android:key="assisted_gps" + android:title="@string/assisted_gps" + android:summaryOn="@string/assisted_gps_enabled" + android:summaryOff="@string/assisted_gps_disabled"/> + + <CheckBoxPreference android:key="use_location" android:title="@string/use_location_title" android:persistent="false" diff --git a/res/xml/settings.xml b/res/xml/settings.xml index 9ca581a..b7b5fb8 100644 --- a/res/xml/settings.xml +++ b/res/xml/settings.xml @@ -16,64 +16,72 @@ <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:settings="http://schemas.android.com/apk/res/com.android.settings" android:title="@string/settings_label" android:key="parent"> - - <PreferenceScreen + + <com.android.settings.IconPreferenceScreen android:title="@string/radio_controls_title" + settings:icon="@drawable/ic_settings_wireless" android:summary="@string/radio_controls_summary"> <intent android:action="android.intent.action.MAIN" android:targetPackage="com.android.settings" android:targetClass="com.android.settings.WirelessSettings" /> - </PreferenceScreen> + </com.android.settings.IconPreferenceScreen> - <PreferenceScreen + <com.android.settings.IconPreferenceScreen android:key="call_settings" + settings:icon="@drawable/ic_settings_call" android:title="@string/call_settings_title" android:summary="@string/call_settings_summary"> <intent android:action="android.intent.action.MAIN" android:targetPackage="com.android.phone" android:targetClass="com.android.phone.CallFeaturesSetting" /> - </PreferenceScreen> + </com.android.settings.IconPreferenceScreen> <!-- Sound and Display --> - - <PreferenceScreen + + <com.android.settings.IconPreferenceScreen + settings:icon="@drawable/ic_settings_sound_display" android:title="@string/sound_and_display_settings" android:summary="@string/sound_and_display_settings_summary"> <intent android:action="android.intent.action.MAIN" android:targetPackage="com.android.settings" android:targetClass="com.android.settings.SoundAndDisplaySettings" /> - </PreferenceScreen> + </com.android.settings.IconPreferenceScreen> <!-- Data Sync. The settings activity will ensure this is resolved to an activity on the system image, otherwise it will remove this preference. --> - - <PreferenceScreen + + <com.android.settings.IconPreferenceScreen + settings:icon="@drawable/ic_settings_sync" android:title="@string/sync_settings" android:summary="@string/sync_settings_summary" android:key="sync_settings"> <intent android:action="android.settings.SYNC_SETTINGS" /> - </PreferenceScreen> + </com.android.settings.IconPreferenceScreen> <!-- Security & Privacy --> - - <PreferenceScreen + + <com.android.settings.IconPreferenceScreen + settings:icon="@drawable/ic_settings_security" android:title="@string/security_settings_title" - android:summary="@string/security_settings_summary"> + android:summary="@string/security_settings_summary" + android:key="security_settings"> <intent android:action="android.intent.action.MAIN" android:targetPackage="com.android.settings" android:targetClass="com.android.settings.SecuritySettings" /> - </PreferenceScreen> + </com.android.settings.IconPreferenceScreen> <!-- Application Settings --> - - <PreferenceScreen + + <com.android.settings.IconPreferenceScreen + settings:icon="@drawable/ic_settings_applications" android:title="@string/applications_settings" android:summary="@string/applications_settings_summary" android:key="applications_settings"> @@ -81,39 +89,42 @@ android:action="android.intent.action.MAIN" android:targetPackage="com.android.settings" android:targetClass="com.android.settings.ApplicationSettings" /> - </PreferenceScreen> + </com.android.settings.IconPreferenceScreen> <!-- Storage --> - - <PreferenceScreen + + <com.android.settings.IconPreferenceScreen + settings:icon="@drawable/ic_settings_storage" android:title="@string/storage_settings_title" android:summary="@string/storage_settings_summary"> <intent android:action="android.intent.action.MAIN" android:targetPackage="com.android.settings" android:targetClass="com.android.settings.deviceinfo.Memory" /> - </PreferenceScreen> + </com.android.settings.IconPreferenceScreen> <!-- Date & Time --> - - <PreferenceScreen + + <com.android.settings.IconPreferenceScreen + settings:icon="@drawable/ic_settings_date_time" android:title="@string/date_and_time_settings_title" android:summary="@string/date_and_time_settings_summary"> <intent android:action="android.intent.action.MAIN" android:targetPackage="com.android.settings" android:targetClass="com.android.settings.DateTimeSettings" /> - </PreferenceScreen> + </com.android.settings.IconPreferenceScreen> <!-- Language --> - <PreferenceScreen + <com.android.settings.IconPreferenceScreen + settings:icon="@drawable/ic_settings_language" android:title="@string/language_settings" android:summary="@string/language_settings_summary"> <intent android:action="android.intent.action.MAIN" android:targetPackage="com.android.settings" android:targetClass="com.android.settings.LanguageSettings" /> - </PreferenceScreen> + </com.android.settings.IconPreferenceScreen> <!-- Search. The settings activity will ensure that this is resolved to an @@ -123,44 +134,48 @@ android.app.SearchManager.INTENT_ACTION_SEARCH_SETTINGS. --> - <PreferenceScreen + <com.android.settings.IconPreferenceScreen + settings:icon="@drawable/ic_settings_search" android:title="@string/search_settings" android:summary="@string/search_settings_summary" android:key="search_settings"> <intent android:action="android.search.action.SEARCH_SETTINGS" /> - </PreferenceScreen> + </com.android.settings.IconPreferenceScreen> <!-- Accessibility feedback --> - <PreferenceScreen + <com.android.settings.IconPreferenceScreen + settings:icon="@drawable/ic_settings_accessibility" android:title="@string/accessibility_settings_title" android:summary="@string/accessibility_settings_summary"> <intent android:action="android.intent.action.MAIN" android:targetPackage="com.android.settings" android:targetClass="com.android.settings.AccessibilitySettings" /> - </PreferenceScreen> + </com.android.settings.IconPreferenceScreen> <!-- Text-To-Speech --> - - <PreferenceScreen + + <com.android.settings.IconPreferenceScreen + settings:icon="@drawable/ic_settings_speech" android:title="@string/tts_settings" android:summary="@string/tts_settings_summary"> <intent android:action="android.intent.action.MAIN" android:targetPackage="com.android.settings" android:targetClass="com.android.settings.TextToSpeechSettings" /> - </PreferenceScreen> + </com.android.settings.IconPreferenceScreen> <!-- About Device --> - - <PreferenceScreen + + <com.android.settings.IconPreferenceScreen + settings:icon="@drawable/ic_settings_about" android:title="@string/about_settings" android:summary="@string/about_settings_summary"> <intent android:action="android.intent.action.MAIN" android:targetPackage="com.android.settings" android:targetClass="com.android.settings.DeviceInfoSettings" /> - </PreferenceScreen> + </com.android.settings.IconPreferenceScreen> </PreferenceScreen> diff --git a/res/xml/wireless_settings.xml b/res/xml/wireless_settings.xml index 4731fb3..de62687 100644 --- a/res/xml/wireless_settings.xml +++ b/res/xml/wireless_settings.xml @@ -22,13 +22,12 @@ android:key="toggle_wifi" android:title="@string/wifi_quick_toggle_title" android:summary="@string/wifi_quick_toggle_summary" - android:persistent="false" - android:dependency="toggle_airplane" /> + android:persistent="false" /> <PreferenceScreen + android:key="wifi_settings" android:title="@string/wifi_settings" - android:summary="@string/wifi_settings_summary" - android:dependency="toggle_airplane"> + android:summary="@string/wifi_settings_summary" > <intent android:action="android.intent.action.MAIN" android:targetPackage="com.android.settings" @@ -53,9 +52,9 @@ </PreferenceScreen> <PreferenceScreen + android:key="vpn_settings" android:title="@string/vpn_settings_title" - android:summary="@string/vpn_settings_summary" - android:dependency="toggle_airplane"> + android:summary="@string/vpn_settings_summary" > <intent android:action="android.intent.action.MAIN" android:targetPackage="com.android.settings" |
