drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
33,005 Commits 1 Branch 0 Tags
Commit Graph

33005 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam Powell
077c79cb43 am 03876c90: Fix text anchor fade-out positioning 
Merge commit '03876c905f3874f3ac8deb5a23ee0f77d4c04bab' into gingerbread-plus-aosp

* commit '03876c905f3874f3ac8deb5a23ee0f77d4c04bab':
  Fix text anchor fade-out positioning
 2010-10-02 17:49:07 -07:00
Adam Powell
03876c905f Fix text anchor fade-out positioning 
Change-Id: I5660481fb883c28c88e384be2f26e67aa854ec8e
 2010-10-02 17:44:47 -07:00
Adam Powell
ef29bb5bc9 am 0d843dc4: am ea32f94e: Fix bug 3058082 - text anchor positioning within moving dialogs 
Merge commit '0d843dc47929ff6e3dbaa4cc1d07de7fbdba8506'

* commit '0d843dc47929ff6e3dbaa4cc1d07de7fbdba8506':
  Fix bug 3058082 - text anchor positioning within moving dialogs
 2010-10-02 17:04:01 -07:00
Adam Powell
0d843dc479 am ea32f94e: Fix bug 3058082 - text anchor positioning within moving dialogs 
Merge commit 'ea32f94ec4c14fe21b536139762c5332d1b5484c' into gingerbread-plus-aosp

* commit 'ea32f94ec4c14fe21b536139762c5332d1b5484c':
  Fix bug 3058082 - text anchor positioning within moving dialogs
 2010-10-02 16:59:42 -07:00
Adam Powell
ea32f94ec4 Fix bug 3058082 - text anchor positioning within moving dialogs 
Change-Id: I8f0b515c73d2b3055b4072425418f837eb021d4f
 2010-10-02 16:51:36 -07:00
Adam Powell
1ff349020c am 53303da0: am 8bcbebd4: Fix bug 3024080 - Date picker month field uses numeric text field 
Merge commit '53303da0a78da2042ec60226ee290d2c903e6023'

* commit '53303da0a78da2042ec60226ee290d2c903e6023':
  Fix bug 3024080 - Date picker month field uses numeric text field
 2010-10-02 13:18:49 -07:00
Adam Powell
53303da0a7 am 8bcbebd4: Fix bug 3024080 - Date picker month field uses numeric text field 
Merge commit '8bcbebd4178b2e9aca9ee3bd9e1e12c42e74c8db' into gingerbread-plus-aosp

* commit '8bcbebd4178b2e9aca9ee3bd9e1e12c42e74c8db':
  Fix bug 3024080 - Date picker month field uses numeric text field
 2010-10-02 13:07:56 -07:00
Adam Powell
8bcbebd417 Fix bug 3024080 - Date picker month field uses numeric text field 
NumberPicker now uses text entry when displayed value strings are
provided.

Change-Id: I555a7d6b64ad6a5af131b3e1d8c638dcdb00d02c
 2010-10-02 12:52:28 -07:00
Hung-ying Tyan
aeba1bc0c3 Revert "Revert "resolved conflicts for merge of 8788d140 to master"" 
This reverts commit bdf11be97bd732e8891ae19342c937da6e659afa.
Fix a missing import from manual merge.

Change-Id: If373626f07250cbfe07e5c04cf02ad9ee5a0ab2a
 2010-10-03 01:18:34 +08:00
Jason Chen
bdf11be97b Revert "resolved conflicts for merge of 8788d140 to master" 
This reverts commit 2874c3dec4f9ffd59b2be3de62c1148534396828, reversing
changes made to 7afbb30d636351334d101fd0caef391fa409230d.
 2010-10-01 22:49:42 -07:00
Jeff Brown
a4d45cda69 am ea58d1ba: am e951ef07: Merge "Wait for initial device scan to finish before updating config." into gingerbread 
Merge commit 'ea58d1bac2960c1794f048bfa5d1a60b1a3d23a1'

* commit 'ea58d1bac2960c1794f048bfa5d1a60b1a3d23a1':
  Wait for initial device scan to finish before updating config.
 2010-10-01 21:49:39 -07:00
