summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | am 9139868b: am ba6c98db: am 82943ecf: am d40c93f6: Merge "Add dependency gen...Xavier Ducrohet2011-07-197-18/+110
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | am ba6c98db: am 82943ecf: am d40c93f6: Merge "Add dependency generation to Aa...Xavier Ducrohet2011-07-197-18/+110
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ am 82943ecf: am d40c93f6: Merge "Add dependency generation to Aapt for R.java"Xavier Ducrohet2011-07-198-19/+111
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ am d40c93f6: Merge "Add dependency generation to Aapt for R.java"Xavier Ducrohet2011-07-198-19/+111
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ Merge "Add dependency generation to Aapt for R.java"Xavier Ducrohet2011-07-198-19/+111
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | Add dependency generation to Aapt for R.javaJosiah Gaskin2011-06-278-19/+111
* | | | | | | | | | | | | | | | | | am bf31250b: am d5431ed5: am 2e659ae5: am 42755155: Merge "Copy once-created ...Xavier Ducrohet2011-07-193-1/+26
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | am d5431ed5: am 2e659ae5: am 42755155: Merge "Copy once-created R.java into l...Xavier Ducrohet2011-07-193-1/+26
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | am 2e659ae5: am 42755155: Merge "Copy once-created R.java into library projects"Xavier Ducrohet2011-07-193-1/+26
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / /
| | | * | | | | | | | | | | | | | | am 42755155: Merge "Copy once-created R.java into library projects"Xavier Ducrohet2011-07-193-1/+26
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / /
| | | | * | | | | | | | | | | | | | Merge "Copy once-created R.java into library projects"Xavier Ducrohet2011-07-193-1/+26
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / /
| | | | | * | | | | | | | | | | | | Copy once-created R.java into library projectsJosiah Gaskin2011-06-273-1/+26
* | | | | | | | | | | | | | | | | | Merge "Test Gallery layout direction."Fabrice Di Meglio2011-07-1917-51/+334
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Test Gallery layout direction.Doug Felt2011-07-1817-50/+333
* | | | | | | | | | | | | | | | | | Merge "Gather View's hierarchy notifications into methods that can easily be ...Philip Milne2011-07-192-66/+27
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Gather View's hierarchy notifications into methods that can easily be overidden.Philip Milne2011-07-192-66/+27
* | | | | | | | | | | | | | | | | | | Merge "Fix a threading issue in AudioPlaybackHandler"Narayan Kamath2011-07-191-14/+22
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Fix a threading issue in AudioPlaybackHandlerNarayan Kamath2011-07-191-14/+22
* | | | | | | | | | | | | | | | | | | | Merge "Return the play stayed locked."Narayan Kamath2011-07-191-1/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Return the play stayed locked.Narayan Kamath2011-07-191-1/+3
* | | | | | | | | | | | | | | | | | | | Merge "Don't recreate view's display list when size hasn't changed"Chet Haase2011-07-191-8/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Don't recreate view's display list when size hasn't changedChet Haase2011-07-181-8/+8
| | |_|_|_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge "Hide "Configure input method" button when the screen is locked."satok2011-07-181-1/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Hide "Configure input method" button when the screen is locked.satok2011-07-191-1/+6
* | | | | | | | | | | | | | | | | | | | Merge "Enable IMEs to set additional subtypes in background"satok2011-07-185-18/+28
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | Enable IMEs to set additional subtypes in backgroundsatok2011-07-195-18/+28
| |/ / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | Merge "Fix drag and drop regression. Bug: 5032496"Jeff Brown2011-07-182-44/+36
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | Fix drag and drop regression.Jeff Brown2011-07-182-44/+36
* | | | | | | | | | | | | | | | | | | | | Merge "Remove an unnecessary finalizer."Jeff Brown2011-07-181-6/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | Remove an unnecessary finalizer.Jeff Brown2011-07-181-6/+0
* | | | | | | | | | | | | | | | | | | | | Merge "Revert "Add in i18n TLDs and new TLDs to the URL RegEx matcher.""Bart Sears2011-07-182-13/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | Revert "Add in i18n TLDs and new TLDs to the URL RegEx matcher."Bart Sears2011-07-182-13/+6
* | | | | | | | | | | | | | | | | | | | | | Merge "Fix bug 5031652 - offer a way to associate metadata with an ActionMode"Adam Powell2011-07-182-0/+32
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | Fix bug 5031652 - offer a way to associate metadata with an ActionModeAdam Powell2011-07-182-0/+32
* | | | | | | | | | | | | | | | | | | | | | | Merge "Manually bring change Ie8fb8162 to master ("Add images to ERI icon lis...Todor Kalaydjiev2011-07-181-2/+158
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | Manually bring change Ie8fb8162 to master ("Add images to ERI icon list"). Fi...Todor Kalaydjiev2011-07-181-2/+158
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | am 6e8c7dd2: am cd4636ec: Add LteOnCdmaDevice system property.Wink Saville2011-07-182-11/+26
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | am cd4636ec: Add LteOnCdmaDevice system property.Wink Saville2011-07-182-13/+27
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | Add LteOnCdmaDevice system property.Wink Saville2011-07-182-13/+27
* | | | | | | | | | | | | | | | | | | | | | | Merge "Add in i18n TLDs and new TLDs to the URL RegEx matcher."Shimeng (Simon) Wang2011-07-182-6/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | / / | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Add in i18n TLDs and new TLDs to the URL RegEx matcher.Shimeng (Simon) Wang2011-07-182-6/+13
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | Merge "Update TextureView.lockCanvas() test."Romain Guy2011-07-181-15/+58
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | Update TextureView.lockCanvas() test.Romain Guy2011-07-181-15/+58
| | |_|_|_|/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | Fix bug #5037425 Canvas.drawText can't handle Right-to-Left text and text com...Fabrice Di Meglio2011-07-185-73/+61
* | | | | | | | | | | | | | | | | | | | | Merge "Add unit tests for bug #5037425 Canvas.drawText can't handle Right-to-...Fabrice Di Meglio2011-07-187-4/+183
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | Add unit tests for bug #5037425 Canvas.drawText can't handle Right-to-Left te...Fabrice Di Meglio2011-07-187-4/+183
* | | | | | | | | | | | | | | | | | | | | | SearchView behavioral and visual changesAmith Yamasani2011-07-189-78/+163
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | Merge "Add C code to use BDADDR_ANY macro properly. The macro expands into c...Doug Kwan2011-07-185-2/+76
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Add C code to use BDADDR_ANY macro properly. The macro expands into codeDoug Kwan2011-07-165-2/+76
* | | | | | | | | | | | | | | | | | | | | am e5143d6c: am a4aef41a: am a74774fd: am 4d8f6a38: Merge "stagefright aacenc...Conley Owens2011-07-181-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / / / / / / |/| | | | / / / / / / / / / / / / / / / / | | |_|_|/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |