summaryrefslogtreecommitdiffstats
path: root/api
Commit message (Expand)AuthorAgeFilesLines
* am 72d0a5aa: am ead7d90e: Merge "Fix issue #7408647: Add getUserCount() API" ...Dianne Hackborn2012-10-242-0/+2
|\
| * am ead7d90e: Merge "Fix issue #7408647: Add getUserCount() API" into jb-mr1-devDianne Hackborn2012-10-242-0/+2
| |\
| | * Fix issue #7408647: Add getUserCount() APIDianne Hackborn2012-10-242-0/+2
* | | am b43269ac: am 1202c436: Merge "Secure windows, secure surface views and sec...Jeff Brown2012-10-242-0/+4
|\ \ \ | |/ /
| * | am 1202c436: Merge "Secure windows, secure surface views and secure displays....Jeff Brown2012-10-242-0/+4
| |\ \ | | |/
| | * Secure windows, secure surface views and secure displays.Jeff Brown2012-10-232-0/+4
* | | am 9e96c69e: am 6757572b: Merge "Add throwing InvalidDisplayException from ad...Craig Mautner2012-10-232-2/+14
|\ \ \ | |/ /
| * | am 6757572b: Merge "Add throwing InvalidDisplayException from addView." into ...Craig Mautner2012-10-232-2/+14
| |\ \ | | |/
| | * Add throwing InvalidDisplayException from addView.Craig Mautner2012-10-232-2/+14
* | | am 744b4dca: am 09a5321c: Merge "Revert "Revert "This restores JB MR0 behavio...Dave Burke2012-10-181-2/+2
|\ \ \ | |/ /
| * | am 09a5321c: Merge "Revert "Revert "This restores JB MR0 behavior where the f...Dave Burke2012-10-181-2/+2
| |\ \ | | |/
| | * Merge "Revert "Revert "This restores JB MR0 behavior where the framework thro...Dave Burke2012-10-181-2/+2
| | |\
| | | * Revert "Revert "This restores JB MR0 behavior where the framework throws an e...Dave Burke2012-10-181-2/+2
* | | | am 8de328c9: am 45c77ca0: Merge "Fix missing @hide on ViewGroup.resolveLayout...Fabrice Di Meglio2012-10-181-1/+0
|\ \ \ \ | |/ / /
| * | | am 45c77ca0: Merge "Fix missing @hide on ViewGroup.resolveLayoutParams()" int...Fabrice Di Meglio2012-10-181-1/+0
| |\ \ \ | | |/ /
| | * | Fix missing @hide on ViewGroup.resolveLayoutParams()Fabrice Di Meglio2012-10-181-1/+0
* | | | am 193229a5: am 0437302f: Merge "Fix the build" into jb-mr1-devFabrice Di Meglio2012-10-181-0/+1
|\ \ \ \ | |/ / /
| * | | am 0437302f: Merge "Fix the build" into jb-mr1-devFabrice Di Meglio2012-10-181-0/+1
| |\ \ \ | | |/ /
| | * | Fix the buildFabrice Di Meglio2012-10-181-0/+1
* | | | am 76a01424: am 871a6d7d: Merge "Revert "This restores JB MR0 behavior where ...Justin Ho2012-10-171-2/+2
|\ \ \ \ | |/ / /
| * | | am 871a6d7d: Merge "Revert "This restores JB MR0 behavior where the framework...Justin Ho2012-10-171-2/+2
| |\ \ \
| | * \ \ Merge "Revert "This restores JB MR0 behavior where the framework throws an ex...Justin Ho2012-10-171-2/+2
| | |\ \ \
| | | * | | Revert "This restores JB MR0 behavior where the framework throws an exception...Justin Ho2012-10-171-2/+2
* | | | | | am c35f7650: am 4db31657: Merge "This restores JB MR0 behavior where the fram...Justin Ho2012-10-171-2/+2
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 4db31657: Merge "This restores JB MR0 behavior where the framework throws ...Justin Ho2012-10-171-2/+2
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "This restores JB MR0 behavior where the framework throws an exception ...Justin Ho2012-10-171-2/+2
| | |\ \ \ \ | | | |/ / / | | | | / / | | | |/ / | | |/| |
| | | * | This restores JB MR0 behavior where the framework throws an exception for imp...Justin Ho2012-10-171-2/+2
| | | |/
* | | | am d8989364: am e9a33c60: Merge "Fix bug #7363252 Popup and Dialog UI widgets...Fabrice Di Meglio2012-10-172-2/+0
|\ \ \ \ | |/ / /
| * | | am e9a33c60: Merge "Fix bug #7363252 Popup and Dialog UI widgets should be RT...Fabrice Di Meglio2012-10-172-2/+0
| |\ \ \ | | |/ /
| | * | Merge "Fix bug #7363252 Popup and Dialog UI widgets should be RTL aware" into...Fabrice Di Meglio2012-10-172-2/+0
| | |\ \
| | | * | Fix bug #7363252 Popup and Dialog UI widgets should be RTL awareFabrice Di Meglio2012-10-162-3/+1
* | | | | am 8598646e: am 144d4055: Merge "Revert "This restores JB MR0 behavior where ...Justin Ho2012-10-171-2/+2
|\ \ \ \ \ | |/ / / /
| * | | | am 144d4055: Merge "Revert "This restores JB MR0 behavior where the framework...Justin Ho2012-10-171-2/+2
| |\ \ \ \ | | |/ / /
| | * | | Merge "Revert "This restores JB MR0 behavior where the framework throws an ex...Justin Ho2012-10-171-2/+2
| | |\ \ \ | | | | |/ | | | |/|
| | | * | Revert "This restores JB MR0 behavior where the framework throws an exception...Justin Ho2012-10-171-2/+2
* | | | | am cccf85c2: am 8e614501: Merge "This restores JB MR0 behavior where the fram...Jim Miller2012-10-161-2/+2
|\ \ \ \ \ | |/ / / /
| * | | | am 8e614501: Merge "This restores JB MR0 behavior where the framework throws ...Jim Miller2012-10-161-2/+2
| |\ \ \ \ | | |/ / /
| | * | | Merge "This restores JB MR0 behavior where the framework throws an exception ...Jim Miller2012-10-161-2/+2
| | |\ \ \ | | | |/ /
| | | * | This restores JB MR0 behavior where the framework throws an exception for imp...Jim Miller2012-10-161-2/+2
* | | | | am fa71ba2c: am 1b85122b: Merge "Add API to enable mipmaps on Bitmap Bug #735...Romain Guy2012-10-161-0/+2
|\ \ \ \ \ | |/ / / /
| * | | | am 1b85122b: Merge "Add API to enable mipmaps on Bitmap Bug #7353771" into jb...Romain Guy2012-10-161-0/+2
| |\ \ \ \ | | |/ / /
| | * | | Add API to enable mipmaps on BitmapRomain Guy2012-10-161-0/+2
| | |/ /
* | | | am dcfe6cee: am 6868d6f3: Revert "Revert "Fix for bug 6050753.""Mathias Agopian2012-10-151-2/+2
|\ \ \ \ | |/ / /
| * | | am 6868d6f3: Revert "Revert "Fix for bug 6050753.""Mathias Agopian2012-10-151-2/+2
| |\ \ \ | | |/ /
| | * | Revert "Revert "Fix for bug 6050753.""Mathias Agopian2012-10-151-2/+2
| | |/
* | | am cb09dba0: am 69fbc3c0: Merge "Revert "Fix for bug 6050753."" into jb-mr1-devRomain Guy2012-10-151-2/+2
|\ \ \ | |/ /
| * | am 69fbc3c0: Merge "Revert "Fix for bug 6050753."" into jb-mr1-devRomain Guy2012-10-151-2/+2
| |\ \ | | |/
| | * Revert "Fix for bug 6050753."Romain Guy2012-10-151-2/+2
* | | am b65b5133: am f9307c5c: Merge "Fix bug #7334966 Padding is still broken in ...Fabrice Di Meglio2012-10-122-2/+0
|\ \ \ | |/ /
| * | am f9307c5c: Merge "Fix bug #7334966 Padding is still broken in RTL languages...Fabrice Di Meglio2012-10-122-2/+0
| |\ \ | | |/