summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Handle dropped motion events in Pattern Unlock due to high system activityJim Miller2011-06-171-152/+169
| | | | | | | This enables the pattern unlock screen to look at historical motion events to make unlocking easier during high system load. Change-Id: I74a9c2d0833e8bb6745b89e8d397116baebb24a1
* Merge "Fix changed native method delegates in layoutlib for ICS."Xavier Ducrohet2011-06-153-6/+66
|\
| * Fix changed native method delegates in layoutlib for ICS.Xavier Ducrohet2011-06-153-6/+66
| | | | | | | | Change-Id: I49306868cd8a41b6b7d919c3e8b108d5c014530e
* | AccessibilityNodeInfo not properly returning checked statusSvetoslav Ganov2011-06-151-0/+7
| | | | | | | | | | | | | | | | 1. CompundButton was not setting its checked state in the info. bug:4674048 Change-Id: Ic711d4ee9b2214e9bdf86546df406b497aaa90b5
* | Reconcile with gingerbread-releaseThe Android Open Source Project2011-06-150-0/+0
|\ \ | | | | | | | | | Change-Id: I500f9a10cdfb891919b1e5618a42330ba00fcfb6
| * \ merge in gingerbread-release history after reset to gingerbreadThe Android Automerger2011-06-100-0/+0
| |\ \
| | * \ merge in gingerbread-release history after reset to gingerbreadThe Android Automerger2011-06-090-0/+0
| | |\ \
| | | * \ merge in gingerbread-release history after reset to gingerbreadThe Android Automerger2011-06-060-0/+0
| | | |\ \
| | | | * \ merge in gingerbread-release history after reset to gingerbreadThe Android Automerger2011-05-250-0/+0
| | | | |\ \
* | | | | \ \ am 40fc6e0d: am c407ef22: am f4096041: Merge "Updated art for compat mode ↵Justin Ho2011-06-1516-27/+40
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dialog." into honeycomb-mr2 * commit '40fc6e0de578198c9cc5d9a493cb7db77bc938b8': Updated art for compat mode dialog.
| * \ \ \ \ \ \ am c407ef22: am f4096041: Merge "Updated art for compat mode dialog." into ↵Justin Ho2011-06-1516-27/+40
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | honeycomb-mr2 * commit 'c407ef22222f8f7e6f82abd081ecb65149336f99': Updated art for compat mode dialog.
| | * \ \ \ \ \ \ am f4096041: Merge "Updated art for compat mode dialog." into honeycomb-mr2Justin Ho2011-06-1516-27/+40
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f409604122f959653fb789e9133e94a51e369693': Updated art for compat mode dialog.
| | | * \ \ \ \ \ \ Merge "Updated art for compat mode dialog." into honeycomb-mr2Justin Ho2011-06-1516-27/+40
| | | |\ \ \ \ \ \ \
| | | | * | | | | | | Updated art for compat mode dialog.Daniel Sandler2011-06-1516-27/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also finalizes on the following language & ordering in the menu: ( ) Stretch to fill screen ( ) Zoom to fill screen Bug: 4595256 Change-Id: Ie92b1e0d829341fd73043a562e78437af2b128ec
* | | | | | | | | | | am ec18268e: am 1146bddf: Merge "Always clear settings when entering ↵Wink Saville2011-06-151-3/+1
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Inactive state." into honeycomb-LTE * commit 'ec18268eb42641cd2a6ae9c8b26e35d67bb41021': Always clear settings when entering Inactive state.
| * | | | | | | | | | am 1146bddf: Merge "Always clear settings when entering Inactive state." ↵Wink Saville2011-06-151-3/+1
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into honeycomb-LTE * commit '1146bddf92fc91dad384bdaea740f9472bebd911': Always clear settings when entering Inactive state.
| | * | | | | | | | | Merge "Always clear settings when entering Inactive state." into honeycomb-LTEWink Saville2011-06-151-3/+1
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Always clear settings when entering Inactive state.Wink Saville2011-06-151-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I500b60a8122b790d60dbff5960b8c32500704b40
* | | | | | | | | | | | am edfdef92: Merge 5137711109783dcbb20143d3e5cab2fa931218ddJean-Baptiste Queru2011-06-150-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'edfdef926e4ddd123c9112e97605ff8d97ba9fad': fix RefBase so it retains binary-compatibility with gingerbread (DO NOT MERGE)
| * | | | | | | | | | | Merge 5137711109783dcbb20143d3e5cab2fa931218ddJean-Baptiste Queru2011-06-150-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I5046a54648bdeea6f9661c46329d7b502f2f52b9
| | * \ \ \ \ \ \ \ \ \ \ am afffa8fa: fix RefBase so it retains binary-compatibility with gingerbread ↵Mathias Agopian2011-06-154-20/+43
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (DO NOT MERGE) * commit 'afffa8fa9f82a7343e1158bf921931fd3e3df615': fix RefBase so it retains binary-compatibility with gingerbread (DO NOT MERGE)
| | | * | | | | | | | | | | fix RefBase so it retains binary-compatibility with gingerbread (DO NOT MERGE)Mathias Agopian2011-06-134-20/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 4595257 Change-Id: I4773cf4fe59b2509db0ed733739eb6961d473b25
* | | | | | | | | | | | | | am 11954872: am 5af3405f: am ecda5461: Merge "Fix lease duration handling" ↵Irfan Sheriff2011-06-151-7/+18
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into honeycomb-mr2 * commit '1195487228e1eb6c8859368286168051bd505b2f': Fix lease duration handling
| * | | | | | | | | | | | | am 5af3405f: am ecda5461: Merge "Fix lease duration handling" into honeycomb-mr2Irfan Sheriff2011-06-151-7/+18
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '5af3405f0d24c853bd10eb239c081e31972d3e1d': Fix lease duration handling
| | * | | | | | | | | | | | am ecda5461: Merge "Fix lease duration handling" into honeycomb-mr2Irfan Sheriff2011-06-151-7/+18
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ecda5461603b6de77beb045dfdf82dad7ae48d61': Fix lease duration handling
| | | * | | | | | | | | | | Merge "Fix lease duration handling" into honeycomb-mr2Irfan Sheriff2011-06-151-7/+18
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / / / / | | | |/| | | | | | | | | |
| | | | * | | | | | | | | | Fix lease duration handlingIrfan Sheriff2011-06-151-7/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Convert lease time in seconds to long before alarm set up and add sanity check Change-Id: I99524c97d9a643ffa8234d016d0e819a284977a1
* | | | | | | | | | | | | | am aff9ec70: am 4d6233b2: Merge "Clean up some debug statements." into ↵Wink Saville2011-06-152-6/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | honeycomb-LTE * commit 'aff9ec70e22abb64149e335ae2eb519c6027eb4a': Clean up some debug statements.
| * | | | | | | | | | | | | am 4d6233b2: Merge "Clean up some debug statements." into honeycomb-LTEWink Saville2011-06-152-6/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '4d6233b2edd24c83efe10f4403456b8d0c87241a': Clean up some debug statements.
| | * | | | | | | | | | | | Merge "Clean up some debug statements." into honeycomb-LTEWink Saville2011-06-152-6/+8
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | Clean up some debug statements.Wink Saville2011-06-152-6/+8
| | | | |_|_|_|/ / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id60020f09dd858f2d2c83bdd8f8d4384e5bfc934
* | | | | | | | | | | | | | am 27f889d0: am 3dc1b5e2: am ed31bbf6: Clean up some edge cases in the ↵Dianne Hackborn2011-06-152-9/+29
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | compat mode UI: * commit '27f889d07ced48fbc7fa61c41a4a32ec3e1a95f3': Clean up some edge cases in the compat mode UI:
| * | | | | | | | | | | | | am 3dc1b5e2: am ed31bbf6: Clean up some edge cases in the compat mode UI:Dianne Hackborn2011-06-152-9/+29
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '3dc1b5e26fac2c6a6161d617f99fd901ee2ffc9e': Clean up some edge cases in the compat mode UI:
| | * | | | | | | | | | | | am ed31bbf6: Clean up some edge cases in the compat mode UI:Dianne Hackborn2011-06-152-9/+29
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | | |/| / / / / / / / / / / | | | |/ / / / / / / / / / | | | | | | | | | | | | | * commit 'ed31bbf65267c1f383dd0dff37acd034f3b9b59f': Clean up some edge cases in the compat mode UI:
| | | * | | | | | | | | | Clean up some edge cases in the compat mode UI:Dianne Hackborn2011-06-152-9/+29
| | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Don't put up multiple dialogs if a switch happens between activities that both can use compat mode. - Remove the help dialog if the user switches away from an app that can use compat mode. - Don't set the "don't show" preference until the user explicitly hits the button. - Hide the compat mode switch UI if the compat mode button is hidden. Change-Id: I8dd2aab1385a264232a9256284d4a75b8e058e47
* | | | | | | | | | | | am 9c3c3004: am d8f9a83c: resolved conflicts for merge of d027329c to ↵Marco Nelissen2011-06-154-0/+59
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gingerbread-plus-aosp * commit '9c3c3004c4206da3f2579e863ce89a2f99269dd6': Ignore duplicate WAP push PDU source/destination port if configured
| * | | | | | | | | | | am d8f9a83c: resolved conflicts for merge of d027329c to gingerbread-plus-aospMarco Nelissen2011-06-154-0/+59
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd8f9a83cab34de38981dc3ba5ca9df8dda02dbc0': Ignore duplicate WAP push PDU source/destination port if configured
| | * | | | | | | | | | resolved conflicts for merge of d027329c to gingerbread-plus-aospMarco Nelissen2011-06-154-0/+59
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | Change-Id: I169c415bf998b9935ab36812511573db05717b91
| | | * | | | | | | | | Ignore duplicate WAP push PDU source/destination port if configuredSoojung Shin2011-06-104-1/+69
| | | | |_|/ / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some carriers duplicate the OMADM wap push PDU source/destination port. e.g. MSGTYPE-TotalSegments-CurrentSegment -SourcePortDestPort-SourcePortDestPort-OMADM PDU So the client has to ignore the duplicate source/destination port. Change-Id: I83df6e8e7d2e2e4275036a1b574247f9f40c5cf4 Signed-off-by: Soojung Shin <sj46.shin@samsung.com>
* | | | | | | | | | | Merge "Added vcard query parameter for not attaching photo."Martijn Coenen2011-06-151-0/+9
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | |
| * | | | | | | | | | Added vcard query parameter for not attaching photo.Martijn Coenen2011-06-151-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia4968ba54d00c368240f50fa43bcc647ccf2c199
* | | | | | | | | | | Merge "VPN: change some strings in VPN notifications."Chia-chi Yeh2011-06-152-21/+10
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | VPN: change some strings in VPN notifications.Chia-chi Yeh2011-06-152-21/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also remove a small piece of dead code. Change-Id: Idd10f3d72a92228951278bf360d08ba9bede02d2
* | | | | | | | | | | | Merge "Fix NetworkPolicy tests after notifications."Jeff Sharkey2011-06-151-6/+20
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Fix NetworkPolicy tests after notifications.Jeff Sharkey2011-06-151-6/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I569e9ceba6d89459b347ed151fd9bda2909dc892
* | | | | | | | | | | | Merge "Modified Voicemail.SOURCE_DATA value to match with the constant name."Debashish Chatterjee2011-06-151-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Modified Voicemail.SOURCE_DATA value to match with the constant name.Debashish Chatterjee2011-06-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3a83b553ace640a91cd07e89785d52d5b7cd86ca
* | | | | | | | | | | | | Merge "Include template in data warning/limit intents."Jeff Sharkey2011-06-152-11/+38
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | Include template in data warning/limit intents.Jeff Sharkey2011-06-152-11/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When launching warning/limit UI, include the template that triggered the notification. Also move actions and extra into contract class. Change-Id: Id2e63fd2d2e36a137a3fd8f889c7256038ca5f2e
* | | | | | | | | | | | | Merge "Fix Gravity start/end"Fabrice Di Meglio2011-06-154-40/+40
|\ \ \ \ \ \ \ \ \ \ \ \ \
generated by cgit v1.1 at 2025-02-15 09:17:46 +0000