Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
32,869 Commits 3 Branches 0 Tags
a143e83e1e179ee587540150989cdfd220923f96
Commit Graph

32869 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam Powell
a143e83e1e am 7de900f3: am d29e6861: Merge "Fix bug 3058324" into gingerbread 
Merge commit '7de900f3629e53e1a05b8d5854cf0164446346ae'

* commit '7de900f3629e53e1a05b8d5854cf0164446346ae':
  Fix bug 3058324
 2010-10-04 14:28:08 -07:00
Romain Guy
e14e8e31fa Merge "Snap the clip rectangle to pixel boundaries." 2010-10-04 14:21:10 -07:00
Romain Guy
3b3e457c27 Snap the clip rectangle to pixel boundaries. 
Change-Id: Iac2765303552f385995fe46e219af456e0501da7
 2010-10-04 14:18:24 -07:00
Gilles Debunne
08ed700fa8 Merge "resolved conflicts for merge of 115b9dc3 to master" 2010-10-04 14:17:51 -07:00
Romain Guy
a1cf4a78d1 Merge "Apply bilinear filtering on text only when necessary." 2010-10-04 14:16:24 -07:00
Romain Guy
e8cb9c1430 Apply bilinear filtering on text only when necessary. 
Change-Id: Ic903f4b5d30e9c92528c6291941896efe4729ee3
 2010-10-04 14:14:11 -07:00
Gilles Debunne
152c7c4091 resolved conflicts for merge of 115b9dc3 to master 
Change-Id: I37ee3a50fcafbaa7de510b3af8e133a89bd9e339
 2010-10-04 14:02:50 -07:00
Romain Guy
2a2a38db16 Merge "Apply all Canvas transformations to ColorDrawable." 2010-10-04 13:48:12 -07:00
Romain Guy
95930e13fa Apply all Canvas transformations to ColorDrawable. 
Change-Id: I29252c58224b236d0770ec005da9842990ef2c06
 2010-10-04 13:46:02 -07:00
Raphael
3cff14ca77 Merge "layoutlib_create: Generate delegate to implement native methods." 2010-10-04 12:46:37 -07:00
Joe Onorato
b4152eda1d Merge "work around race condition which causes us to try to load the phone status bar on the tablet." 2010-10-04 12:28:45 -07:00
Joe Onorato
dc565f4b3a work around race condition which causes us to try to load the phone 
status bar on the tablet.

Change-Id: Id5ad1192b4667622957fd0c48870ea22a480e0b5
 2010-10-04 15:27:22 -04:00
Adam Powell
7de900f362 am d29e6861: Merge "Fix bug 3058324" into gingerbread 
Merge commit 'd29e6861717a4e762050eb5a30169729e205d651' into gingerbread-plus-aosp

* commit 'd29e6861717a4e762050eb5a30169729e205d651':
  Fix bug 3058324
 2010-10-04 12:18:44 -07:00
Adam Powell
d29e686171 Merge "Fix bug 3058324" into gingerbread 2010-10-04 12:15:34 -07:00
Gilles Debunne
115b9dc397 am 4d3baaf5: Merge "Bug fixes in Text selection." into gingerbread 
Merge commit '4d3baaf5308ddee43c1cd742497a38806cec6320' into gingerbread-plus-aosp

* commit '4d3baaf5308ddee43c1cd742497a38806cec6320':
  Bug fixes in Text selection.
 2010-10-04 12:10:21 -07:00
Gilles Debunne
4d3baaf530 Merge "Bug fixes in Text selection." into gingerbread 2010-10-04 12:06:10 -07:00
Dianne Hackborn
1869ad04c9 am 4e183215: am 1073e3fa: Merge "Don\'t write settings multiple times when unmounting." into gingerbread 
Merge commit '4e183215bac239bbc039df361fed034a965030ec'

* commit '4e183215bac239bbc039df361fed034a965030ec':
  Don't write settings multiple times when unmounting.
 2010-10-04 12:05:00 -07:00
