summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Hide quota APIs until finalized." into ics-factoryromJeff Sharkey2011-10-062-0/+4
|\
| * Hide quota APIs until finalized.Jeff Sharkey2011-10-062-0/+4
| | | | | | | | | | Bug: 5383656 Change-Id: Ia2a978a6ff2ee642b0ea4d7d6b8857b7efffd612
* | Import translations for late permission additions.Eric Fischer2011-10-0646-29/+217
|/ | | | Change-Id: I80c968b0f6fd74cc52443a3729d02490c77aef30
* DO NOT MERGE New permissions for social stream.Dave Santoro2011-10-043-0/+66
| | | | | | | | | | | | | These permissions are needed to separate the (potentially invasive) access to the user's social stream from the existing read/write contacts permission. Per discussion with Android release team, we are also hiding the stream item API until we figure out a better way to guard the data. Bug 5406886 Change-Id: I8339d743c3ebe8923c7ee47f2900444efcf82a52
* Fix issue #5312624: Lock screen very flickeryDianne Hackborn2011-09-281-2/+7
| | | | | | | | | | | | | The key thing was to fix isVisibleOrBehindKeyguardLw() so that it wouldn't count a window as not visible if it was just currently in the process of drawing due to an orientation change. Also improve logic in deciding when to turn screen on to better ensure the screen is in a stable state, in particular treating screen off as a frozen screen and not allowing it to turn on until the update of the screen due to any config change is done. Change-Id: If82199f3773270b2d07f9c7de9da2dad8c7b28d7
* Fix issue #5242779: Device not responding to touch on unlock screenDianne Hackborn2011-09-282-4/+11
| | | | | | | | Rework how we decide when it is okay to turn on the screen by having the policy call back to the power manager when it knows the lock screen has been drawn. Change-Id: Ie8f3f72111dcf7f168723e6dce24e0343b4afe5d
* Merge "Import revised translations." into ics-factoryromEric Fischer2011-09-282-2/+2
|\
| * Import revised translations.Eric Fischer2011-09-282-2/+2
| | | | | | | | | | | | Bug 5384730 Change-Id: I796fdb4e953595d8dc6a8577f4a633b5d4ff91ca
* | Merge "Import revised translations. DO NOT MERGE." into ics-factoryromEric Fischer2011-09-285-7/+7
|\ \ | |/
| * Import revised translations. DO NOT MERGE.Eric Fischer2011-09-285-7/+7
| | | | | | | | Change-Id: Ic1c1290adfac7dd0eabba74e8d290bcc8567d91e
* | Merge "Updated overflow menu icon Bug: 5388009" into ics-factoryromJustin Ho2011-09-286-0/+0
|\ \ | |/ |/|
| * Updated overflow menu iconJustin Ho2011-09-286-0/+0
| | | | | | | | | | | | Bug: 5388009 Change-Id: I667d6ecf0e897c073c669b2b88ffe06a71ca704d
* | Merge "Fix a bug in the account chooser where relaunching an in-progress ↵Fred Quintana2011-09-282-45/+56
|\ \ | | | | | | | | | flow results in a blank screen." into ics-factoryrom
| * | Fix a bug in the account chooser where relaunching an in-progress flowFred Quintana2011-09-272-45/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | results in a blank screen. The fix involves making the first activity just call the account type chooser to get the account type to add, rather than having the account type chooser also kick off the AccountManager.addAccount() request itself. Instead the first activity will get the type back and then call AccountManager.addAccount() Bug: 5346810 Change-Id: I4a0cf2370971b98f8ee0910f5401d97e999e546b
* | | Import revised translations. DO NOT MERGEEric Fischer2011-09-272-10/+10
| |/ |/| | | | | Change-Id: Ifb1966956dcc9fe4e082708bb3fb30d5224308e7
* | Merge "Fix 5326463: rework sim state handling in lockscreen" into ics-factoryromJim Miller2011-09-261-21/+7
|\ \
| * | Fix 5326463: rework sim state handling in lockscreenJim Miller2011-09-261-21/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously it was possible to get an inconsistent state because there were two paths that updated the lock screen sim state. This reworks the data flow to ensure the same path is always used to update the state. KeyguardUpdateMonitor now correctly updates the entire state of the callee whenever a new callback is registered. In addition, KeyguardUpdateMonitor now caches the phone state in order to avoid a round-trip binder call in updateEmergencyCallButtonState(). This avoids a condition that could make lockscreen unresponsive while updating the emergency call button state. KeyguardStatusViewManager also ensures the TransportControlView is hidden when created to ensure we don't inappropriately update the carrier line while waiting for the first callbacks to update the status lines. Change-Id: I6b3975b703a7d90bac8d0fe29fbc0f1d9c5e0e7d
* | | Merge "Bug 5332065: IOOB in case the suggestionSpan has been removed" into ↵Fabrice Di Meglio2011-09-261-1/+3
|\ \ \ | | | | | | | | | | | | ics-factoryrom
| * | | Bug 5332065: IOOB in case the suggestionSpan has been removedGilles Debunne2011-09-261-1/+3
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | I don't understand how the SuggSpan that has been tapped to display the popup can have disappeared when an item is clicked. This problem seems specific to monkey test with a race condition somewhere. Change-Id: I447b6563a1b959dc3c1ead31cde2d9bcad369765
* | | Import revised translations. DO NOT MERGEEric Fischer2011-09-266-34/+16
|/ / | | | | | | Change-Id: I3b5544d4e5739d08d1c3c6cc59dafe89de3b92c0
* | Merge "Mark MCC locale replacement strings not translatable." into ↵Eric Fischer2011-09-236-6/+6
|\ \ | | | | | | | | | ics-factoryrom
| * | Mark MCC locale replacement strings not translatable.Eric Fischer2011-09-236-6/+6
| | | | | | | | | | | | Change-Id: Icc7a7a3b8c6c7c606fbb5c00dcf9292d9dc3de1c
* | | Merge "Import revised translations. DO NOT MERGE" into ics-factoryromEric Fischer2011-09-23156-2467/+153
|\ \ \ | |/ /
| * | Import revised translations. DO NOT MERGEEric Fischer2011-09-23156-2467/+153
| | | | | | | | | | | | Change-Id: I1c2a959cd127faec64c01523fdec3baf43e8d7ab
* | | Merge "Fix watchdog to stop ping after wifi disconnects" into ics-factoryromIrfan Sheriff2011-09-231-3/+23
|\ \ \
| * | | Fix watchdog to stop ping after wifi disconnectsIrfan Sheriff2011-09-231-3/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - The pings are delayed async messages that were getting handled after a disconnect as well - Increase poll time to 200 ms, so we block on a receive for 1ms every 200ms for a sent packet Bug: 5361564 Change-Id: I1931a1c4146e78a87407d541d8c3934ff8232604
* | | | Merge "Don't crash during full backup when CheckJNI is enabled" into ↵Christopher Tate2011-09-231-4/+4
|\ \ \ \ | |_|/ / |/| | | | | | | ics-factoryrom
| * | | Don't crash during full backup when CheckJNI is enabledChristopher Tate2011-09-231-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | It's not okay to pass null to JNI methods and trust that it will just back off and return a null result cleanly. Fixes bug 5361822 . Change-Id: Id8a17b958fd183d55cb6475f394e158c13aae2ea
* | | | Merge "Update camera javadoc about AE and AWB lock." into ics-factoryromWei Huang2011-09-231-68/+23
|\ \ \ \
| * | | | Update camera javadoc about AE and AWB lock.Wu-cheng Li2011-09-221-68/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Autofocus does not lock AE and AWB. - stopPreview and takePicture do not clear AE and AWB locks. bug:5356404 Change-Id: I55d9b35f4ff746ecd2bff112c2674f1aa2543aca
* | | | | Clear callbacks in camera stopPreview.Chih-yu Huang2011-09-231-0/+6
| |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Clear those callbacks to remove the references so the memory can be recycled. bug:5358774 Change-Id: I3b6034a1891126b3437a6744013f38a64f5bb03b
* | | | Merge "Fix 5355659: Minor tweak to wave ping radius in MultiWaveView." into ↵Peter Ng2011-09-221-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | ics-factoryrom
| * | | | Fix 5355659: Minor tweak to wave ping radius in MultiWaveView.Jim Miller2011-09-221-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: Ib85c9d375e26897ce87b41addfaba503d9430f18
* | | | | Merge "CAB assets" into ics-factoryromJustin Ho2011-09-2224-0/+0
|\ \ \ \ \
| * | | | | CAB assetsJustin Ho2011-09-2224-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I40e979a57173220586aafa6cb76d7431c8bbd91f
* | | | | | Merge "Updated emergency icon on lockscreen" into ics-factoryromJustin Ho2011-09-223-0/+0
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Updated emergency icon on lockscreenJustin Ho2011-09-223-0/+0
| |/ / / / | | | | | | | | | | | | | | | Change-Id: Idd4dc679c45aedce627a5be0991879d83758650e
* | | | | Merge "Update PUK unlock screen." into ics-factoryromJohn Wang2011-09-221-27/+12
|\ \ \ \ \
| * | | | | Update PUK unlock screen.John Wang2011-09-221-27/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Make Pin and Puk focusable EditText. 2. Add hint text for pin and puk. 3. Update focusEntry logic. bug:5243771 Change-Id: I65bd52510bbbf0ebd7830ecac7e31159ae750c6c
* | | | | | Merge "Fixing emergency dialer flicker on lock screen (issue 5314293)" into ↵Adam Cohen2011-09-222-3/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | ics-factoryrom
| * | | | | | Fixing emergency dialer flicker on lock screen (issue 5314293)Adam Cohen2011-09-212-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia9bf4acb84923e200b89ee55fc53bc92877001cf
* | | | | | | Merge "Fix 5355659: Change chevron visuals, timing, and animated ↵Justin Ho2011-09-2213-2/+6
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | | | | | | | positioning" into ics-factoryrom
| * | | | | | Fix 5355659: Change chevron visuals, timing, and animated positioningJim Miller2011-09-2113-2/+6
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | Change-Id: I55e34496cc1eb4ace60b6d1ccbdb894035bca6e2
* | | | | | Merge "Revert "Allow views to setSystemUiVisibility() with the same value ↵Daniel Sandler2011-09-221-7/+5
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | and have it work."" into ics-factoryrom
| * | | | | Revert "Allow views to setSystemUiVisibility() with the same value and have ↵Daniel Sandler2011-09-211-7/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | it work." This reverts commit fad9555217ce3a657ffc7cba458a0d2622f7a379. Because it just didn't work. (The views kept aggressively re-applying their preferred flags every time view attributes were aggregated.) We'll pursue the original strategy, like lights out mode in HC: if you want to tickle this mode, un-set and re-set the flags (preferably synchronized with the global SystemUI visibility state as reported by onSystemUiVisibilityChanged callbacks). Bug: 5052456
* | | | | | Merge "Settings are restored in alphabetical order rather in order of ↵Svetoslav Ganov2011-09-211-1/+12
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | dependency." into ics-factoryrom
| * | | | | Settings are restored in alphabetical order rather in order of dependency.Svetoslav Ganov2011-09-211-1/+12
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Settings were restore in alphabetical order and capturing dependency among them required keys to be chosen in such a way that after sorting they apprear in dependency order. Now settings are exported and restored in the order they are declared in the arrays of settings to backup. Hence, the order in this array will capture the dependency order. bug:5343351 Change-Id: I93a40bcdd194943cd6f85aa18f1557d546e38274
* | | | | Merge "Make Bluetooth Health constant public." into ics-factoryromJaikumar Ganesh2011-09-211-1/+0
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Make Bluetooth Health constant public.Jaikumar Ganesh2011-09-211-1/+0
| | |/ / | |/| | | | | | | | | | Change-Id: I366f1231056fe978d85ee80c773d5911badb22e2
* | | | Merge "Unhide new PackageManager APIs for API 14" into ics-factoryromKenny Root2011-09-216-16/+42
|\ \ \ \ | |/ / / |/| | |