summaryrefslogtreecommitdiffstats
path: root/core/java
Commit message (Expand)AuthorAgeFilesLines
* New KeyChain API for application access to keystore credentialsBrian Carlstrom2011-06-101-6/+0
* Merge "API to set additional subtypes"satok2011-06-103-2/+49
|\
| * API to set additional subtypessatok2011-06-103-2/+49
* | Action buttons now use themable style.Adam Powell2011-06-091-3/+5
* | Merge "Refine the behavior of split action bars."Adam Powell2011-06-094-25/+48
|\ \
| * | Refine the behavior of split action bars.Adam Powell2011-06-094-25/+48
* | | am 8297f669: am 3aabdeac: am 5ba2e872: Merge "Fix for not reporting correct "...Dianne Hackborn2011-06-091-6/+10
|\ \ \
| * \ \ am 3aabdeac: am 5ba2e872: Merge "Fix for not reporting correct "sw" in compat...Dianne Hackborn2011-06-081-6/+10
| |\ \ \
| | * \ \ am 5ba2e872: Merge "Fix for not reporting correct "sw" in compat mode." into ...Dianne Hackborn2011-06-081-6/+10
| | |\ \ \
| | | * \ \ Merge "Fix for not reporting correct "sw" in compat mode." into honeycomb-mr2Dianne Hackborn2011-06-081-6/+10
| | | |\ \ \
| | | | * | | Fix for not reporting correct "sw" in compat mode.Dianne Hackborn2011-06-081-6/+10
* | | | | | | resolved conflicts for merge of 9dfd7d0a to masterDianne Hackborn2011-06-091-0/+32
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 2d618e41: am e22fe933: Fix issue #4582417: Need to add new PackageManager...Dianne Hackborn2011-06-081-0/+32
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | am e22fe933: Fix issue #4582417: Need to add new PackageManager...Dianne Hackborn2011-06-081-0/+32
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Fix issue #4582417: Need to add new PackageManager...Dianne Hackborn2011-06-081-0/+32
| | | |/ / /
* | | | | | am 4d042048: am 08a8f3f9: Merge "Set emergency call text visibility." into ho...John Wang2011-06-091-0/+13
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 08a8f3f9: Merge "Set emergency call text visibility." into honeycomb-LTEJohn Wang2011-06-081-0/+13
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "Set emergency call text visibility." into honeycomb-LTEJohn Wang2011-06-081-0/+13
| | |\ \ \ \
| | | * | | | Set emergency call text visibility.John Wang2011-06-081-0/+13
* | | | | | | Merge "resolved conflicts for merge of e2aa0490 to master"Dianne Hackborn2011-06-0912-93/+306
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ resolved conflicts for merge of e2aa0490 to masterDianne Hackborn2011-06-0912-93/+306
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | / / | | |_|_|_|/ / | |/| | | | |
| | * | | | | am a1396dfe: am 02140891: Merge "Work on issue #4518815: Compatibility mode i...Dianne Hackborn2011-06-0813-90/+306
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | am 02140891: Merge "Work on issue #4518815: Compatibility mode introduces com...Dianne Hackborn2011-06-0813-90/+306
| | | |\ \ \ \ | | | | |/ / / | | | |/| / / | | | | |/ /
| | | | * | Work on issue #4518815: Compatibility mode introduces compatibility regressio...Dianne Hackborn2011-06-0813-90/+306
* | | | | | Merge "Add a way to measure potential framerate of the view hierarchy."Romain Guy2011-06-092-8/+58
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Add a way to measure potential framerate of the view hierarchy.Romain Guy2011-06-092-8/+58
* | | | | | Merge "Text selection on phone"Gilles Debunne2011-06-091-8/+24
|\ \ \ \ \ \
| * | | | | | Text selection on phoneGilles Debunne2011-06-091-8/+24
* | | | | | | Merge "Consider default zoom scale for mobile viewport."Shimeng (Simon) Wang2011-06-091-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Consider default zoom scale for mobile viewport.Shimeng (Simon) Wang2011-06-091-1/+1
* | | | | | | | Merge "Add return value spec and fix typo."Daisuke Miyakawa2011-06-091-2/+6
|\ \ \ \ \ \ \ \
| * | | | | | | | Add return value spec and fix typo.Daisuke Miyakawa2011-06-091-2/+6
* | | | | | | | | Merge "Use public constants"Andy McFadden2011-06-091-3/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Use public constantsAndy McFadden2011-06-091-3/+3
* | | | | | | | | | Merge "Add Configuration.getLayoutDirectionFromLocale()"Fabrice Di Meglio2011-06-091-0/+53
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | |
| * | | | | | | | | Add Configuration.getLayoutDirectionFromLocale()Fabrice Di Meglio2011-06-091-0/+53
* | | | | | | | | | Merge "Fix height measure state."Shimeng (Simon) Wang2011-06-091-1/+0
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix height measure state.Shimeng (Simon) Wang2011-06-091-1/+0
* | | | | | | | | | | Invalid access to AccessibilityInteractionControllerSvetoslav Ganov2011-06-091-30/+31
* | | | | | | | | | | Merge "Better handle double tap for smooth reflow and zoom."Shimeng (Simon) Wang2011-06-092-2/+11
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Better handle double tap for smooth reflow and zoom.Shimeng (Simon) Wang2011-06-092-2/+11
| |/ / / / / / / / / /
* | | | | | | | | | | Merge "Move CalendarUtils into Calendar app"Andy McFadden2011-06-091-348/+0
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Move CalendarUtils into Calendar appAndy McFadden2011-06-091-348/+0
| | |_|/ / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge "Implement android.webkit.BrowserFrame.requestClientCert"Brian Carlstrom2011-06-096-23/+254
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Implement android.webkit.BrowserFrame.requestClientCertBrian Carlstrom2011-06-096-23/+254
* | | | | | | | | | | | Merge "API modifications to handle profiles in Contacts."Dave Santoro2011-06-091-3/+108
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | API modifications to handle profiles in Contacts.Dave Santoro2011-06-091-3/+108
| | |_|_|_|_|/ / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge "Bug 4588114 - Make GestureDetector behave nicer with parallel multi-to...Adam Powell2011-06-091-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Bug 4588114 - Make GestureDetector behave nicer with parallel multi-touch det...Adam Powell2011-06-091-0/+2
| |/ / / / / / / / / / /
* | | | | | | | | | | | am 4e1504a6: am 7ed8ff18: am 68b81434: Merge "Fix bug 4533120 - rough handlin...Adam Powell2011-06-091-0/+9
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / |/| | | | | | | / / / / | | |_|_|_|_|_|/ / / / | |/| | | | | | | | |