Jeff Brown
0f5f2e4c27 am e11b76d3: am f6295b35: Merge "Minor logging changes to input dispatcher to help with debugging." into gingerbread 
Merge commit 'e11b76d3efb056edea301d53a354d0730adf3520'

* commit 'e11b76d3efb056edea301d53a354d0730adf3520':
  Minor logging changes to input dispatcher to help with debugging.
 2010-10-01 21:49:29 -07:00
Hung-ying Tyan
2874c3dec4 resolved conflicts for merge of 8788d140 to master 
Change-Id: I7eaf2b7fe968e8d4cf6c5a2a4e66b8584c1dc78c
 2010-10-02 12:42:23 +08:00
Jason Chen
7afbb30d63 Fix the build 
Change-Id: Iedef9d315a304c73beb07e39d924dc65a7b73fc9
 2010-10-01 19:44:17 -07:00
Jeff Brown
ea58d1bac2 am e951ef07: Merge "Wait for initial device scan to finish before updating config." into gingerbread 
Merge commit 'e951ef07dd8cb36ec0e127e80f5d558b8a2d6125' into gingerbread-plus-aosp

* commit 'e951ef07dd8cb36ec0e127e80f5d558b8a2d6125':
  Wait for initial device scan to finish before updating config.
 2010-10-01 19:03:42 -07:00
Jeff Brown
e11b76d3ef am f6295b35: Merge "Minor logging changes to input dispatcher to help with debugging." into gingerbread 
Merge commit 'f6295b35db7a7c40d4fb1c981e231bebcf13e2ba' into gingerbread-plus-aosp

* commit 'f6295b35db7a7c40d4fb1c981e231bebcf13e2ba':
  Minor logging changes to input dispatcher to help with debugging.
 2010-10-01 19:01:14 -07:00
Jeff Brown
e951ef07dd Merge "Wait for initial device scan to finish before updating config." into gingerbread 2010-10-01 19:01:11 -07:00
Jeff Brown
f6295b35db Merge "Minor logging changes to input dispatcher to help with debugging." into gingerbread 2010-10-01 18:58:32 -07:00
Jeff Brown
7342bb9693 Wait for initial device scan to finish before updating config. 
This change narrows the opportunity for a race condition setting the
resource Configuration while devices are being updated.

Change-Id: I58efa563f4129ab0fce7108511d16a99dff7e451
 2010-10-01 18:55:43 -07:00
Jake Hamby
cc8c6496b7 resolved conflicts for merge of 3543a40b to master 
Change-Id: I307c8f1277b84763e537ced0ac3410ec06fce431
 2010-10-01 18:35:13 -07:00
Hung-ying Tyan
8788d14036 am 306137d9: SIP telephony cleanup. 
Merge commit '306137d97f40a4f807c54a75210343c9262360d1' into gingerbread-plus-aosp

* commit '306137d97f40a4f807c54a75210343c9262360d1':
  SIP telephony cleanup.
 2010-10-01 18:32:03 -07:00
Kenny Root
6cb241f902 ZipFileRO: moar logging and wrap close 
There is apparently still a race upon reading the entry Local File
Header that can't be tracked down, so move the LFH check inside the
mutex-protected block so we can call lseek again to see where we are
when we log an error.

Also, close() can fail so use TEMP_FAILURE_RETRY on it so we don't
unwittingly leak file descriptors when Mean Mr. EINTR comes a-knocking.

Change-Id: I753abad0bd882fe28f7281c406fa76f64393ef4c
 2010-10-01 18:30:59 -07:00
Jake Hamby
3543a40b24 am 7888486d: Merge "Add subaddress to SMS fingerprint calculation." 
Merge commit '7888486d1c930301535069bd90bb0bf3525b2bb5' into gingerbread-plus-aosp

* commit '7888486d1c930301535069bd90bb0bf3525b2bb5':
  Add subaddress to SMS fingerprint calculation.
 2010-10-01 18:13:58 -07:00
Jeff Brown
f2f4871830 Minor logging changes to input dispatcher to help with debugging. 
Added dumpsys reporting to EventHub.
Made the formatting a bit clearer.
Added 'Locked' suffix to some internal methods of EventHub.

