PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Re-ordered some Settings and renamed some.

Browse Source 
Reduced padding around the icons in the top level screen.
Re-ordered top-level settings.
Moved Airplane mode to the top of wireless & networks.
This commit is contained in:
Amith Yamasani
2009-08-06 16:43:23 -07:00
parent e41a4ca695
commit 7f28787edf
4 changed files with 99 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
res/layout/preference_icon.xml
View File

@@ -29,14 +29,14 @@
android:id="@+id/icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="12dip"
android:layout_marginLeft="6dip"
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_marginLeft="2dip"
android:layout_marginRight="6dip"
android:layout_marginTop="6dip"
android:layout_marginBottom="6dip"

8
res/values/strings.xml
View File

@@ -435,7 +435,7 @@
<!-- Wireless controls settings screen, setting option summary text as airplane mode is being disabled (so it is re-enabling all the wireless conenctions) -->
<string name="airplane_mode_turning_off">Enabling wireless connections\u2026</string>
<!-- Main Settings screen settings title for things like Wi-Fi, bluetooth, airplane mode. This will take you to another screen with those settings. -->
<string name="radio_controls_title">Wireless controls</string>
<string name="radio_controls_title">Wireless &amp; networks</string>
<!-- Main Settings screen settings summary text for the "Wireless controls" setting -->
<string name="radio_controls_summary">Manage Wi-Fi, Bluetooth, airplane mode, mobile networks, &amp; VPNs</string>
@@ -486,7 +486,7 @@
<string name="zone_list_menu_sort_by_timezone">Sort by time zone</string>
<!-- Main Settings screen setting option title for the item to take you the security and location screen -->
<string name="security_settings_title">Security &amp; location</string>
<string name="security_settings_title">Location &amp; security</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 -->
@@ -1395,7 +1395,7 @@ found in the list of installed applications.</string>
<!-- Language Settings --> <skip />
<!-- Title of setting on main settings screen. This item will take the user to the screen to tweak settings realted to locale and text -->
<string name="language_settings">Locale &amp; text</string>
<string name="language_settings">Language &amp; keyboard</string>
<!-- Summary of setting on main settings screen. This item will take the user to the screen to tweak settings realted to locale and text -->
<string name="language_settings_summary">Set locale (language and region), text input and auto-correction options</string>
<!-- On Text & language settings screen, heading. Inside the "Locale & text" screen, this is the header for settings that are for locale changes. -->
@@ -1788,7 +1788,7 @@ found in the list of installed applications.</string>
<!-- Text-To-Speech (TTS) settings --><skip />
<!-- Title of setting on main settings screen. This item will take the user to the screen to tweak settings related to the text-to-speech functionality -->
<string name="tts_settings">Speech synthesis</string>
<string name="tts_settings">Text-to-speech</string>
<!-- Summary of setting on main settings screen. This item will take the user to the screen to tweak settings related to the text-to-speech functionality -->
<string name="tts_settings_summary">Set text-to-speech options</string>
<!-- Main TTS Settings screen title -->

72
res/xml/settings.xml
View File

@@ -53,18 +53,6 @@
android:targetClass="com.android.settings.SoundAndDisplaySettings" />
</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. -->
<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" />
</com.android.settings.IconPreferenceScreen>
<!-- Security & Privacy -->
<com.android.settings.IconPreferenceScreen
@@ -91,6 +79,18 @@
android:targetClass="com.android.settings.ApplicationSettings" />
</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. -->
<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" />
</com.android.settings.IconPreferenceScreen>
<!-- Storage -->
<com.android.settings.IconPreferenceScreen
@@ -102,30 +102,6 @@
android:targetClass="com.android.settings.deviceinfo.Memory" />
</com.android.settings.IconPreferenceScreen>
<!-- Date & Time -->
<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" />
</com.android.settings.IconPreferenceScreen>
<!-- Language -->
<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" />
</com.android.settings.IconPreferenceScreen>
<!-- Search.
The settings activity will ensure that this is resolved to an
activity on the system image, otherwise it will remove this
@@ -142,6 +118,18 @@
<intent android:action="android.search.action.SEARCH_SETTINGS" />
</com.android.settings.IconPreferenceScreen>
<!-- Language -->
<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" />
</com.android.settings.IconPreferenceScreen>
<!-- Accessibility feedback -->
<com.android.settings.IconPreferenceScreen
@@ -166,6 +154,18 @@
android:targetClass="com.android.settings.TextToSpeechSettings" />
</com.android.settings.IconPreferenceScreen>
<!-- Date & Time -->
<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" />
</com.android.settings.IconPreferenceScreen>
<!-- About Device -->
<com.android.settings.IconPreferenceScreen