Dianne Hackborn
4e183215ba am 1073e3fa: Merge "Don\'t write settings multiple times when unmounting." into gingerbread 
Merge commit '1073e3fa72a59af15ff4243b65a789ddb61bcded' into gingerbread-plus-aosp

* commit '1073e3fa72a59af15ff4243b65a789ddb61bcded':
  Don't write settings multiple times when unmounting.
 2010-10-04 12:01:08 -07:00
Dianne Hackborn
1073e3fa72 Merge "Don't write settings multiple times when unmounting." into gingerbread 2010-10-04 11:58:09 -07:00
Chia-chi Yeh
e1ccf7c953 am fbd5a59d: am 4fc04f16: Merge "RTP: Add a baseline echo suppressor." into gingerbread 
Merge commit 'fbd5a59da9a455bc1c54a80bd5b3afeb426a8e3d'

* commit 'fbd5a59da9a455bc1c54a80bd5b3afeb426a8e3d':
  RTP: Add a baseline echo suppressor.
 2010-10-04 11:57:33 -07:00
Adam Powell
c3808b5dc7 Fix bug 3058324 
PopupWindow now responds to the style attribute popupAnimationStyle
instead of windowAnimationStyle. The latter was being overridden with
undesired values. Animation.PopupWindow style added as a special
default sentinel value, which switches animation styles based on
whether the window is showing above or below an anchor.

Change-Id: Id7cc81f089b6053f2d3a495b1046002548ecf125
 2010-10-04 11:55:38 -07:00
Chia-chi Yeh
fbd5a59da9 am 4fc04f16: Merge "RTP: Add a baseline echo suppressor." into gingerbread 
Merge commit '4fc04f160f5ad99ce618084c689b239a2644deca' into gingerbread-plus-aosp

* commit '4fc04f160f5ad99ce618084c689b239a2644deca':
  RTP: Add a baseline echo suppressor.
 2010-10-04 11:53:56 -07:00
Andreas Huber
3d29e8c846 am dfd03fe9: am aa1a694d: Merge "Make sure to finish the preparation phase even EOS occurs before we consider the cache to be completely filled up." into gingerbread 
Merge commit 'dfd03fe99336792b6dae6c4c9fd5f5ba157e054c'

* commit 'dfd03fe99336792b6dae6c4c9fd5f5ba157e054c':
  Make sure to finish the preparation phase even EOS occurs before we consider the cache to be completely filled up.
 2010-10-04 11:51:55 -07:00
Chia-chi Yeh
4fc04f160f Merge "RTP: Add a baseline echo suppressor." into gingerbread 2010-10-04 11:51:45 -07:00
Andreas Huber
dfd03fe993 am aa1a694d: Merge "Make sure to finish the preparation phase even EOS occurs before we consider the cache to be completely filled up." into gingerbread 
Merge commit 'aa1a694dc78e5201fc83fe3d710a6e43eb62831a' into gingerbread-plus-aosp

* commit 'aa1a694dc78e5201fc83fe3d710a6e43eb62831a':
  Make sure to finish the preparation phase even EOS occurs before we consider the cache to be completely filled up.
 2010-10-04 11:47:52 -07:00
Chia-chi Yeh
a8a10096a1 RTP: Add a baseline echo suppressor. 
Change-Id: I832f1f572f141fd928afe671b12d0b59f2a8e0b1
 2010-10-05 02:47:00 +08:00
Andreas Huber
aa1a694dc7 Merge "Make sure to finish the preparation phase even EOS occurs before we consider the cache to be completely filled up." into gingerbread 2010-10-04 11:45:56 -07:00
Andreas Huber
05f6787b88 Make sure to finish the preparation phase even EOS occurs before we consider the cache to be completely filled up. 
Change-Id: I29143e357fb6ea7b860636100e010f2ea7436798
related-to-bug: 3037389
 2010-10-04 11:36:39 -07:00
