summaryrefslogtreecommitdiffstats
path: root/core/java/android/view
Commit message (Expand)AuthorAgeFilesLines
* am d3859994: am 951ce6c9: Merge "Revert change f449c0c381239dc0f78b0f01ecfb38...Svetoslav Ganov2013-04-261-1/+4
|\
| * am 951ce6c9: Merge "Revert change f449c0c381239dc0f78b0f01ecfb3889e056a597." ...Svetoslav Ganov2013-04-261-1/+4
| |\
| | * Merge "Revert change f449c0c381239dc0f78b0f01ecfb3889e056a597." into jb-mr2-devSvetoslav Ganov2013-04-261-1/+4
| | |\
| | | * Revert change f449c0c381239dc0f78b0f01ecfb3889e056a597.Alan Viverette2013-04-251-1/+4
* | | | am 57fc8122: am addc906f: Merge "Force clipping on layers that fail to be all...Chris Craik2013-04-251-1/+1
|\ \ \ \ | |/ / /
| * | | am addc906f: Merge "Force clipping on layers that fail to be allocated" into ...Chris Craik2013-04-251-1/+1
| |\ \ \ | | |/ /
| | * | Merge "Force clipping on layers that fail to be allocated" into jb-mr2-devChris Craik2013-04-261-1/+1
| | |\ \ | | | |/ | | |/|
| | | * Force clipping on layers that fail to be allocatedChris Craik2013-04-251-1/+1
* | | | am c6eeacd9: am c38bc5ab: Merge "Lockscreen widgets not always announced." in...Svetoslav2013-04-251-6/+3
|\ \ \ \ | |/ / /
| * | | am c38bc5ab: Merge "Lockscreen widgets not always announced." into jb-mr2-devSvetoslav2013-04-251-6/+3
| |\ \ \ | | |/ /
| | * | Merge "Lockscreen widgets not always announced." into jb-mr2-devSvetoslav2013-04-251-6/+3
| | |\ \
| | | * | Lockscreen widgets not always announced.Svetoslav2013-04-251-6/+3
* | | | | resolved conflicts for merge of f652551b to masterMichael Wright2013-04-253-8/+4
|\ \ \ \ \ | |/ / / /
| * | | | am b044c40c: Merge "Fixed javadoc in input related classes" into jb-mr2-devMichael Wright2013-04-254-9/+4
| |\ \ \ \ | | |/ / /
| | * | | Merge "Fixed javadoc in input related classes" into jb-mr2-devMichael Wright2013-04-254-9/+4
| | |\ \ \ | | | |/ / | | |/| |
| | | * | Fixed javadoc in input related classesMichael Wright2013-04-244-9/+4
| | | |/
* | | | am 6b4d0f21: am 42689769: Merge "Document behavior and usage of ViewGroup.bri...Chet Haase2013-04-242-3/+12
|\ \ \ \ | |/ / /
| * | | am 42689769: Merge "Document behavior and usage of ViewGroup.bringChildToFron...Chet Haase2013-04-242-3/+12
| |\ \ \ | | |/ /
| | * | Document behavior and usage of ViewGroup.bringChildToFront()Chet Haase2013-04-242-3/+12
| | |/
* | | am 939ff0ac: am 4c783066: Merge "Fixing bugs exposed when moving accessibilit...Svetoslav2013-04-231-0/+1
|\ \ \ | |/ /
| * | am 4c783066: Merge "Fixing bugs exposed when moving accessibility CTS tests t...Svetoslav2013-04-231-0/+1
| |\ \ | | |/
| | * Merge "Fixing bugs exposed when moving accessibility CTS tests to UiAutomatio...Svetoslav2013-04-241-0/+1
| | |\
| | | * Fixing bugs exposed when moving accessibility CTS tests to UiAutomation.Svetoslav2013-04-231-0/+1
* | | | am 393abb1c: am 5e650cef: Merge "Expand invalidation rectangle when clipChild...Chet Haase2013-04-231-0/+6
|\ \ \ \ | |/ / /
| * | | am 5e650cef: Merge "Expand invalidation rectangle when clipChildren == false"...Chet Haase2013-04-231-0/+6
| |\ \ \ | | |/ /
| | * | Merge "Expand invalidation rectangle when clipChildren == false" into jb-mr2-devChet Haase2013-04-231-0/+6
| | |\ \ | | | |/ | | |/|
| | | * Expand invalidation rectangle when clipChildren == falseChet Haase2013-04-221-0/+6
* | | | am 58500051: am 5fe6e4c4: Merge "Rewrite input handling for native applicatio...Michael Wright2013-04-233-27/+173
|\ \ \ \ | |/ / /
| * | | am 5fe6e4c4: Merge "Rewrite input handling for native applications" into jb-m...Michael Wright2013-04-233-27/+173
| |\ \ \ | | |/ /
| | * | Merge "Rewrite input handling for native applications" into jb-mr2-devMichael Wright2013-04-233-27/+173
| | |\ \
| | | * | Rewrite input handling for native applicationsMichael Wright2013-04-223-27/+173
* | | | | am 7bf02d12: am a61464d7: Merge "Making new node id APIs return strings." int...Svetoslav2013-04-231-5/+5
|\ \ \ \ \ | |/ / / /
| * | | | am a61464d7: Merge "Making new node id APIs return strings." into jb-mr2-devSvetoslav2013-04-231-5/+5
| |\ \ \ \ | | |/ / /
| | * | | Making new node id APIs return strings.Svetoslav2013-04-221-5/+5
| | | |/ | | |/|
* | | | am 076e1f4c: am abc2763e: Merge "KeyEvent: update comment"Michael Wright2013-04-201-2/+2
|\ \ \ \ | |/ / /
| * | | am abc2763e: Merge "KeyEvent: update comment"Michael Wright2013-04-201-2/+2
| |\ \ \ | | |/ / | |/| |
| | * | KeyEvent: update commentChirayu Desai2013-04-151-2/+2
* | | | am 371d4ccc: am 339ac854: Merge "Fix quickReject logic to account for setClip...Chet Haase2013-04-204-8/+8
|\ \ \ \ | |/ / /
| * | | Merge "Fix quickReject logic to account for setClipChildren() setting" into j...Chet Haase2013-04-204-8/+8
| |\ \ \ | | |_|/ | |/| |
| | * | Fix quickReject logic to account for setClipChildren() settingChet Haase2013-04-194-8/+8
* | | | am 0cf469f2: am c1876b25: Merge "Improve javadoc for rotationAnimation." into...Craig Mautner2013-04-191-4/+5
|\ \ \ \ | |/ / /
| * | | Merge "Improve javadoc for rotationAnimation." into jb-mr2-devCraig Mautner2013-04-191-4/+5
| |\ \ \
| | * | | Improve javadoc for rotationAnimation.Craig Mautner2013-04-191-4/+5
* | | | | am 1c6e609b: am 2623a24f: Merge "Fix bug #8654490 android:paddingStart doesn\...Fabrice Di Meglio2013-04-191-10/+16
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Fix bug #8654490 android:paddingStart doesn't override android:padding...Fabrice Di Meglio2013-04-191-10/+16
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Fix bug #8654490 android:paddingStart doesn't override android:paddingLeftFabrice Di Meglio2013-04-181-10/+16
* | | | | am 9454a9b3: am 4e0eb22f: Fix doc build.Ying Wang2013-04-181-3/+1
|\ \ \ \ \ | |/ / / /
| * | | | Fix doc build.Ying Wang2013-04-181-3/+1
| | |/ / | |/| |
* | | | Merge "First draft of Scenes & Transitions feature"Chet Haase2013-04-1817-0/+3455
|\ \ \ \
| * | | | First draft of Scenes & Transitions featureChet Haase2013-04-1817-0/+3455