Change-Id: Ic449560bcce378f6361895d27c66854e9724abb0
 2010-10-01 18:05:13 -07:00
Jake Hamby
7888486d1c Merge "Add subaddress to SMS fingerprint calculation." 2010-10-01 18:04:22 -07:00
Stephen Hines
42ca268c6a Merge "Support for 64-bit integer type." 2010-10-01 17:46:37 -07:00
James Dong
8f8fd3525b am 2bf74b8f: am 6c609b6a: Merge "Turn off media time adjustment by default" into gingerbread 
Merge commit '2bf74b8f0ad59b1379534e760a356adeb3673fd2'

* commit '2bf74b8f0ad59b1379534e760a356adeb3673fd2':
  Turn off media time adjustment by default
 2010-10-01 17:35:40 -07:00
James Dong
2bf74b8f0a am 6c609b6a: Merge "Turn off media time adjustment by default" into gingerbread 
Merge commit '6c609b6a60e533a93c6d0088222bd8da209b9953' into gingerbread-plus-aosp

* commit '6c609b6a60e533a93c6d0088222bd8da209b9953':
  Turn off media time adjustment by default
 2010-10-01 17:32:16 -07:00
Hung-ying Tyan
306137d97f SIP telephony cleanup. 
+ Remove unused classes.
+ Remove unused imports.
+ Remove unused code.
+ add DEBUG flag.

Change-Id: Ie1236d909d971093b68b066d3d8c1857ac89f56f
 2010-10-02 08:30:48 +08:00
James Dong
6c609b6a60 Merge "Turn off media time adjustment by default" into gingerbread 2010-10-01 17:27:51 -07:00
Adam Cohen
5ca9fa3270 Merge "Added looping parameter to AdapterViewAnimator / StackView" 2010-10-01 17:23:08 -07:00
Adam Cohen
1b065cd140 Added looping parameter to AdapterViewAnimator / StackView 
Change-Id: Iad36f7c0e657ffbae6dd17d0c9464ddf12de8b7b
 2010-10-01 17:18:43 -07:00
James Dong
9160e4aa2a Turn off media time adjustment by default 
Change-Id: I1f8021d605d0fd896e0639607a84e3f7c459612e
 2010-10-01 17:14:23 -07:00
Dianne Hackborn
4768a16cbc am 9e1556de: am 14e7d693: Merge "Some documentation fixes." into gingerbread 
Merge commit '9e1556de8382c3eb68d324a7ef559b2cde1b3d6c'

* commit '9e1556de8382c3eb68d324a7ef559b2cde1b3d6c':
  Some documentation fixes.
 2010-10-01 17:11:41 -07:00
Jeff Brown
efb8a3d6e0 am 57fa3e8b: am 9e32a438: Merge "Support haptic feedback for virtual keys defined in key layout." into gingerbread 
Merge commit '57fa3e8b4c94125ddb5be015dd7fbde4a458894f'

* commit '57fa3e8b4c94125ddb5be015dd7fbde4a458894f':
  Support haptic feedback for virtual keys defined in key layout.
 2010-10-01 17:08:34 -07:00
Chia-chi Yeh
82a1372070 am a4f1eb3d: am 9430f9d3: Merge "KeyStore: Update the parameters of generating master keys." into gingerbread 
Merge commit 'a4f1eb3d775533d9b28248022e0a5b4ec05fc2e4'

* commit 'a4f1eb3d775533d9b28248022e0a5b4ec05fc2e4':
  KeyStore: Update the parameters of generating master keys.
 2010-10-01 17:08:30 -07:00
Jake Hamby
3621be68a2 am edec27a1: am d531c9eb: Merge "Do not explicity disconnect Data during power down for 1x." 
Merge commit 'edec27a1e9ffc022e68f0d6200ba90499da4b9e9'

* commit 'edec27a1e9ffc022e68f0d6200ba90499da4b9e9':
  Do not explicity disconnect Data during power down for 1x.
 2010-10-01 17:07:58 -07:00