Andreas Huber
d84d9f4064 am bb506dab: am 7fa69374: Merge "Don\'t retrieve metadata unless necessary for ogg-vorbis ringtone auto-looping." into gingerbread 
Merge commit 'bb506dab1ff10e6939fcd0457571e0b46793dd80'

* commit 'bb506dab1ff10e6939fcd0457571e0b46793dd80':
  Don't retrieve metadata unless necessary for ogg-vorbis ringtone auto-looping.
 2010-10-04 11:26:16 -07:00
Andreas Huber
bb506dab1f am 7fa69374: Merge "Don\'t retrieve metadata unless necessary for ogg-vorbis ringtone auto-looping." into gingerbread 
Merge commit '7fa693740756123fa9d05e62fb47aae5d703c71d' into gingerbread-plus-aosp

* commit '7fa693740756123fa9d05e62fb47aae5d703c71d':
  Don't retrieve metadata unless necessary for ogg-vorbis ringtone auto-looping.
 2010-10-04 11:22:22 -07:00
Gilles Debunne
baaace59f6 Bug fixes in Text selection. 
"Select word" is displayed only when the text field is not empty.

Paste is always displayed in first menu.
Bug #3001438

Cut/copy works
Bug #3052005 fixed in 3047653

Change-Id: I573f04818683f9b1c78ecb4613570b738d30ba09
 2010-10-04 11:21:54 -07:00
Dirk Dougherty
934f042a53 am 44fad94a: am 30f57295: am ba944ccd: Doc change: update screens support table and remove outdated density/size metrics. 
Merge commit '44fad94aff4165334584cdf8cafcd0885616a44f'

* commit '44fad94aff4165334584cdf8cafcd0885616a44f':
  Doc change: update screens support table and remove outdated density/size metrics.
 2010-10-04 11:20:36 -07:00
Andreas Huber
7fa6937407 Merge "Don't retrieve metadata unless necessary for ogg-vorbis ringtone auto-looping." into gingerbread 2010-10-04 11:20:21 -07:00
Dirk Dougherty
44fad94aff am 30f57295: am ba944ccd: Doc change: update screens support table and remove outdated density/size metrics. 
Merge commit '30f572956ef92e8636772be7bd5d0150cf7fd1fc' into gingerbread-plus-aosp

* commit '30f572956ef92e8636772be7bd5d0150cf7fd1fc':
  Doc change: update screens support table and remove outdated density/size metrics.
 2010-10-04 11:16:12 -07:00
Dirk Dougherty
30f572956e am ba944ccd: Doc change: update screens support table and remove outdated density/size metrics. 
Merge commit 'ba944ccda3d61ccbe6061277fcc50c96fe2643f1' into gingerbread

* commit 'ba944ccda3d61ccbe6061277fcc50c96fe2643f1':
  Doc change: update screens support table and remove outdated density/size metrics.
 2010-10-04 11:12:07 -07:00
Andreas Huber
1913c1aeab Don't retrieve metadata unless necessary for ogg-vorbis ringtone auto-looping. 
Change-Id: Iaf5880bb3376f9cbf22aefe198878eaf6f3f08c7
related-to-bug: 3037389
 2010-10-04 11:09:31 -07:00
Mindy Pereira
94e461309b am 53fb09b4: (-s ours) am 106950f2: Merge "DO NOT MERGE. Fix logic for switching between overscroll and scroll modes." into gingerbread 
Merge commit '53fb09b42f8862650f959c30c1ab104142fa873a'

* commit '53fb09b42f8862650f959c30c1ab104142fa873a':
  DO NOT MERGE. Fix logic for switching between overscroll and scroll modes.
 2010-10-04 10:20:47 -07:00
Mindy Pereira
53fb09b42f am 106950f2: Merge "DO NOT MERGE. Fix logic for switching between overscroll and scroll modes." into gingerbread 
Merge commit '106950f20bd352ed72ddf4490b2e19d305e36a74' into gingerbread-plus-aosp

