summaryrefslogtreecommitdiffstats
path: root/core/java
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | Merge "DO NOT MERGE - Revert fixes for ImageView/MeasureSpec/RelativeLayout" ...Adam Powell2012-10-013-31/+6
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | DO NOT MERGE - Revert fixes for ImageView/MeasureSpec/RelativeLayoutAdam Powell2012-10-013-31/+6
* | | | | | | Merge changes I790820b1,I3fcf3619,Ia0d5a156 into jb-mr1-devJeff Brown2012-10-011-0/+9
|\ \ \ \ \ \ \
| * | | | | | | Disable use of twilight mode for auto-brightness.Jeff Brown2012-10-011-0/+9
* | | | | | | | Merge "New internal API to eliminate poke locks." into jb-mr1-devJeff Brown2012-10-013-29/+40
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | / / / / / / | |/ / / / / / |/| | | | | |
| * | | | | | New internal API to eliminate poke locks.Jeff Brown2012-10-013-29/+40
| | |_|_|_|/ | |/| | | |
* | | | | | Merge "Fix bug #7259242 text is left justified with no padding" into jb-mr1-devFabrice Di Meglio2012-10-011-19/+42
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Fix bug #7259242 text is left justified with no paddingFabrice Di Meglio2012-10-011-19/+42
* | | | | | Merge "MediaRouter/Wifi Display improvements" into jb-mr1-devAdam Powell2012-10-011-3/+31
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | MediaRouter/Wifi Display improvementsAdam Powell2012-10-011-3/+31
* | | | | | Merge "Fix bug #7199562 UI mirroring for RTL locales (Arabic, Hebrew, Farsi):...Fabrice Di Meglio2012-10-011-1/+1
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Fix bug #7199562 UI mirroring for RTL locales (Arabic, Hebrew, Farsi): Play s...Fabrice Di Meglio2012-09-301-1/+1
| | |/ / / | |/| | |
* | | | | Merge "Move bluetooth priorities from Secure to Global." into jb-mr1-devJeff Sharkey2012-10-011-24/+34
|\ \ \ \ \
| * | | | | Move bluetooth priorities from Secure to Global.Jeff Sharkey2012-10-011-24/+34
| | |_|/ / | |/| | |
* | | | | Merge "Remove clearUserActivityTimeout()." into jb-mr1-devJeff Brown2012-10-011-1/+0
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Remove clearUserActivityTimeout().Jeff Brown2012-09-301-1/+0
| |/ / /
* | | | Merge "Construct a task stack for picking a wifi network from notification" i...Adam Powell2012-10-012-0/+39
|\ \ \ \ | |_|_|/ |/| | |
| * | | Construct a task stack for picking a wifi network from notificationAdam Powell2012-09-302-0/+39
* | | | Status bar: Keep disabled state per user.John Spurlock2012-10-011-0/+1
| |_|/ |/| |
* | | Merge "Fix texture corruption" into jb-mr1-devChet Haase2012-09-304-0/+24
|\ \ \
| * | | Fix texture corruptionChet Haase2012-09-304-0/+24
| | |/ | |/|
* | | Merge "Work on issue #6949468: android.dpi.cts.ConfigurationScreenLayoutTest....Dianne Hackborn2012-09-302-5/+81
|\ \ \ | |_|/ |/| |
| * | Work on issue #6949468: android.dpi.cts.ConfigurationScreenLayoutTest...Dianne Hackborn2012-09-302-5/+81
| |/
* | Merge "Fix UNSPECIFIED measurement in RelativeLayout" into jb-mr1-devAdam Powell2012-09-301-5/+17
|\ \ | |/ |/|
| * Fix UNSPECIFIED measurement in RelativeLayoutAdam Powell2012-09-301-5/+17
* | Merge "Update APIs to JB MR1 level 17." into jb-mr1-devDianne Hackborn2012-09-301-1/+7
|\ \
| * | Update APIs to JB MR1 level 17.Dianne Hackborn2012-09-301-1/+7
* | | Merge "Getting rid of keyguard widget flag that isn't used" into jb-mr1-devAdam Cohen2012-09-301-9/+2
|\ \ \
| * | | Getting rid of keyguard widget flag that isn't usedAdam Cohen2012-09-281-9/+2
* | | | Merge "Changing debug for b/7094175." into jb-mr1-devCraig Mautner2012-09-301-2/+0
|\ \ \ \
| * | | | Changing debug for b/7094175.Craig Mautner2012-09-291-2/+0
| | |_|/ | |/| |
* | | | Merge "Fix bug #7199562 UI mirroring for RTL locales (Arabic, Hebrew, Farsi):...Fabrice Di Meglio2012-09-302-5/+9
|\ \ \ \
| * | | | Fix bug #7199562 UI mirroring for RTL locales (Arabic, Hebrew, Farsi): Play s...Fabrice Di Meglio2012-09-302-5/+9
* | | | | Merge "Perform a long computation to catch bitmap sizes > 32 bits Bug #725793...Romain Guy2012-09-301-2/+2
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Perform a long computation to catch bitmap sizes > 32 bitsRomain Guy2012-09-301-2/+2
* | | | | Merge "Fix bug #6427629 Clean up layout direction APIs" into jb-mr1-devFabrice Di Meglio2012-09-304-31/+18
|\ \ \ \ \ | | |/ / / | |/| / / | |_|/ / |/| | |
| * | | Fix bug #6427629 Clean up layout direction APIsFabrice Di Meglio2012-09-284-31/+18
* | | | Merge "Get rid of preventScreenOn()." into jb-mr1-devJeff Brown2012-09-281-1/+0
|\ \ \ \
| * | | | Get rid of preventScreenOn().Jeff Brown2012-09-281-1/+0
* | | | | Merge "Fix issue #7255954: API Review: rename Dream to DreamService" into jb-...Dianne Hackborn2012-09-283-619/+640
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Fix issue #7255954: API Review: rename Dream to DreamServiceDianne Hackborn2012-09-283-619/+640
* | | | | Merge "Fix adjustViewBounds handling for ImageView" into jb-mr1-devAdam Powell2012-09-282-1/+14
|\ \ \ \ \
| * | | | | Fix adjustViewBounds handling for ImageViewAdam Powell2012-09-282-1/+14
* | | | | | Merge "Fix bug #7199562 UI mirroring for RTL locales (Arabic, Hebrew, Farsi):...Fabrice Di Meglio2012-09-281-1/+16
|\ \ \ \ \ \ | |_|/ / / / |/| | | / / | | |_|/ / | |/| | |
| * | | | Fix bug #7199562 UI mirroring for RTL locales (Arabic, Hebrew, Farsi): Play s...Fabrice Di Meglio2012-09-281-1/+16
| | |/ / | |/| |
* | | | Merge "Fix issue #7211769 and #7244492, thrash around on #7226656." into jb-m...Dianne Hackborn2012-09-286-2/+46
|\ \ \ \
| * | | | Fix issue #7211769 and #7244492, thrash around on #7226656.Dianne Hackborn2012-09-286-2/+46
* | | | | Merge "Use updatable file for premium-sms filter" into jb-mr1-devRobert Greenwalt2012-09-281-7/+0
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Use updatable file for premium-sms filterRobert Greenwalt2012-09-281-7/+0
* | | | | Merge "Track offset of center child view in Gallery for later layouts" into j...Adam Powell2012-09-281-1/+17
|\ \ \ \ \