Scott Main
7091f66fc2 am de5e6afb: am 91b0bc2a: am 32441bbe: docs: device dashboard update for 10/1 
Merge commit 'de5e6afb01b630dfa279c6fc89ce6cab345315a6'

* commit 'de5e6afb01b630dfa279c6fc89ce6cab345315a6':
  docs: device dashboard update for 10/1
 2010-10-01 17:07:53 -07:00
Hung-ying Tyan
b6153a067c am 86a12d46: am 10e2120b: Merge "Add CallManager/Phone.setEchoSuppressionEnabled()." into gingerbread 
Merge commit '86a12d465fca7d25d99a788abda33fde5154a739'

* commit '86a12d465fca7d25d99a788abda33fde5154a739':
  Add CallManager/Phone.setEchoSuppressionEnabled().
 2010-10-01 17:07:48 -07:00
Adam Powell
86521295cb am bbf00cfb: (-s ours) am 98f31087: Merge "DO NOT MERGE Fix bug 3026771, other design/asset fixes." into gingerbread 
Merge commit 'bbf00cfbddb890bb35603bfca24e2e3bfab68ed4'

* commit 'bbf00cfbddb890bb35603bfca24e2e3bfab68ed4':
  DO NOT MERGE Fix bug 3026771, other design/asset fixes.
 2010-10-01 17:07:43 -07:00
Kenny Root
edeb7a5a39 am 7e40e67f: am d9e88d22: Merge "Add "none" for vold and deprecate mkobb -c" into gingerbread 
Merge commit '7e40e67f73e0e9fa61a9601d82e8a207ffdca039'

* commit '7e40e67f73e0e9fa61a9601d82e8a207ffdca039':
  Add "none" for vold and deprecate mkobb -c
 2010-10-01 17:07:21 -07:00
Dianne Hackborn
120e6be701 am 007d5b2c: am fd57416c: Fix build. 
Merge commit '007d5b2cf6af32dfe96c0c04988d090b872afb01'

* commit '007d5b2cf6af32dfe96c0c04988d090b872afb01':
  Fix build.
 2010-10-01 17:07:09 -07:00
Dianne Hackborn
9e1556de83 am 14e7d693: Merge "Some documentation fixes." into gingerbread 
Merge commit '14e7d693415832a974abc298124a6a5797d49a04' into gingerbread-plus-aosp

* commit '14e7d693415832a974abc298124a6a5797d49a04':
  Some documentation fixes.
 2010-10-01 17:02:18 -07:00
Dianne Hackborn
14e7d69341 Merge "Some documentation fixes." into gingerbread 2010-10-01 16:46:29 -07:00
Dianne Hackborn
4b85ce66ab Merge "resolved conflicts for merge of 4d28e8c5 to master" 2010-10-01 16:46:06 -07:00
Dianne Hackborn
27dec99148 resolved conflicts for merge of 4d28e8c5 to master 
Change-Id: I2449488a84e44b3fb5f820b50951b2b2bfa3bcbf
 2010-10-01 16:44:12 -07:00
Romain Guy
3eaf6e961b Merge "Apply bilinear filtering to text." 2010-10-01 16:37:52 -07:00
Romain Guy
7975fb6d12 Apply bilinear filtering to text. 
Change-Id: I2c81ad657ee2a11a2139e0b11ae3749db54c0749
 2010-10-01 16:36:14 -07:00
Chet Haase
ed03270fb0 Optimizing invalidation to avoid trashing the rendering cache 
Objects whose size or contents do not change can use the same rendering cache as before, so in these cases we do invalidation without causing the rendering cache to be recreated.

Change-Id: I840737097b73017ae9ccc9e2cc0bc3d71527e555
 2010-10-01 16:33:59 -07:00
Jeff Brown
57fa3e8b4c am 9e32a438: Merge "Support haptic feedback for virtual keys defined in key layout." into gingerbread 
Merge commit '9e32a438fd87180692da55197972ecddb1a731d9' into gingerbread-plus-aosp

* commit '9e32a438fd87180692da55197972ecddb1a731d9':
  Support haptic feedback for virtual keys defined in key layout.
 2010-10-01 16:16:23 -07:00