summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Use rand() for MinGWKenny Root2011-06-152-1/+16
| | | | | | | The version of MinGW we use doesn't have nrand48() which is really lame, but we need to use libutils in the Windows SDK. Change-Id: If854c03dbf02bc29e79f49e4539f08c2bf057517
* Merge "Correctly register native methods."Romain Guy2011-06-152-5/+7
|\
| * Correctly register native methods.Romain Guy2011-06-152-5/+7
| | | | | | | | Change-Id: Ic82a2b9c5dd7fb5dc23650c4d5aa208ef8563a31
* | Merge "Add opengl bench mark test: -- display icons with livewallpaper ↵Xia Wang2011-06-155-4/+342
|\ \ | | | | | | | | | background (galaxy)"
| * | Add opengl bench mark test:Xia Wang2011-06-155-4/+342
| | | | | | | | | | | | | | | | | | -- display icons with livewallpaper background (galaxy) Change-Id: I5b49bc732180069957abb47d206b5849c47469df
* | | Merge "Introduce LocalUtil and getLayoutDirectionFromLocale() now use ↵Fabrice Di Meglio2011-06-155-254/+319
|\ \ \ | | | | | | | | | | | | likelySubtags"
| * | | Introduce LocalUtil and getLayoutDirectionFromLocale() now use likelySubtagsFabrice Di Meglio2011-06-155-254/+319
| | | | | | | | | | | | | | | | | | | | | | | | | | | | - move code from Configuration to LocaleUtil - move unit tests Change-Id: Ic14b0131894a0c5618f00d4acb3edb0daadefe01
* | | | Merge "Fix to clear calling identity when binding a widget."Dianne Hackborn2011-06-151-34/+40
|\ \ \ \
| * | | | Fix to clear calling identity when binding a widget.Dianne Hackborn2011-06-151-34/+40
| | | | | | | | | | | | | | | | | | | | Change-Id: Id66abc50ec9ee69317b9838f302c4153995664f7
* | | | | Merge "Forgot to ammend the change"Romain Guy2011-06-151-1/+1
|\ \ \ \ \ | |_|_|/ / |/| | | / | | |_|/ | |/| |
| * | | Forgot to ammend the changeRomain Guy2011-06-151-1/+1
| | | | | | | | | | | | | | | | Change-Id: Ic6b0be487245a6bb926ab8b6b66b7c63ea1130c6
* | | | Merge "Invisible views should not be visible to accessibility services ↵Svetoslav Ganov2011-06-152-7/+11
|\ \ \ \ | | | | | | | | | | | | | | | (interrogation)"
| * | | | Invisible views should not be visible to accessibility services (interrogation)Svetoslav Ganov2011-06-152-7/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Infisible children of a ViewGroup are reported by View group while constructing an AccessibilityNodeInfo. 2. AncestorView does not check whether a found view is shown before returining it or perform action on it. bug:4672230 Change-Id: Ic620ea71b7755c598407bdd813a2beeee400c89c
* | | | | Merge "Fill in opengl benchmark test: - display a list view"Xia Wang2011-06-152-9/+51
|\ \ \ \ \
| * | | | | Fill in opengl benchmark test:Xia Wang2011-06-152-9/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - display a list view Change-Id: I72ac8e4c84ae497f2297ed3c803a62db2600ef08
* | | | | | Merge "VpnDialogs: use IConnectivityManager instead or ConnectivityManager."Chia-chi Yeh2011-06-152-6/+11
|\ \ \ \ \ \
| * | | | | | VpnDialogs: use IConnectivityManager instead or ConnectivityManager.Chia-chi Yeh2011-06-152-6/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8870a43ecbffa606d2e29f6c4b1b1a605b2b79e5
* | | | | | | Merge "Added profile string descriptions and limits."Dave Santoro2011-06-151-4/+4
|\ \ \ \ \ \ \
| * | | | | | | Added profile string descriptions and limits.Dave Santoro2011-06-151-4/+4
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 4584896 Change-Id: I0b73022a179a850c047a17ea03117f54931a748a
* | | | | | | Merge "Don't clean up operator properties in RuimRecords."John Wang2011-06-151-2/+5
|\ \ \ \ \ \ \
| * | | | | | | Don't clean up operator properties in RuimRecords.John Wang2011-06-151-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't clean up PROPERTY_ICC_OPERATOR_ISO_COUNTRY and PROPERTY_ICC_OPERATOR_NUMERIC here. Since not all CDMA devices have RUIM, these properties should keep the original values, e.g. build time settings, when there is no RUIM but set new values when RUIM is available and loaded. bug:4552029 Change-Id: I37c2cea32b582a00873b7f85b70abe30253e1241
* | | | | | | | Merge "Port recent apps from tablet to phone"Michael Jurka2011-06-1544-830/+421
|\ \ \ \ \ \ \ \
| * | | | | | | | Port recent apps from tablet to phoneMichael Jurka2011-06-1544-830/+421
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - wire up to long press on home - remove unused recents activity - remove duplicate recents resources in -large directories (using -sw600dp instead) - fix issue with zoom/scale translation when recents was brought up Change-Id: I45538ccaff49b46ac3659c4828f9e2b0cd075241
* | | | | | | | | Merge "Properly refcount SurfaceTexture in the JNI layer."Romain Guy2011-06-158-29/+29
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | / / | | |_|_|_|_|/ / | |/| | | | | |
| * | | | | | | Properly refcount SurfaceTexture in the JNI layer.Romain Guy2011-06-158-29/+29
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | Change-Id: I4b4c8020c13b8d6ce0d302fe42410033bf5785a6
* | | | | | | 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
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / / / / / / / | | | |/| | | | | | | | | | | | |