* commit '106950f20bd352ed72ddf4490b2e19d305e36a74':
  DO NOT MERGE. Fix logic for switching between overscroll and scroll modes.
 2010-10-04 10:13:32 -07:00
Mindy Pereira
106950f20b Merge "DO NOT MERGE. Fix logic for switching between overscroll and scroll modes." into gingerbread 2010-10-04 10:10:06 -07:00
Dirk Dougherty
ba944ccda3 Doc change: update screens support table and remove outdated density/size metrics. 
Change-Id: I05895b09e2198379a078c12489a2098f84865f58
 2010-10-04 09:48:48 -07:00
Daisuke Miyakawa
c0ed31d7a9 am 07fb33ef: (-s ours) am d8f1a540: Merge "Refrain warning when not appropriate. Do not merge" into gingerbread 
Merge commit '07fb33efe8b0cbedf518a8afa20d96d8d4bab69a'

* commit '07fb33efe8b0cbedf518a8afa20d96d8d4bab69a':
  Refrain warning when not appropriate. Do not merge
 2010-10-04 08:40:18 -07:00
Daisuke Miyakawa
07fb33efe8 am d8f1a540: Merge "Refrain warning when not appropriate. Do not merge" into gingerbread 
Merge commit 'd8f1a540162e16d88cae9a1e8ec58cba68adf6e2' into gingerbread-plus-aosp

* commit 'd8f1a540162e16d88cae9a1e8ec58cba68adf6e2':
  Refrain warning when not appropriate. Do not merge
 2010-10-04 08:36:27 -07:00
Daisuke Miyakawa
d8f1a54016 Merge "Refrain warning when not appropriate. Do not merge" into gingerbread 2010-10-04 08:31:56 -07:00
Daisuke Miyakawa
8eef13b472 Refrain warning when not appropriate. Do not merge 
Change-Id: I0066a3d0a2204cfc4beacb69aafccb35b9326bbb
 2010-10-04 07:59:34 -07:00
Kenny Root
6d95c0d941 am ac754073: am b58b2714: Merge "ZipFileRO: moar logging and wrap close" into gingerbread 
Merge commit 'ac7540733cafcca5bdb1842e1ebcb396ba064583'

* commit 'ac7540733cafcca5bdb1842e1ebcb396ba064583':
  ZipFileRO: moar logging and wrap close
 2010-10-04 07:54:06 -07:00
Kenny Root
ac7540733c am b58b2714: Merge "ZipFileRO: moar logging and wrap close" into gingerbread 
Merge commit 'b58b27142a936aa76897a7040c08b8a0989a685b' into gingerbread-plus-aosp

* commit 'b58b27142a936aa76897a7040c08b8a0989a685b':
  ZipFileRO: moar logging and wrap close
 2010-10-04 07:41:11 -07:00
Kenny Root
b58b27142a Merge "ZipFileRO: moar logging and wrap close" into gingerbread 2010-10-04 07:28:20 -07:00
Hung-ying Tyan
51d2adab83 am 1f34ffd7: am 5cab38ba: Merge "SIP: minor fixes." into gingerbread 
Merge commit '1f34ffd7e36de5d1a12d4a3901c3ac4e4e56cb99'

* commit '1f34ffd7e36de5d1a12d4a3901c3ac4e4e56cb99':
  SIP: minor fixes.
 2010-10-03 22:49:09 -07:00
Hung-ying Tyan
1f34ffd7e3 am 5cab38ba: Merge "SIP: minor fixes." into gingerbread 
Merge commit '5cab38ba11d976c54f28f4bdbced78040cba1cbb' into gingerbread-plus-aosp

* commit '5cab38ba11d976c54f28f4bdbced78040cba1cbb':
  SIP: minor fixes.
 2010-10-03 22:45:49 -07:00
Hung-ying Tyan
5cab38ba11 Merge "SIP: minor fixes." into gingerbread 2010-10-03 22:43:28 -07:00