summaryrefslogtreecommitdiffstats
path: root/core/res
Commit message (Expand)AuthorAgeFilesLines
* New fragment stuff: back stack, and layout integration.Dianne Hackborn2010-05-061-0/+33
* am 8b270a7a: am 579e08e6: am f7896449: merge from open-source masterThe Android Open Source Project2010-05-051-0/+2
|\
| * am f7896449: merge from open-source masterThe Android Open Source Project2010-05-051-0/+2
| |\
| | * merge from open-source masterThe Android Open Source Project2010-05-051-0/+2
| | |\
| | | * Add new keycodes for the convenience of Japanese IMEsmogimo2010-05-051-0/+2
* | | | Merge "Roll back the update to the WebKit UA string"Steve Block2010-05-051-1/+1
|\ \ \ \
| * | | | Roll back the update to the WebKit UA stringSteve Block2010-04-291-1/+1
* | | | | am 59bfdab3: am f24e66db: am 342a3800: am 70c6bb0d: Merge "Increase the row h...Daniel Sandler2010-05-042-2/+2
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | am 342a3800: am 70c6bb0d: Merge "Increase the row height of menus by 1dip." i...Daniel Sandler2010-05-042-2/+2
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | am 70c6bb0d: Merge "Increase the row height of menus by 1dip." into froyoDaniel Sandler2010-05-042-2/+2
| | |\ \ \
| | | * | | Increase the row height of menus by 1dip.Daniel Sandler2010-05-042-2/+2
* | | | | | Merge "Allow contact-sources to rename the term "All Contacts""Daniel Lehmann2010-05-032-0/+4
|\ \ \ \ \ \
| * | | | | | Allow contact-sources to rename the term "All Contacts"Daniel Lehmann2010-04-302-0/+4
* | | | | | | am b205daba: am d47cdbb7: am 3bb5e4d3: Merge "Tweak style of recent apps dial...Daniel Sandler2010-04-301-10/+16
|\ \ \ \ \ \ \ | |/ / / / / / |/| / / / / / | |/ / / / /
| * | | | | am d47cdbb7: am 3bb5e4d3: Merge "Tweak style of recent apps dialog title." in...Daniel Sandler2010-04-301-10/+16
| |\ \ \ \ \ | | |/ / / /
| | * | | | am 3bb5e4d3: Merge "Tweak style of recent apps dialog title." into froyoDaniel Sandler2010-04-301-10/+16
| | |\ \ \ \ | | | |/ / /
| | | * | | Merge "Tweak style of recent apps dialog title." into froyoDaniel Sandler2010-04-301-10/+16
| | | |\ \ \
| | | | * | | Tweak style of recent apps dialog title.Daniel Sandler2010-04-301-10/+16
* | | | | | | am fefe7a22: Merge "Fix build." into krakenDianne Hackborn2010-04-291-0/+1
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Fix build.Dianne Hackborn2010-04-291-0/+1
* | | | | | | am 82b027e9: am 48399e38: am 77a1beb1: Merge "Import revised translations" in...Kenny Root2010-04-2920-199/+103
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 48399e38: am 77a1beb1: Merge "Import revised translations" into froyoKenny Root2010-04-2920-199/+103
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | am 77a1beb1: Merge "Import revised translations" into froyoKenny Root2010-04-2920-199/+103
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Import revised translationsKenny Root2010-04-2920-199/+103
| | | |/ / /
* | | | | | Merge "Merge webkit.org at r55033 : Update the WebKit UA string and LayoutTes...Steve Block2010-04-291-1/+1
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Merge webkit.org at r55033 : Update the WebKit UA string and LayoutTest ignor...Steve Block2010-04-271-1/+1
* | | | | | am 14cee9f6: New xlarge screen size.Dianne Hackborn2010-04-281-0/+2
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | New xlarge screen size.Dianne Hackborn2010-04-281-0/+2
* | | | | | am 5d84df0c: am 9fe55514: am 4bba2149: Merge "Import revised translations" in...Kenny Root2010-04-2820-99/+135
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 9fe55514: am 4bba2149: Merge "Import revised translations" into froyoKenny Root2010-04-2820-99/+135
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | am 4bba2149: Merge "Import revised translations" into froyoKenny Root2010-04-2820-99/+135
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | | * | | Import revised translationsKenny Root2010-04-2720-99/+135
* | | | | | Merge "New drawables for the pending update to the maps API."Steve Howard2010-04-272-0/+0
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | New drawables for the pending update to the maps API.Steve Howard2010-04-212-0/+0
* | | | | | Merge "Update sym_action_call icon to match icon used elsewhere"Tim Park2010-04-261-0/+0
|\ \ \ \ \ \
| * | | | | | Update sym_action_call icon to match icon used elsewhereTim Park2010-04-231-0/+0
* | | | | | | New assets for http://b/issue?id=2506670Leon Clarke2010-04-266-0/+0
* | | | | | | resolved conflicts for merge of 81cd2e90 to masterAdam Powell2010-04-232-17/+46
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | / / / / | | |/ / / / | |/| | | |
| * | | | | Logo attribute for manifest and PackageManager methods to fetch itAdam Powell2010-04-232-0/+29
* | | | | | am a8624186: am 46fba3b9: am 52e70b25: Add title to recent apps dialog.Joe Onorato2010-04-212-2/+14
|\ \ \ \ \ \ | |/ / / / / | | / / / / | |/ / / / |/| | | |
| * | | | am 46fba3b9: am 52e70b25: Add title to recent apps dialog.Joe Onorato2010-04-212-2/+14
| |\ \ \ \ | | |/ / /
| | * | | am 52e70b25: Add title to recent apps dialog.Joe Onorato2010-04-212-2/+14
| | |\ \ \ | | | |/ /
| | | * | Add title to recent apps dialog.Joe Onorato2010-04-212-2/+14
* | | | | manual mergeandroid-build SharedAccount2010-04-1521-122/+238
|\ \ \ \ \ | |/ / / /
| * | | | Introduce new API version to avoid breakage with the Froyo APIs;Dianne Hackborn2010-04-151-0/+16
| * | | | am 2349dc5d: am fa22de79: Merge "Import revised translations" into froyoKenny Root2010-04-1520-122/+222
| |\ \ \ \ | | |/ / /
| | * | | am fa22de79: Merge "Import revised translations" into froyoKenny Root2010-04-1520-122/+222
| | |\ \ \ | | | |/ /
| | | * | Import revised translationsKenny Root2010-04-1420-122/+222
| * | | | Merge "Missing resources for lock screen." into krakenDaniel Sandler2010-04-142-20/+24
| |\ \ \ \
| | * | | | Missing resources for lock screen.Daniel Sandler2010-04-142-20/+24