summaryrefslogtreecommitdiffstats
path: root/res/xml
Commit message (Collapse)AuthorAgeFilesLines
* am 1337d0f7: Implement issue #3094621 and #3094609 - wipe sd cardDianne Hackborn2010-10-161-1/+2
|\ | | | | | | | | | | | | Merge commit '1337d0f70b18dd732c6a617be83e5be0bb8f2f87' into gingerbread-plus-aosp * commit '1337d0f70b18dd732c6a617be83e5be0bb8f2f87': Implement issue #3094621 and #3094609 - wipe sd card
| * Implement issue #3094621 and #3094609 - wipe sd cardDianne Hackborn2010-10-161-1/+2
| | | | | | | | | | | | | | | | | | | | 3094621: add "wipe sd card" option to factory data reset 3094609: collapse unmount/format into one command Implements requested UI changes. Also some final tweaks to Manage Applications. Change-Id: I0219195dd0c74d8c003ef1c3f6e09714859d7f89
* | am 792d4356: Merge "Move NFC setting lower down the Setting\'s list." into ↵Nick Pelly2010-10-131-6/+6
|\ \ | |/ | | | | | | | | | | | | | | gingerbread Merge commit '792d43560bdbf2f9982eb918cd841672ecfcf9de' into gingerbread-plus-aosp * commit '792d43560bdbf2f9982eb918cd841672ecfcf9de': Move NFC setting lower down the Setting's list.
| * Move NFC setting lower down the Setting's list.Nick Pelly2010-10-131-6/+6
| | | | | | | | Change-Id: I585d060a5b65df05d62c2bf156f5af76b3bf60e0
* | am d2c3f37f: Revise the Language & keyboard settings layout.Ken Wakasa2010-09-291-10/+13
|\ \ | |/ | | | | | | | | | | Merge commit 'd2c3f37fa445130c8cce0f16347d61f66b4b0025' into gingerbread-plus-aosp * commit 'd2c3f37fa445130c8cce0f16347d61f66b4b0025': Revise the Language & keyboard settings layout.
| * Revise the Language & keyboard settings layout.Ken Wakasa2010-09-291-10/+13
| | | | | | | | | | bug: 2954950 Change-Id: Ie5815023654c3ee45f73fb6ec08266b11e7ff017
* | am 48ad5dfe: Merge "Add NFC checkbox to Settings app." into gingerbreadNick Pelly2010-09-281-0/+6
|\ \ | |/ | | | | | | | | | | Merge commit '48ad5dfe3189534cc3c9b8cb6f84758db19524c4' into gingerbread-plus-aosp * commit '48ad5dfe3189534cc3c9b8cb6f84758db19524c4': Add NFC checkbox to Settings app.
| * Add NFC checkbox to Settings app.Nick Pelly2010-09-281-0/+6
| | | | | | | | | | | | | | | | Based on Trusted_NFC_Device_Host_AA03.01e02_google.zip code drop (23-Sep-2010) Heavily modified to remove dead code. Change-Id: I9e5f0bf2d32105feff4d68f03adebe87d2e9d900
* | am 28580b4d: Remove Search from the system Settings app DO NOT MERGEBjorn Bringert2010-09-211-15/+0
|\ \ | |/ | | | | | | | | | | Merge commit '28580b4d9a36bb15e75423bc95747b9a746ea8b9' into gingerbread-plus-aosp * commit '28580b4d9a36bb15e75423bc95747b9a746ea8b9': Remove Search from the system Settings app DO NOT MERGE
| * Remove Search from the system Settings app DO NOT MERGEBjorn Bringert2010-09-211-15/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The search settings acitivity lives in the system search app, which is build-dependent. Also, since the Browser no longer looks at the SHOW_WEB_SUGGESTIONS system preference, none of the search settings affect the behavior of any other platform apps. The search settings will henceforth only be available from within the search app (e.g. QuickSearchBox). This is a cherry-pick of change I08f3979cd8cdc0742efbc49be95aa59753c94c0d to gingerbread. Bug: 3017365 Change-Id: I55df30e3a0e1f307ad6f23900f54d3018efda59f
* | am 02930093: Fix issue #2905454: Crash observed while accessing Battery ↵Dianne Hackborn2010-09-021-7/+0
|\ \ | |/ | | | | | | | | | | | | | | history page on passion/GRG40 Merge commit '0293009389eb3a4e8a3f2d08060e864f53f3c532' into gingerbread-plus-aosp * commit '0293009389eb3a4e8a3f2d08060e864f53f3c532': Fix issue #2905454: Crash observed while accessing Battery history page on passion/GRG40
| * Fix issue #2905454: Crash observed while accessing Battery history page on ↵Dianne Hackborn2010-09-021-7/+0
| | | | | | | | | | | | passion/GRG40 Change-Id: Ifd08744d909c2d87e5cdf4eedcc5af1a86548e60
* | am 508fedc4: Improvements to manage apps / running services:Dianne Hackborn2010-07-281-0/+8
|\ \ | |/ | | | | | | | | | | Merge commit '508fedc4102790dcd7004e4962e2b540967b714b' into gingerbread-plus-aosp * commit '508fedc4102790dcd7004e4962e2b540967b714b': Improvements to manage apps / running services:
| * Improvements to manage apps / running services:Dianne Hackborn2010-07-281-0/+8
| | | | | | | | | | | | | | | | | | | | | | - Running services now keeps a single data structure to make switching through the UI a lot faster. - Display text when there are no apps. - Fix deadlock. - Add new preference entry to view manage apps for storage use. - Etc. Change-Id: I0f5babf407ed7e84169f59584ddcb6cd0e9d67d9
* | am 15fe0e47: Merge "Allow soft AP settings config before bring up" into ↵Irfan Sheriff2010-06-252-2/+0
|\ \ | |/ | | | | | | | | | | | | | | gingerbread Merge commit '15fe0e47958d248300c2f26a463172181b137aca' into gingerbread-plus-aosp * commit '15fe0e47958d248300c2f26a463172181b137aca': Allow soft AP settings config before bring up
| * Allow soft AP settings config before bring upIrfan Sheriff2010-06-242-2/+0
| | | | | | | | | | Bug: 2538623 Change-Id: I4b927deb0e4981c164744b85e5c85c3fc95a31eb
* | merge from froyo-plus-aospThe Android Open Source Project2010-06-141-0/+14
|\ \ | |/ |/| | | Change-Id: I6c6ee9c9567f5aef7e1beb585296c1e2fb884e9a
| * merge from open-source masterThe Android Open Source Project2010-06-111-0/+14
| |\ | | | | | | | | | Change-Id: I7d167c97600bbf25e2ed8872cffecd9fa5b1db7c
| | * Settings: Add a hook for operator or vendor specific settings.Anders Hammar12010-06-111-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | The Settings application now provides a hook that can be used by an operator or a vendor specific application to add an activity of choice in the settings menu. Change-Id: Id55da9fd4262bbfc6a5abf863799c747b0d75b24
* | | New Running Services UI.Dianne Hackborn2010-06-071-0/+9
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This introduces a simplified (thanks, dsandler!) UI for Running Services, collapsing the groups of apps and processes into single lines. Tapping on a line moves to a new activity showing details on that group, where the stop functionality is now available. This UI is now also integrated into Manage Applications, as the Running tab. You no longer get a really confusing, misleading, scary list of every package that appears to be laying around for some reason. The code was also re-organized, to put everything related to Manage Applications and Running Services under its own package. There is still some clean-up -- some performance improvements (such as not re-computing the world when we switch to the details view), and if this looks good then eradicating the old running services UI. Change-Id: I3fc059c18060600742cab5b455d11ff74bf45ae3
* | am aa1f8aee: Clarify backup settingKenny Root2010-06-031-2/+3
|\ \ | | | | | | | | | | | | | | | | | | Merge commit 'aa1f8aeeea1c27fe88270cc8b5df970d9f292385' into froyo-plus-aosp * commit 'aa1f8aeeea1c27fe88270cc8b5df970d9f292385': Clarify backup setting
| * | Clarify backup settingKenny Root2010-06-031-2/+3
| | | | | | | | | | | | Change-Id: Ifb4497e4ea1453b1afbdd08ed08fddb9055b7251
* | | am e434bfb2: String change - wifi tether = hotspotRobert Greenwalt2010-05-102-4/+3
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit 'e434bfb216682a6ca331fa54ce58a2bff7adf8d7' into froyo-plus-aosp * commit 'e434bfb216682a6ca331fa54ce58a2bff7adf8d7': String change - wifi tether = hotspot
| * | String change - wifi tether = hotspotRobert Greenwalt2010-05-082-4/+3
| | | | | | | | | | | | | | | bug:2664412 Change-Id: I6ca955e7fcc299ae1d69892c93c9250229610b19
* | | am 64ab5338: Fix regression in removing settings that aren\'t relevant for a ↵Amith Yamasani2010-04-271-105/+87
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | platform. Merge commit '64ab5338cb0f90f8ee0787b0b98611670e6dee7e' into froyo-plus-aosp * commit '64ab5338cb0f90f8ee0787b0b98611670e6dee7e': Fix regression in removing settings that aren't relevant for a platform.
| * | Fix regression in removing settings that aren't relevant for a platform.Amith Yamasani2010-04-271-105/+87
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 2630695 The PreferenceCategories added into the hierarchy caused removePreference() to not work, since the preferences to be removed were not immediate children of the preference screen. Create empty PreferenceCategory elements and pull the preferences to the same depth as the categories. Change-Id: I34826ea4d84cda0ecab75c66a73febe3d51e7c68
* | | am f0746678: Merge "Redesign vibration settings." into froyoDaniel Sandler2010-04-211-14/+7
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit 'f07466782bb25ce4f2738133d0992f3531af28e5' into froyo-plus-aosp * commit 'f07466782bb25ce4f2738133d0992f3531af28e5': Redesign vibration settings.
| * | Redesign vibration settings.Daniel Sandler2010-04-211-14/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Under the hood there remain three axes: 1. Are we in silent mode now? | RINGER_MODE_{VIBRATE,SILENT} 2. Do we vibrate in silent mode? | VIBRATE_IN_SILENT == 1 3. Do calls vibrate: | getVibrateSetting(VIBRATE_TYPE_RINGER) - always | == VIBRATE_SETTING_ON - never | == VIBRATE_SETTING_OFF - only in silent | == VIBRATE_SETTING_ONLY_SILENT We now expose this to the user much more simply by collapsing (2) and (3) above, and discarding states that don't make sense: - VIBRATE_SETTING_OFF + VIBRATE_IN_SILENT - VIBRATE_SETTING_ONLY_SILENT + !VIBRATE_IN_SILENT Now we offer the user four choices: Phone vibrate: * "Never" --> VIBRATE_IN_SILENT=0, VIBRATE_SETTING_OFF * "Always" --> VIBRATE_IN_SILENT=1, VIBRATE_SETTING_ON * "Only in silent mode" --> VIBRATE_IN_SILENT=1, VIBRATE_SETTING_ONLY_SILENT * "Only when not in silent mode" --> VIBRATE_IN_SILENT=0, VIBRATE_SETTING_ON This should make it easier to choose exactly the behavior the user wants as well as avoid nonsensical combinations of settings. Bug: 2598014 Change-Id: I9244d25ec97a3e2b572b71b521049debd22fa4e0
* | | am 19340d21: Merge "Labeled categories to help clarify Sound prefs." into froyoDaniel Sandler2010-04-211-0/+24
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit '19340d213c4bd4428f940a12d82a494f9e7cfaa6' into froyo-plus-aosp * commit '19340d213c4bd4428f940a12d82a494f9e7cfaa6': Labeled categories to help clarify Sound prefs.
| * | Labeled categories to help clarify Sound prefs.Daniel Sandler2010-04-211-0/+24
| | | | | | | | | | | | | | | Bug: 2598014 Change-Id: Ia846367fc479345bfd02c10fe1860373719334eb
* | | merge from open-source masterThe Android Open Source Project2010-04-211-0/+5
|\ \ \ | |/ / |/| / | |/ Change-Id: I9d308271306bfcbdc0ef461605f800e5d48334a3
| * Display current IP address in advanced Wifi settings screenMike Lockwood2010-04-201-0/+5
| | | | | | | | | | Change-Id: I47c6eece376e712b73add72057462926f7b2349f Signed-off-by: Mike Lockwood <lockwood@android.com>
* | Fix 2579923: Make changing lock screen method more discoverable.Jim Miller2010-04-115-39/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This changes the organization of lock screen security settings to make choosing an alternate unlock method more discoverable. Instead of having to disable the old lock method to use a new one, the user now just has one set/change option in lock settings, with a list of method-specific setting below it. In addition, we ask the user to confirm their old credentials before prompting them to choose a new one, which eliminates one source of confusion. Also, ChooseLockGeneric now shows a UI if quality isn't specified. Any unlock method less secure than minimum specified by DevicePolicyManager (if active) is greyed out. Change-Id: Iecc6f64d4d3368a583f06f8d5fe9655cc3d5bd3b
* | Fixing bugs 2577511 and 2581920.Charles Chen2010-04-081-1/+3
| | | | | | | | | | | | | | | | | | | | Making sure that the language, country, and variant defaults are always set to something to ensure that there won't be an NPE. Dismissing the ListPreference dialogs before a rotation to avoid list data corruption caused by the list being displayed while its data is being re-initialized. Change-Id: Iecdb3b4d415542dc8a4db162c930e6a6570a55f2
* | Restore dependency between volume settings and silent mode.Daniel Sandler2010-03-301-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Volume (of the ringer, notifications, media, and alarms) may no longer be adjusted while the phone is in silent mode. This was the behavior in Eclair and earlier releases. This rolls back a small portion of change I724c43aa in the interest of stability (see bugs listed below for weirdness that occurs when the ringer's SeekBarVolumizer is visible when the ringtone stream is muted). Bug: 2552268 Bug: 2544706 Change-Id: I4858e6d85e5ec8c4bba83b649e24dd5915252eb2
* | Fixing a bug that causes a crash when Install voice data is clickedCharles Chen2010-03-181-1/+1
| | | | | | | | | | | | in the TTS settings. Change-Id: Ia9992f105652518a37ba7e4c139810bfc76c6252
* | Merge "Adding plugin specific settings to TTS settings + changing the UI to ↵Charles Chen2010-03-161-8/+11
|\ \ | | | | | | | | | be more like the IME settings."
| * | Adding plugin specific settings to TTS settings + changing the UICharles Chen2010-03-161-8/+11
| | | | | | | | | | | | | | | | | | to be more like the IME settings. Change-Id: I0d26042262b4d9e636d3f456e867c725fa56ae55
* | | softAp UI changesIrfan Sheriff2010-03-161-7/+0
|/ / | | | | | | | | | | | | | | | | Remove channel settings Add subtext error handling Remove WEP, keep WPA2 only for now Bug: 2413908 Change-Id: Ie867e84a0705f0d2185eeb3a4c86a8227446a338
* | Add Tether Help UI.Robert Greenwalt2010-03-151-0/+5
| | | | | | | | | | | | Add a "Help" button to the tethering page that loads on-device html. Change-Id: I816ec552a4433296a6cb57345a37611eb2a92b37
* | Add "Power button ends call" accessibility setting.David Brown2010-03-111-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is part 3 of the fix for bug 2364220 "Accessibility improvements for ending calls". This change adds a checkbox under "Accessibility settings" to control the new Settings.Secure.INCALL_POWER_BUTTON_BEHAVIOR value, which allows the user to specify that the Power button should hang up while in-call (instead of just turning off the screen.) The checkbox is only shown on devices that actually have a POWER button. Yeah, it's a little strange having this under Accessibility (since it's not that obvious *why* this feature is accessibility-related), but there's no obvious better place. See discussion in the bug for more info. Bug: 2364220 Change-Id: I0fd7cf357972519b390575b9c06a4bbe46ff1c9b
* | Fix Wi-Fi title reference in settingsIrfan Sheriff2010-03-091-1/+1
| | | | | | | | Change-Id: Ia17df113bb6dfdc6af1b5d3632a7594f21365485
* | Clean up the tethering settings screen a bit.Robert Greenwalt2010-03-091-21/+15
| | | | | | | | Change-Id: Iadd1cf9245a5ccd38537050a6b6c9d9390400b20
* | Remove dependencies within Sound settings.Daniel Sandler2010-03-081-6/+0
| | | | | | | | | | | | | | | | | | | | All checkboxes and other settings will be available to the user regardless of whether the device is in silent mode. (Previously, settings such as ringtone and volume were dimmed if the phone was silent, which was inconvenient.) Bug: 2496164 Change-Id: I724c43aa4f5b1a12b95097381844a47c5dcf1e0d
* | Update Tethering UIRobert Greenwalt2010-03-041-15/+4
| | | | | | | | Finalizing some strings and changing the error handling.
* | Get all strings in for Wifi tetheringIrfan Sheriff2010-03-042-10/+9
| | | | | | | | | | Bug: 2413908 Change-Id: I3d28fcfcb4a6e4eaf03e57d69f9d2c92730b12e5
* | Add AP support for tetheringIrfan Sheriff2010-03-042-8/+75
| | | | | | | | | | | | | | | | First phase of the AP support in UI and framework Bug: 2421638 Change-Id: I0b6c31be5fe79bd4d33c292464d271b054754e8d
* | Update Tether Settings UI.Robert Greenwalt2010-03-041-5/+0
| | | | | | | | Remove the USB notification option.
* | Add a checkbox to the Dock settings to control insertion/removal sound effects.Daniel Sandler2010-03-041-1/+8
| | | | | | | | | | | | | | | | | | The sounds are present in the build but are turned off by default (and there isn't currently a UI to turn them on). (Mentioned in http://b/2469862) Change-Id: I9ded1d67cc19204113047aeb8fc8b0123cea1427
* | Merge "Support new vibrate/silent behavior."Daniel Sandler2010-03-011-4/+12
|\ \
generated by cgit v1.1 at 2025-01-20 05:59:29 +0000