summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge "Improved dialog management in Settings>Users" into jb-mr1-devAmith Yamasani2012-10-023-14/+62
|\ \
| * | Improved dialog management in Settings>UsersAmith Yamasani2012-10-023-14/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7266284 Delete not functional after orientation change Bug: 7266182 Set up now not functional after orientation change Also remove "vibrate when ringing" on tablets Bug: 7253081 Change-Id: Ie616747f2e3292c401613eb2041b5a5a289cde20
* | | Merge "Pass flag to indicate multiple users on device" into jb-mr1-devRussell Brenner2012-10-021-1/+5
|\ \ \ | |_|/ |/| |
| * | Pass flag to indicate multiple users on deviceRussell Brenner2012-10-021-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When creating a new account, some informational text changes when more than one user exists on the device. Because GLS is built with the SDK and because there is no public API to indicate this state, a flag is added to the bundle passed to the AccountManager, which then funnels down to GLS. Bug: 7255673 Change-Id: Ida2aa5f70ab308958de510a95194463c2a089182
* | | Merge "Migrate telephony settings to Global." into jb-mr1-devJeff Sharkey2012-10-021-4/+4
|\ \ \ | |/ / |/| |
| * | Migrate telephony settings to Global.Jeff Sharkey2012-10-011-4/+4
| | | | | | | | | | | | | | | Bug: 7231764 Change-Id: Ic28dacda8372b7976b5aa36be82e98e5ad069f9a
* | | Merge "Upading the strings for accessibility multi-user." into jb-mr1-devSvetoslav Ganov2012-10-011-3/+3
|\ \ \
| * | | Upading the strings for accessibility multi-user.Svetoslav Ganov2012-10-011-3/+3
| | |/ | |/| | | | | | | | | | | | | bug:7255486 Change-Id: I775165896124a6fde3684d0f302a90396ce19d2e
* | | Move the installed app details overflow button to the top.Adam Powell2012-10-011-1/+3
|/ / | | | | | | | | | | | | | | It looks ridiculous down by itself on a split action bar. Bug 7258991 Change-Id: I4c373e1e154a793384a14e9622707ad464c1b1ca
* | Merge "Add Help lin to Settings > Security" into jb-mr1-devrich cannings2012-09-302-1/+7
|\ \
| * | Add Help lin to Settings > Securityrich cannings2012-09-302-1/+7
| |/ | | | | | | | | Bug: 7210077 Change-Id: I1010356e27d85006e7d7dc62d935b67f53ccde12
* | Merge "Make Settings shortcuts launch into the correct activity/fragment." ↵Amith Yamasani2012-09-301-1/+1
|\ \ | |/ |/| | | into jb-mr1-dev
| * Make Settings shortcuts launch into the correct activity/fragment.Amith Yamasani2012-09-301-1/+1
| | | | | | | | | | | | | | | | | | Bug: 6959454 Change the task affinities so that the shortcuts are not tied to Settings main task. Change-Id: I7729d17d8144a4a57f0d135fe80bdbd7af8dad01
* | Fix issue #7255954: API Review: rename Dream to DreamServiceDianne Hackborn2012-09-281-6/+5
| | | | | | | | Change-Id: Ic374130cb37cbbfad0421089aecf30de87c4d369
* | Setting to enable the global gesture for turning on accessibility.Svetoslav Ganov2012-09-281-6/+56
| | | | | | | | | | | | | | | | | | | | | | 1. Adding a setting to enable the gesture to turn on accessibility. This is a new screen with a toggle switch similarly as screen magnification which will contain explanation of how to perform the gesture. bug:6171929 Change-Id: I84dfa46a9b7b789d99923684e08e52cf7d236eb2
* | Show warnings when skipping Wi-Fi connectionRussell Brenner2012-09-281-0/+89
|/ | | | | | | | | | | | | If user skips over Wi-Fi, warn about possible carrier data charges or inability to receive updates, depending on whether or not phone service is available. Note to translators: Some strings are being moved here from setup wizard. They're tagged with their msgid's so as not to trigger retranslation. Bug: 7211786 Change-Id: Idec7863377bd453d1808b26ee3da75f8310b32e0
* Merge "Bring up new user setup dialog when tapping on new user" into jb-mr1-devAmith Yamasani2012-09-282-7/+33
|\
| * Bring up new user setup dialog when tapping on new userAmith Yamasani2012-09-272-7/+33
| | | | | | | | | | | | | | | | | | Bug: 7245796 Also fix a few strings that changed and other UI tweaks to conform to spec document. Change-Id: If4409459b20ec8c8ece69b6c23c8ab49b0ca0cac
* | Merge "Developer setting to skip Package Verification" into jb-mr1-devrich cannings2012-09-272-2/+70
|\ \
| * | Developer setting to skip Package Verificationrich cannings2012-09-272-2/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a developer setting to skip package verification when installing over USB/ADB/ADT, but still perform package verification on all other installs. This change also fixes visibility issues. Namely, now all "Verify apps" related settings will disappear when Settings.Global.PACKAGE_VERIFIER_SETTING_VISIBLE is 0. Bug: 7183252 Change-Id: I04cfc4f521d1ecb73df56b172cf29cbd84f53dad
* | | Merge "Follow more Secure settings to Global." into jb-mr1-devJeff Sharkey2012-09-273-16/+16
|\ \ \
| * | | Follow more Secure settings to Global.Jeff Sharkey2012-09-273-16/+16
| | | | | | | | | | | | | | | | | | | | Bug: 7232014, 7231331, 7231198 Change-Id: Iea055cfa58edb253b55fe30bf294994ad338cfa4
* | | | Merge "Fix an NPE in WifiSettings." into jb-mr1-devWink Saville2012-09-271-15/+33
|\ \ \ \ | |/ / / |/| | |
| * | | Fix an NPE in WifiSettings.Wink Saville2012-09-271-15/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Under stressful conditions, like the Monkey tests, getActivity() can return null. We assume this occurs when the fragment has shut down but asynchronous commands are returning results. This change adds appropriate null checks but assumes during normal operation the checks are not needed. Bug: 7152711 Change-Id: I7a3736ccead33738dab1a36e78ae1d8042db6e94
* | | | Merge "Rename "Owner info" to "User info" for secondary users" into jb-mr1-devAmith Yamasani2012-09-274-2/+26
|\ \ \ \
| * | | | Rename "Owner info" to "User info" for secondary usersAmith Yamasani2012-09-274-2/+26
| | |_|/ | |/| | | | | | | | | | | | | | Bug: 7237781 Change-Id: I40207d6aa34bf3b7403f077fc7f3a945d739269d
* | | | Merge "Move super call to top of onActivityCreated" into jb-mr1-devRussell Brenner2012-09-271-7/+2
|\ \ \ \ | |_|_|/ |/| | |
| * | | Move super call to top of onActivityCreatedRussell Brenner2012-09-201-7/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The historical reasons for not calling super.onActivityCreated early on appear to be no longer relevant. Bug: 6935999 Change-Id: I63aad8a4c70ce938ecb07541267cad44e3e18e13
* | | | Merge "Addressing issue 7243210, can't set status widget properly" into ↵Adam Cohen2012-09-271-4/+6
|\ \ \ \ | | | | | | | | | | | | | | | jb-mr1-dev
| * | | | Addressing issue 7243210, can't set status widget properlyAdam Cohen2012-09-271-4/+6
| | |/ / | |/| | | | | | | | | | Change-Id: I863136bbef123f1c13d9e887840ca48ac7ccbf95
* | | | Merge "Precreate a data structure so it's never null." into jb-mr1-devRobert Greenwalt2012-09-271-3/+2
|\ \ \ \ | |/ / / |/| | |
| * | | Precreate a data structure so it's never null.Robert Greenwalt2012-09-271-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes NPE that the fast-fingered monkey sometimes triggers. bug:7084178 Change-Id: Ibeb5e1ce678f59207de5dd321e06ae88ccc52216
* | | | Merge "Show warning dialog in a multiuser system when adding a new account." ↵Amith Yamasani2012-09-261-5/+67
|\ \ \ \ | | | | | | | | | | | | | | | into jb-mr1-dev
| * | | | Show warning dialog in a multiuser system when adding a new account.Amith Yamasani2012-09-261-5/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7207092 Change-Id: I95ac107dbc867490dd2e492291501fd3630d267c
* | | | | Merge "Clean up Global settings stragglers." into jb-mr1-devJeff Sharkey2012-09-261-10/+10
|\ \ \ \ \
| * | | | | Clean up Global settings stragglers.Jeff Sharkey2012-09-261-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7242121 Change-Id: Ibe62c70f88c946e46a0604a6999b5ca18ac18a1e
* | | | | | Avoid using hardcoded strings.Jeff Brown2012-09-261-2/+3
|/ / / / / | | | | | | | | | | | | | | | | | | | | Bug: 7204211 Change-Id: Ida5f93719aad472964386f3591518547ddf32f94
* | | | | Merge "show the dream enable switch in all conditions." into jb-mr1-devChris Wren2012-09-261-14/+17
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | show the dream enable switch in all conditions.Chris Wren2012-09-261-14/+17
| |/ / / | | | | | | | | | | | | | | | | Bug: 7229905 Change-Id: I3fc3b2e8ce1e8bb08c72daed9c5d33ce5ff343c6
* | | | Merge "Show more security settings, and fix missing summary in widget ↵Amith Yamasani2012-09-261-38/+44
|\ \ \ \ | | | | | | | | | | | | | | | selection." into jb-mr1-dev
| * | | | Show more security settings, and fix missing summary in widget selection.Amith Yamasani2012-09-251-38/+44
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7232809 Change-Id: Ib7a67b83f455592ba5e0e48420924671f8ed95e8
* | | | | Dream settings now looks for the settings activity in xml.John Spurlock2012-09-261-8/+49
| |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Uses the new api for obtaining dream metadata, no longer looks for the settings activity using the old metadata key. Bug:7172816 Change-Id: I5f9f9ea2a59df6a55c2f17bca5cdbe206f89d780
* | | | Prepare settings for METADATA_NAME_CONFIG_ACTIVITY removal.John Spurlock2012-09-261-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is to avoid even a temporary build breakage. Using the new xml file will be done in a followup commit. Bug:7172816 Change-Id: If6fedefbee38428eda5b39994c3ad8ff86c8fef9
* | | | Merge "Show long message for a new user only once." into jb-mr1-devSvetoslav Ganov2012-09-251-4/+17
|\ \ \ \ | |/ / / |/| | |
| * | | Show long message for a new user only once.Svetoslav Ganov2012-09-251-4/+17
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. We show a longer message only for the first added user. The longer message will be shown until the user has been created, which is until the creator pokes the OK button in the create new user dialog. bug:7210780 Change-Id: Ifed4899048a8369f41f145af204a1e4e860f9b4c
* | | Merge "Update references to migrated global settings." into jb-mr1-devJeff Brown2012-09-251-3/+3
|\ \ \
| * | | Update references to migrated global settings.Jeff Brown2012-09-251-3/+3
| | | | | | | | | | | | | | | | | | | | Bug: 7231172 Change-Id: Ia4abbb6f897e93ebe38e6536fac7411b96eb2bb5
* | | | Merge "Move OVERLAY_DISPLAY_DEVICES to Global." into jb-mr1-devJeff Brown2012-09-251-4/+4
|\ \ \ \ | |/ / /
| * | | Move OVERLAY_DISPLAY_DEVICES to Global.Jeff Brown2012-09-251-4/+4
| |/ / | | | | | | | | | | | | Bug: 7127417 Change-Id: I9ed62e98754eba8a6107a5cac00f00f83904852d
* | | Merge "Fix regression in Bluetooth settings." into jb-mr1-devJeff Brown2012-09-253-4/+32
|\ \ \