summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Import translations. DO NOT MERGEBaligh Uddin2012-09-2850-271/+1051
| | | | | Change-Id: Ib65119cb5455e20a3a10ff0a45f54aa0d819d8ec Auto-generated-cl: translation import
* Merge "Bring up new user setup dialog when tapping on new user" into jb-mr1-devAmith Yamasani2012-09-284-12/+46
|\
| * Bring up new user setup dialog when tapping on new userAmith Yamasani2012-09-274-12/+46
| | | | | | | | | | | | | | | | | | Bug: 7245796 Also fix a few strings that changed and other UI tweaks to conform to spec document. Change-Id: If4409459b20ec8c8ece69b6c23c8ab49b0ca0cac
* | Merge "Import translations. DO NOT MERGE" into jb-mr1-devBaligh Uddin2012-09-2751-475/+690
|\ \
| * | Import translations. DO NOT MERGEBaligh Uddin2012-09-2751-475/+690
| | | | | | | | | | | | | | | Change-Id: Ifc3aa0738b4f2beccdc05c1c225ff60308def5d4 Auto-generated-cl: translation import
* | | Merge "Developer setting to skip Package Verification" into jb-mr1-devrich cannings2012-09-275-3/+81
|\ \ \ | |/ / |/| |
| * | Developer setting to skip Package Verificationrich cannings2012-09-275-3/+81
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-275-2/+30
|\ \ \ \
| * | | | Rename "Owner info" to "User info" for secondary usersAmith Yamasani2012-09-275-2/+30
| | |_|/ | |/| | | | | | | | | | | | | | 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 "Import translations. DO NOT MERGE" into jb-mr1-devBaligh Uddin2012-09-2751-815/+815
|\ \ \ \
| * | | | Import translations. DO NOT MERGEBaligh Uddin2012-09-2651-815/+815
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ibdc7730e6559d27b4c9abd2e3cec90f2a0d97a76 Auto-generated-cl: translation import
* | | | | Merge "Show warning dialog in a multiuser system when adding a new account." ↵Amith Yamasani2012-09-263-7/+72
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | into jb-mr1-dev
| * | | | | Show warning dialog in a multiuser system when adding a new account.Amith Yamasani2012-09-263-7/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-262-39/+46
|\ \ \ \ | | | | | | | | | | | | | | | selection." into jb-mr1-dev
| * | | | Show more security settings, and fix missing summary in widget selection.Amith Yamasani2012-09-252-39/+46
| | | | | | | | | | | | | | | | | | | | | | | | | 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 "Import translations. DO NOT MERGE" into jb-mr1-devBaligh Uddin2012-09-2551-2585/+1933
|\ \ \ \
| * | | | Import translations. DO NOT MERGEBaligh Uddin2012-09-2551-2585/+1933
| | |_|/ | |/| | | | | | | | | | | | | | Change-Id: Ic76cd17011c6da46ba5298eb2d1f081f7dc6f633 Auto-generated-cl: translation import
* | | | Merge "Show long message for a new user only once." into jb-mr1-devSvetoslav Ganov2012-09-252-6/+21
|\ \ \ \ | |_|/ / |/| | |
| * | | Show long message for a new user only once.Svetoslav Ganov2012-09-252-6/+21
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 "You section title for current user details" into jb-mr1-devAmith Yamasani2012-09-252-0/+5
|\ \ \
| * | | You section title for current user detailsAmith Yamasani2012-09-252-0/+5
| | | | | | | | | | | | | | | | | | | | Bug: 7232244 Change-Id: I04904f423f236b4dcfc2e1c61618eb88b80b593c
* | | | 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-255-6/+34
|\ \ \ \ | |_|/ / |/| | |
| * | | Fix regression in Bluetooth settings.Jeff Brown2012-09-245-6/+34
| |/ / | | | | | | | | | | | | Bug: 7207090 Change-Id: Ie14a1d36a61b571766d2025ed7d8079712727690
* | | UI refinements to security screen widgets interfaceMichael Jurka2012-09-254-88/+104
|/ / | | | | | | | | Bug #7158868 Change-Id: Ia5be3986323119ea78b9e486b4d2e6e81bf145e7
* | Merge "move remaining dock settings into sound settings fragment." into ↵Chris Wren2012-09-247-249/+132
|\ \ | | | | | | | | | jb-mr1-dev
| * | move remaining dock settings into sound settings fragment.Chris Wren2012-09-247-249/+132
| | | | | | | | | | | | | | | Bug: 7016769 Change-Id: I21a7bf6140f7470dbb9bebeda1ebcc3f17c481c6
* | | Ensuring that keyguard widgets are bound with correct optionsAdam Cohen2012-09-242-4/+24
| | | | | | | | | | | | | | | | | | -> We need to bind the widget and indicate that it is a keyguard widget Change-Id: I8e76b45b86aecc671669022c6f5fad071b62837d
* | | Merge "Hide lockdown VPN when IMS auth is required." into jb-mr1-devJeff Sharkey2012-09-241-0/+11
|\ \ \
| * | | Hide lockdown VPN when IMS auth is required.Jeff Sharkey2012-09-241-0/+11
| | | | | | | | | | | | | | | | | | | | Bug: 7069782 Change-Id: I978d89894da17164a1e0122adb5acbfda3586fa1