summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
* | | Merge "Addressing issue where power control widget disappears issue 7205586" ↵Adam Cohen2012-09-241-12/+0
|\ \ \ | |_|/ |/| | | | | into jb-mr1-dev
| * | Addressing issue where power control widget disappears issue 7205586Adam Cohen2012-09-211-12/+0
| | | | | | | | | | | | Change-Id: I6eea146d3819d3b35f1420e59d4ebdbc66041a9e
* | | Merge "Show more settings and add restrictions/dialogs for secondary users" ↵Amith Yamasani2012-09-2316-46/+321
|\ \ \ | |_|/ |/| | | | | into jb-mr1-dev
| * | Show more settings and add restrictions/dialogs for secondary usersAmith Yamasani2012-09-2316-46/+321
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7213029 crash in About>Status Bug: 7212495 hide System updates for second user Bug: 7212230 nickname editor should select the text Bug: 7160487 TTS settings Bug: 7129411 Settings needs visibility changes for secondary users Change-Id: Ia2d1229c08b392edfa6b671fce4a382410405b14
* | | Storage item to represent cached data.Jeff Sharkey2012-09-234-1/+97
|/ / | | | | | | | | | | | | When touched, offers to clear all cached data. Bug: 7216370 Change-Id: I86afe66b819fb7deeba909bef507925fc5a590f3
* | Merge "Import translations. DO NOT MERGE" into jb-mr1-devBaligh Uddin2012-09-2398-1962/+7147
|\ \
| * | Import translations. DO NOT MERGEBaligh Uddin2012-09-2298-1962/+7147
| | | | | | | | | | | | | | | Change-Id: Ie4f6419929f793550859314eb624135452f845f4 Auto-generated-cl: translation import
* | | Merge "Remove no longer used dream_settings.xml." into jb-mr1-devBaligh Uddin2012-09-231-42/+0
|\ \ \ | |/ / |/| |
| * | Remove no longer used dream_settings.xml.John Spurlock2012-09-221-42/+0
| |/ | | | | | | Change-Id: I8355372f4dd2f99a92b4a708cf38276c5e7f41d4
* | Merge "Add new developer setting to visualize overdraw" into jb-mr1-devRomain Guy2012-09-213-0/+27
|\ \
| * | Add new developer setting to visualize overdrawRomain Guy2012-09-213-0/+27
| | | | | | | | | | | | Change-Id: I16d6bb5a199233efebf5c3211dbe57dc9b6729c9
* | | Merge "Accessibility multi-user support." into jb-mr1-devSvetoslav Ganov2012-09-211-2/+1
|\ \ \
| * | | Accessibility multi-user support.Svetoslav Ganov2012-09-211-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Accessibility settings are now shown for every user. bug:6967373 Change-Id: Ie31a6a573031bde1d769e43c4d5d88b7e4c8525d
* | | | Merge "Remove accessibility category from developer options." into jb-mr1-devSvetoslav Ganov2012-09-213-41/+1
|\ \ \ \
| * | | | Remove accessibility category from developer options.Svetoslav Ganov2012-09-203-41/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. There is a temporary accessibility option in developer options with one item for enabling automatic zoom out and panning. This is not a developer option in general and should not be there. bug:7207305 Change-Id: Ib146ccb3704dd94d635cc668b71c007fbd8d29b3
* | | | Merge "Fix issue 7198767, 7198366, 7189824." into jb-mr1-devDianne Hackborn2012-09-216-25/+50
|\ \ \ \
| * | | | Fix issue 7198767, 7198366, 7189824.Dianne Hackborn2012-09-216-25/+50
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug #7198767: Crash on choosing App info from the Recent apps tab Bug #7198366: Settings UI should not show other Users' apps Bug #7189824: Settings crashes on trying to access Battery usage summary Also fix running services to be able to show user bitmap when in secondary users, crash in running services if a service is running whose app is not installed for the current user. Change-Id: Ief24810c9ddce1ec3f8641ce08af79e1bc18f221
* | | | Revert "Import translations. DO NOT MERGE"Baligh Uddin2012-09-2198-7006/+1962
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Build Broken This reverts commit 8172ea490f5880b1e2df2856364c3d37c28ed155 Change-Id: I091c3300ecce597bb0133f62bc621f29af85e5ba
* | | | Import translations. DO NOT MERGEBaligh Uddin2012-09-2198-1962/+7006
| |_|/ |/| | | | | | | | | | | Change-Id: Iae4b42c08cd2e16f700c844579fcb9b1664a2960 Auto-generated-cl: translation import
* | | Merge "Add support for changing status widget on security screen" into ↵Michael Jurka2012-09-217-17/+138
|\ \ \ | | | | | | | | | | | | jb-mr1-dev
| * | | Add support for changing status widget on security screenMichael Jurka2012-09-217-17/+138
| |/ / | | | | | | | | | Change-Id: I68a8ce2ce03888a8decbe017d67634c6965f0a1a
* | | Merge "Exclude dying users when querying the list" into jb-mr1-devAmith Yamasani2012-09-201-2/+2
|\ \ \ | |_|/ |/| |
| * | Exclude dying users when querying the listAmith Yamasani2012-09-201-2/+2
| |/ | | | | | | | | | | | | | | | | Bug: 7194894 Use the new API in UserManager to query the list of users, excluding the dying ones. Change-Id: Ib09bb723209030da7e8aca53d402ef4c96c273a3
* | Merge "Fix bug #7198585 Settings > Display > Dream completely broken in RTL" ↵Fabrice Di Meglio2012-09-201-9/+10
|\ \ | |/ |/| | | into jb-mr1-dev
| * Fix bug #7198585 Settings > Display > Dream completely broken in RTLFabrice Di Meglio2012-09-201-9/+10
| | | | | | | | | | | | | | | | - use start/end instead of left/right - use android:textDirection="locale" on the TextView for forcing the correct position of the title text Change-Id: I968798dcd4ac9307ffc3e48369990b73d3d1b4db
* | First draft of wifi display settings UI.Jeff Brown2012-09-1912-13/+641
|/ | | | | | | | All of the functionality is in place but the UI is not fully polished yet. Bug: 7178216 Change-Id: Id76843bff05cc71e5c02a31bc97c7070d58fff10