109
res/xml/wireless_settings.xml
View File

@@ -17,66 +17,65 @@
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
android:title="@string/radio_controls_title">
<!-- Programmatically will have dynamic summary, but we provide the fallback summary. -->
<CheckBoxPreference
android:key="toggle_wifi"
android:title="@string/wifi_quick_toggle_title"
android:summary="@string/wifi_quick_toggle_summary"
android:persistent="false" />
<CheckBoxPreference
android:key="toggle_airplane"
android:title="@string/airplane_mode"
android:summary="@string/airplane_mode_summary"
android:persistent="false"
android:disableDependentsState="true" />
<PreferenceScreen
android:key="wifi_settings"
android:title="@string/wifi_settings"
android:summary="@string/wifi_settings_summary" >
<intent
android:action="android.intent.action.MAIN"
android:targetPackage="com.android.settings"
android:targetClass="com.android.settings.wifi.WifiSettings" />
</PreferenceScreen>
<!-- Programmatically will have dynamic summary, but we provide the fallback summary. -->
<CheckBoxPreference
android:key="toggle_wifi"
android:title="@string/wifi_quick_toggle_title"
android:summary="@string/wifi_quick_toggle_summary"
android:persistent="false" />
<CheckBoxPreference
android:key="toggle_bluetooth"
android:title="@string/bluetooth_quick_toggle_title"
android:summary="@string/bluetooth_quick_toggle_summary"
android:persistent="false"
android:dependency="toggle_airplane" />
<PreferenceScreen
android:key="wifi_settings"
android:title="@string/wifi_settings"
android:summary="@string/wifi_settings_summary" >
<intent
android:action="android.intent.action.MAIN"
android:targetPackage="com.android.settings"
android:targetClass="com.android.settings.wifi.WifiSettings" />
</PreferenceScreen>
<PreferenceScreen
android:title="@string/bluetooth_settings_title"
android:summary="@string/bluetooth_settings_summary"
android:dependency="toggle_airplane">
<intent
android:action="android.intent.action.MAIN"
android:targetPackage="com.android.settings"
android:targetClass="com.android.settings.bluetooth.BluetoothSettings" />
</PreferenceScreen>
<CheckBoxPreference
android:key="toggle_bluetooth"
android:title="@string/bluetooth_quick_toggle_title"
android:summary="@string/bluetooth_quick_toggle_summary"
android:persistent="false"
android:dependency="toggle_airplane" />
<PreferenceScreen
android:key="vpn_settings"
android:title="@string/vpn_settings_title"
android:summary="@string/vpn_settings_summary" >
<intent
android:action="android.intent.action.MAIN"
android:targetPackage="com.android.settings"
android:targetClass="com.android.settings.vpn.VpnSettings" />
</PreferenceScreen>
<PreferenceScreen
android:title="@string/bluetooth_settings_title"
android:summary="@string/bluetooth_settings_summary"
android:dependency="toggle_airplane">
<intent
android:action="android.intent.action.MAIN"
android:targetPackage="com.android.settings"
android:targetClass="com.android.settings.bluetooth.BluetoothSettings" />
</PreferenceScreen>
<PreferenceScreen
android:title="@string/network_settings_title"
android:summary="@string/network_settings_summary"
android:dependency="toggle_airplane">
<intent
android:action="android.intent.action.MAIN"
android:targetPackage="com.android.phone"
android:targetClass="com.android.phone.Settings" />
</PreferenceScreen>
<CheckBoxPreference
android:key="toggle_airplane"
android:title="@string/airplane_mode"
android:summary="@string/airplane_mode_summary"
android:persistent="false"
android:disableDependentsState="true" />
<PreferenceScreen
android:key="vpn_settings"
android:title="@string/vpn_settings_title"
android:summary="@string/vpn_settings_summary" >
<intent
android:action="android.intent.action.MAIN"
android:targetPackage="com.android.settings"
android:targetClass="com.android.settings.vpn.VpnSettings" />
</PreferenceScreen>
<PreferenceScreen
android:title="@string/network_settings_title"
android:summary="@string/network_settings_summary"
android:dependency="toggle_airplane">
<intent
android:action="android.intent.action.MAIN"
android:targetPackage="com.android.phone"
android:targetClass="com.android.phone.Settings" />
</PreferenceScreen>
</PreferenceScreen>