summaryrefslogtreecommitdiffstats
path: root/res/xml
Commit message (Collapse)AuthorAgeFilesLines
* Move ManageAccountsSettings into Settings.Daisuke Miyakawa2010-09-172-1/+37
| | | | | | | | | | | | | | | | | | - Add activity-alias for the Activity. - Copy the Activity from AccountsAndSyncSettings. - Fragmentize ManageAccountsSettings. - Remove dependency toward AccountPreferenceBase, which is used in AccountsAndSyncSettings widely. - Add missing implementation derived from AccountPrefernceBase. - Copy dependent drawables. - Copy dependent xmls - Copy AccountPrefernce.java. - Copy strings, adding CHAR LIMIT. - Remove the logic which remove the preference when its destination Activity is missing. We already have the destination as Fragment, and it never disappear. Change-Id: Id41c63d7064aebeaae31bcd84bf4fd20a5636dfe
* Merge "Fragmentize VoiceOutputSettings."Daisuke Miyakawa2010-09-171-6/+3
|\
| * Fragmentize VoiceOutputSettings.Daisuke Miyakawa2010-09-161-6/+3
| | | | | | | | Change-Id: Ifc8f9a8169cf43f53dc122342d95eac6058e6c88
* | WebView accessibility support - Adding opt-in setting for enabling ↵Svetoslav Ganov2010-09-161-0/+9
|/ | | | | | accessibility script injection from Google Change-Id: I1676f34c30a0e9414d51060ad4fb2c9c502b09c3
* Fragmentize VpnSettings and relevant Activities.Daisuke Miyakawa2010-09-151-4/+1
| | | | | | Add startFragment() to SettingsFragmentPreference. Change-Id: Ifab93b2e68892d5f6da559f337c94d62629780c8
* Add static IP UIIrfan Sheriff2010-09-141-50/+0
| | | | | | Remove the existing UI and add per network static IP config option Change-Id: I9b8636e1559de9691144fdb54e20d40985896650
* Fragmentize BluetoothSettings.Daisuke Miyakawa2010-09-132-8/+4
| | | | | | | | | Add UserLeaveHintListener.java, so that the settings won't use its implementation around Activity#onUserLeaveHint(). Also fragmentize bluetooth tethering screen. Change-Id: Id06ae3161fbdb5854ddb7a257f464fb16ea9b089
* Fragmentize UserDictionary.Daisuke Miyakawa2010-09-131-11/+7
| | | | | | | Depending on I2c962726b0adc8811c18dd6df7ff7bdc93c31a07, which implements DialogCreatable. Change-Id: I9857e592218731bfbddc578c15180cc681fa4d20
* Fragmentize ProxySettings.Daisuke Miyakawa2010-09-121-4/+1
| | | | Change-Id: I2c962726b0adc8811c18dd6df7ff7bdc93c31a07
* Conditionally remove settings that aren't required on the tablet.Amith Yamasani2010-09-112-15/+2
| | | | | | | | | Bug: 2985267 Changes not done : SD card related stuff, as we need some way still to figure out if there is a real SD card in the device. Change-Id: I21c41f18ebe6c050981918481a7f6d69f04b65d0
* Fragmentize TetherSettings and WifiApSettings.Daisuke Miyakawa2010-09-102-8/+2
| | | | | | | PreferenceScreen for BT tethering isn't fragmentized yet. We'll need to do so in the near future. Change-Id: I5a84fecaf84d55b59b6efa8151f2549ad37ca5db
* Fragmentize ZoneList, which is needed in DateTimeSettings refactoring.Daisuke Miyakawa2010-09-081-2/+4
| | | | | | | | | | | | | | | | | | - remove old ZonePicker and rename ZoneList to ZonePicker, as the name is really confusing (see LocalePicker) - Make the new ZonePicker fragment. - remove dependency toward "ZoneList" class. -- AndroidManifest.xml does not allow the other components to access ZoneList directly, so it would be ok to remove without using activity-alias. -- Noticed there is a significant code duplication between DateTimeSettings and DateTimeSettingsActivity. I'll work on it later. - add DateTimeSettingsSetupWizardXL class, which is not used yet, but will be in the near future. -- It is not recognized by AndroidManifest.xml Change-Id: Id26152a3d560f9e0bd84afdf3e1c5101f0e166b4
* am 356102e3: am 02930093: Fix issue #2905454: Crash observed while accessing ↵Dianne Hackborn2010-09-021-7/+0
|\ | | | | | | | | | | | | | | | | Battery history page on passion/GRG40 Merge commit '356102e39ae5997393ef82eee5f7f78b7ec4fdcb' * commit '356102e39ae5997393ef82eee5f7f78b7ec4fdcb': Fix issue #2905454: Crash observed while accessing Battery history page on passion/GRG40
| * 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
* | | Fix 2579224: Add a separate timeout for lockscreen vs displayJim Miller2010-09-013-0/+24
| | | | | | | | | | | | | | | | | | | | | This change adds a second timeout to the SecuritySettings page separate from the standard display timeout. Change-Id: I033a3578d876148bd723dee5d1a2531be5d6b51d
* | | Add modifications which should have been in the changeDaisuke Miyakawa2010-09-011-7/+4
| | | | | | | | | | | | | | | | | | I520d690d3301837d32f91dad54a973a379ce1989 Change-Id: Iecca6b4fef2ec42a62273035b096ccedcea94d78
* | | Add Wifi Setup screen for Setup Wizard with XL size screen.Daisuke Miyakawa2010-09-011-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add WifiSettingsForSetupWizardXL as a new Activity The activity has WifiSettings fragment in it. It also contains several buttons, texts around the fragment. * Making configuration UI part of Preference list. In Wifi Setup for Setup Wizard XL, WifiSettings fragment lets a UI for configuring access points shown inside a PregerenceCategory object, while it has been shown as Dialog. To achieve this action, WifiDialog is decomposed into two parts: - WifiConfigUiBase (Mainly UI part) - WifiConfigController (Mainly Wifi controller part) All codes for wifi configuration in WifiDialog is now in WifiConfigController, which is reused from WifiConfigPreference. * Misc stuff - Remove AccessPoint#compareTo(). Instead, AccessPoint.AccessPointComparater should be used when needed. Change-Id: I520d690d3301837d32f91dad54a973a379ce1989
* | | Add checkbox to enable PTP USB mode.Mike Lockwood2010-08-311-0/+3
| | | | | | | | | | | | | | | Change-Id: Icb139cc3d1077565fb8dbe9917d87c7337f59797 Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | Make LocalePicker Fragment.Daisuke Miyakawa2010-08-291-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The logic calling selectFirst() is removed as - There's no comment why it is needed. - Actually SetupWizard gets stack as that forces users to see WirelessSettings in SetupWizard. The other changes: - Move back LocalePickerFragment to LocalePicker. - Make <activity> for LocalePicker in AndroidManifest <activity-alias> - Add a short comment about how getComponent(), which should be a key for understanding how top-level settings work. - Modify LanguageSettings so that it corectly points LocalePicker as a fragment. Change-Id: I78d356e40af896ba1aab72fba12c90467371c7b0
* | | Fragmentize WifiSettings.Daisuke Miyakawa2010-08-251-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add button bar feature toward SettingsPreferenceFragment, which has existed in PreferenceActivity and has been used (probably) only by Settings app. - super.onActivityCreated() is not called at the beggining of WifiSettings#onActivityCreated(), the parent method assumes the child should have prepared PreferenceScreen, while WifiSettings cannot do until the parent Activity is ready. - Call SetHasOptionMenu() should be called AFTER the parent Activity is ready. It is not documented, so it would be better to file another bug. - Add exception to proguard... Change-Id: Iebd27f0cb0abdbee9b4b1cc9b00f4bf127f7815d
* | | Refactor settings top level activities to use fragments.Amith Yamasani2010-08-187-58/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added a base class SettingsPreferenceFragment from which the settings activities should be derived so that they can behave like fragments. It contains some commonly called utility methods and dialog conversion to DialogFragment. Some of the top-level activities can be launched directly without the left pane. Settings.java acts as a proxy activity that contains just that settings fragment without the left pane. There are still a lot of second and third level activities that need to be fragmentized. This is just the first pass to test the 2-pane layout.
* | | bluetooth tetheringDanica Chang2010-08-172-2/+17
| | | | | | | | | | | | Change-Id: I8dfb1c85bb8b963d2937b8bc4a4c9f0cf641785d
* | | Enabling users toset the Global Proxy from wireless settings.Oscar Montemayor2010-08-041-0/+10
| | | | | | | | | | | | Change-Id: Ie9b37e4c8e042fab738d2181878e93d7d2645834
* | | am 6fce81a6: am 508fedc4: Improvements to manage apps / running services:Dianne Hackborn2010-07-281-0/+8
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit '6fce81a69d7c2891d31618016c8ddc7b08deaa03' * commit '6fce81a69d7c2891d31618016c8ddc7b08deaa03': Improvements to manage apps / running services:
| * | 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 40686ee8: am 15fe0e47: Merge "Allow soft AP settings config before bring ↵Irfan Sheriff2010-06-252-2/+0
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | up" into gingerbread Merge commit '40686ee81f95699d7a83ccb1ef1be52c0c746d4f' * commit '40686ee81f95699d7a83ccb1ef1be52c0c746d4f': Allow soft AP settings config before bring up
| * | 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
* | | am 73550d28: merge from froyo-plus-aospThe Android Open Source Project2010-06-141-0/+14
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | Merge commit '73550d28df4b7ee2faa39cc4b1b4cc854343632a' * commit '73550d28df4b7ee2faa39cc4b1b4cc854343632a': Settings: Add a hook for operator or vendor specific settings. replaced deprecated getIntent with parseURI
| * | 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
* | | | am 728ac353: New Running Services UI.Dianne Hackborn2010-06-071-0/+9
|\ \ \ \ | |/ / /
| * | | 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 a262b5d1: am 273464d5: am aa1f8aee: Clarify backup settingKenny Root2010-06-031-2/+3
|\ \ \ | |/ /
| * | 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
* | | | Added an Input Method selector in Language settingsAmith Yamasani2010-06-011-1/+7
|/ / / | | | | | | | | | Bug: 2132207 - Settings UI has no way to change IME
* | | 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>