summaryrefslogtreecommitdiffstats
path: root/core/java
Commit message (Expand)AuthorAgeFilesLines
* Merge "Added resources and styles for ActionBar tabs"Adam Powell2010-09-081-4/+6
|\
| * Added resources and styles for ActionBar tabsAdam Powell2010-09-081-4/+6
* | am de5cfcb6: am d9c80ab3: Merge "Fix for a memory leak in TextKeyListener." i...Gilles Debunne2010-09-081-2/+4
|\ \
| * \ am d9c80ab3: Merge "Fix for a memory leak in TextKeyListener." into gingerbreadGilles Debunne2010-09-081-2/+4
| |\ \
| | * \ Merge "Fix for a memory leak in TextKeyListener." into gingerbreadGilles Debunne2010-09-081-2/+4
| | |\ \
| | | * | Fix for a memory leak in TextKeyListener.Gilles Debunne2010-09-081-2/+4
* | | | | Merge "Some cleanup of Proxy class."Robert Greenwalt2010-09-082-28/+23
|\ \ \ \ \
| * | | | | Some cleanup of Proxy class.Robert Greenwalt2010-09-032-28/+23
* | | | | | am 5fdacb8a: am ee455f5a: Merge "People holding partial wake locks now get bl...Dianne Hackborn2010-09-082-48/+224
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | am ee455f5a: Merge "People holding partial wake locks now get blamed for CPU ...Dianne Hackborn2010-09-082-48/+224
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Merge "People holding partial wake locks now get blamed for CPU usage." into ...Dianne Hackborn2010-09-082-48/+224
| | |\ \ \ \
| | | * | | | People holding partial wake locks now get blamed for CPU usage.Dianne Hackborn2010-09-082-48/+224
* | | | | | | am e7578344: am 5872e9d7: Merge "Allow incoming SMS until internal storage is...Jake Hamby2010-09-082-5/+38
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | / | |_|_|_|_|/ |/| | | | |
| * | | | | am 5872e9d7: Merge "Allow incoming SMS until internal storage is almost full....Jake Hamby2010-09-082-5/+38
| |\ \ \ \ \ | | |/ / / /
| | * | | | Allow incoming SMS until internal storage is almost full.Jake Hamby2010-09-082-5/+38
| | |/ / /
* | | | | resolved conflicts for merge of a05088c1 to masterJeff Brown2010-09-084-9/+129
|\ \ \ \ \ | |/ / / /
| * | | | am 85a31767: Add support for secure views.Jeff Brown2010-09-084-7/+127
| |\ \ \ \ | | |/ / /
| | * | | Add support for secure views.Jeff Brown2010-09-084-7/+127
| | | |/ | | |/|
* | | | am c4f628a1: am c0b4f6d3: Merge "Adds a time zone parameter to formatDateRang...Erik2010-09-081-8/+53
|\ \ \ \ | |/ / /
| * | | am c0b4f6d3: Merge "Adds a time zone parameter to formatDateRange" into ginge...Erik2010-09-081-8/+53
| |\ \ \ | | |/ /
| | * | Merge "Adds a time zone parameter to formatDateRange" into gingerbreadErik2010-09-081-8/+53
| | |\ \
| | | * | Adds a time zone parameter to formatDateRangeErik2010-09-081-8/+53
| * | | | am 468394fc: Text Selection: smart word detection. DO NOT MERGE.Gilles Debunne2010-09-081-11/+87
| |\ \ \ \ | | |/ / /
| | * | | Text Selection: smart word detection. DO NOT MERGE.Gilles Debunne2010-09-081-11/+87
| | |/ /
* | | | Merge changes Ib18b93bf,I4c86d7e3Mike Lockwood2010-09-081-9/+9
|\ \ \ \
| * | | | Rename the media database's "objects" table to "files"Mike Lockwood2010-09-081-9/+9
* | | | | Merge "Rename several animation classes"Chet Haase2010-09-0818-1441/+1431
|\ \ \ \ \
| * | | | | Rename several animation classesChet Haase2010-09-0818-1441/+1431
| |/ / / /
* | | | | Merge "Added "Memory observability" to javadoc."Makoto Onuki2010-09-081-0/+10
|\ \ \ \ \
| * | | | | Added "Memory observability" to javadoc.Makoto Onuki2010-09-081-0/+10
* | | | | | Made text selection work in ExtractEditText. Manual merge of Gingerbread 64947.Gilles Debunne2010-09-081-92/+109
| |/ / / / |/| | | |
* | | | | remove some useless code and add some code to aid in debuggingVasu Nori2010-09-073-21/+13
* | | | | am b1657b2b: resolved conflicts for merge of 64591009 to gingerbread-plus-aospBrad Fitzpatrick2010-09-071-39/+62
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | resolved conflicts for merge of 64591009 to gingerbread-plus-aospBrad Fitzpatrick2010-09-071-39/+62
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Merge "Fix a race between requesting/loading/writing SharedPreferences." into...Brad Fitzpatrick2010-09-071-41/+63
| | |\ \ \
| | | * | | Fix a race between requesting/loading/writing SharedPreferences.Brad Fitzpatrick2010-09-071-41/+63
* | | | | | Reworking the ActionBar tab APIAdam Powell2010-09-075-201/+176
* | | | | | am cf86bc1d: am 883bbb72: Merge "Hide mCursorController field in ArrowKeyMove...Gilles Debunne2010-09-071-2/+12
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 883bbb72: Merge "Hide mCursorController field in ArrowKeyMovementMethod." ...Gilles Debunne2010-09-071-2/+12
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "Hide mCursorController field in ArrowKeyMovementMethod." into gingerbreadGilles Debunne2010-09-071-2/+12
| | |\ \ \ \
| | | * | | | Hide mCursorController field in ArrowKeyMovementMethod.Gilles Debunne2010-09-071-2/+12
| * | | | | | am dbd25cdb: Made text selection work in ExtractEditText. DO NOT MERGEGilles Debunne2010-09-072-100/+117
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Made text selection work in ExtractEditText. DO NOT MERGEGilles Debunne2010-09-072-100/+117
| | |/ / / /
* | | | | | Merge "Correctly set the viewport on window resize."Romain Guy2010-09-071-2/+2
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Correctly set the viewport on window resize.Romain Guy2010-09-071-2/+2
* | | | | | am 3f6e4d56: am 1cc86da6: Merge "Don\'t fall through from TOKEN_EMAIL_LOOKUP"...Makoto Onuki2010-09-071-0/+3
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | am 1cc86da6: Merge "Don\'t fall through from TOKEN_EMAIL_LOOKUP" into gingerb...Makoto Onuki2010-09-071-0/+3
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Merge "Don't fall through from TOKEN_EMAIL_LOOKUP" into gingerbreadMakoto Onuki2010-09-071-0/+3
| | |\ \ \ \
| | | * | | | Don't fall through from TOKEN_EMAIL_LOOKUPMakoto Onuki2010-09-071-0/+3
* | | | | | | am 75f0024c: am 6e86915e: Merge "Fixes to battery stats debug output." into g...Dianne Hackborn2010-09-073-84/+158
|\ \ \ \ \ \ \ | |/ / / / / /