Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
64,389 Commits 3 Branches 0 Tags
7dffeeefbb805b8a8dc589f06805297d8f7dc175
Commit Graph

19728 Commits

Author SHA1 Message Date
Nick Pelly
7dffeeefbb am 043a8b14: Merge "Replace vendor specific NfcGoogle.apk with generic Nfc.apk" into ics-mr1 
* commit '043a8b149dc31d3e3242ccf0cadc580702c99552':
  Replace vendor specific NfcGoogle.apk with generic Nfc.apk
 2011-11-21 16:05:33 -08:00
Nick Pelly
043a8b149d Merge "Replace vendor specific NfcGoogle.apk with generic Nfc.apk" into ics-mr1 2011-11-21 16:03:40 -08:00
Nick Pelly
a5cb9f4217 Replace vendor specific NfcGoogle.apk with generic Nfc.apk 
The access control changes allow us to just use Nfc.apk with
the regular platform certificate, instead of the custom signed
NfcGoogle.apk. So we can compeltely get rid of vendor/google/apps/NfcGoogle
and just build it out of packages/apps/Nfc now.

The package name is also reverted from com.android.nfc3 to com.android.nfc

The NFC uid needs to get bumped (25 to 27) to allow the cert change.

Bug: 5608249
Change-Id: I09a81a896ff3cceb5a8de331d3399921b870932a
 2011-11-21 14:55:29 -08:00
John Reck
ced6262e93 am 0507ac4d: Use isHighEndGfx to determine texture pool 
* commit '0507ac4d94fc0ecb775391a7e80c921614f88a58':
  Use isHighEndGfx to determine texture pool
 2011-11-21 14:14:11 -08:00
John Reck
0507ac4d94 Use isHighEndGfx to determine texture pool 
Bug: 5639612

Change-Id: I0ccbf74c2638b61b7eb0769c851e74700f0aa191
 2011-11-21 13:30:32 -08:00
Kristian Monsen
98dbf35ff3 am 7859c184: Merge "Improving PictureListener deprecating comments" into ics-mr1 
* commit '7859c1842c1f2e3c43415dfb5337a0b005bdb1c4':
  Improving PictureListener deprecating comments
 2011-11-20 07:28:35 -08:00
Kristian Monsen
7859c1842c Merge "Improving PictureListener deprecating comments" into ics-mr1 2011-11-20 07:26:59 -08:00
Daniel Sandler
75d8eb2a81 am 9b5d7a59: Merge "Dreams (now Screen Candy) development." into ics-mr1 
* commit '9b5d7a59f336a96e73f5f485f6e366e078a70497':
  Dreams (now Screen Candy) development.
 2011-11-19 20:44:36 -08:00
Daniel Sandler
9b5d7a59f3 Merge "Dreams (now Screen Candy) development." into ics-mr1 2011-11-19 20:42:19 -08:00
Svetoslav Ganov
44e3a8a4ac am d8a3cabc: Merge "Text selection AccessibilityEvents are missing text." into ics-mr1 
* commit 'd8a3cabcb11c02c54b76590e0f60c32b43b9f2fc':
  Text selection AccessibilityEvents are missing text.
 2011-11-18 14:41:09 -08:00
Svetoslav Ganov
d8a3cabcb1 Merge "Text selection AccessibilityEvents are missing text." into ics-mr1 2011-11-18 14:39:05 -08:00
Wei Huang
2361032a4d am c2fff5ea: Merge "Unlock camera AWB lock only when white-balance is changed." into ics-mr1 
* commit 'c2fff5ea39027d017dc15ce285961afa17a7b4a7':
  Unlock camera AWB lock only when white-balance is changed.
 2011-11-18 14:02:15 -08:00
Wei Huang
c2fff5ea39 Merge "Unlock camera AWB lock only when white-balance is changed." into ics-mr1 2011-11-18 14:00:09 -08:00
Bart Sears
29df4a87a7 am e6a96560: Merge "Content and viewport rects set in one step." into ics-mr1 
* commit 'e6a96560ed96e5121db2e22168698f14338c8f1d':
  Content and viewport rects set in one step.
 2011-11-18 11:49:40 -08:00
Bart Sears
e6a96560ed Merge "Content and viewport rects set in one step." into ics-mr1 2011-11-18 11:46:26 -08:00
Svetoslav Ganov
84dd52e394 Text selection AccessibilityEvents are missing text. 
The text selection change event was not added to the text
populating accessibility events in View.

bug:5638709

Change-Id: Ie7e319bc07d7e6c48f178a6c1bd22b1fe32ff515
 2011-11-18 10:26:54 -08:00
Kristian Monsen
4aad1022eb Improving PictureListener deprecating comments 
Change-Id: If189823962c49db9681845996e97eec31fedcca6
 2011-11-18 17:09:12 +00:00
Daniel Sandler
2d54536d08 Dreams (now Screen Candy) development. 
- support for global "disable" setting
- renamed settings provider keys to remove "DREAM"

Bug: 5591015
Change-Id: I31f31b3ca6001fec1e0032a49cdf0d10df7b0ec7
 2011-11-18 08:00:04 -08:00
Wu-cheng Li
b838d8d4a2 Unlock camera AWB lock only when white-balance is changed. 
bug:5633546
Change-Id: I90bb4b5b445daedf38a64e2f8fb980fc0f0aaa81
 2011-11-18 15:21:47 +08:00
Matthew Xie
430d36fef9 am 2b9af44e: am 6da97a24: Merge "Check the bluetooth state for getUuid call" into ics-mr0 
* commit '2b9af44e401d884469869a4ac0933bfa727d3135':
  Check the bluetooth state for getUuid call
 2011-11-17 13:12:39 -08:00
Matthew Xie
2b9af44e40 am 6da97a24: Merge "Check the bluetooth state for getUuid call" into ics-mr0 
* commit '6da97a24e329851888890d4e380066037d08bcd7':
  Check the bluetooth state for getUuid call
 2011-11-17 13:10:14 -08:00
Nick Pelly
480f50f483 am 63b7360e: Merge "Fix NPE on devices that don\'t have NFC." into ics-mr1 
* commit '63b7360e9d8c6fb077bdd00c7ef08f402d5a76ba':
  Fix NPE on devices that don't have NFC.
 2011-11-17 12:50:39 -08:00
Nick Pelly
63b7360e9d Merge "Fix NPE on devices that don't have NFC." into ics-mr1 2011-11-17 12:48:48 -08:00
Michael Kolb
7e0e2dc28d am 852585c0: Merge "Draw input field focus ring in WebTextView" into ics-mr1 
* commit '852585c034d383ea6afe1b484afa57cbf4d04f95':
  Draw input field focus ring in WebTextView
 2011-11-17 12:24:43 -08:00
Michael Kolb
852585c034 Merge "Draw input field focus ring in WebTextView" into ics-mr1 2011-11-17 12:22:58 -08:00
Michael Kolb
edb39ce5b4 Draw input field focus ring in WebTextView 
Bug: 5628053

Change-Id: I1a3d5402e7925e71877be2c278e95f25e75746f3
 2011-11-17 11:08:59 -08:00
John Reck
65926fa6b8 am 775e986e: Merge "Fix add single character check" into ics-mr1 
* commit '775e986ece16b90d3260fe8c7f8e18fc3d0cf492':
  Fix add single character check
 2011-11-17 08:52:00 -08:00
John Reck
0483a235f6 am 1da3d656: Merge "Undeprecate LayoutAlgorithm" into ics-mr1 
* commit '1da3d656358ab577f285d06e9db249dfb21cb8e3':
  Undeprecate LayoutAlgorithm
 2011-11-17 08:49:28 -08:00
John Reck
775e986ece Merge "Fix add single character check" into ics-mr1 2011-11-17 08:48:04 -08:00
John Reck
1da3d65635 Merge "Undeprecate LayoutAlgorithm" into ics-mr1 2011-11-17 08:47:29 -08:00
George Mount
82ed95f410 Content and viewport rects set in one step. 
Bug 5342918
 The content rect of the WebView was being retrieved during
 the draw while the viewport rect was being set when the
 draw functor was setup. During animations, the content
 rect was changing between the time the draw functor was
 retrieved and it was executed. The content rect is now
 being set with the viewport rect.

 Wekbkit Change: I05d68dcc

Change-Id: I1b0978eeb27d9f1deddfeba3ede869f735f74394
 2011-11-17 08:31:55 -08:00
Ben Murdoch
01802fadd0 am fead0e14: Merge changes I59323dc5,I31a01aa3 into ics-mr1 
* commit 'fead0e14b437e80b1c2b0578ec33fc5cbf910ddf':
  WebViewDatabase v11 for ICS.
  Fix a bug in the database upgrade process, and refactor slightly.
 2011-11-17 02:15:34 -08:00
Ben Murdoch
fead0e14b4 Merge changes I59323dc5,I31a01aa3 into ics-mr1 
* changes:
  WebViewDatabase v11 for ICS.
  Fix a bug in the database upgrade process, and refactor slightly.
 2011-11-17 02:13:19 -08:00
Nicolas Roard
c6c6cf643e am e88ca718: Merge "Hack to workaround the fact that the EGL context can be removed from under us by framework in low memory condition." into ics-mr1 
* commit 'e88ca718ed9af788f2dc46b5f2db494906bbf41d':
  Hack to workaround the fact that the EGL context can be removed from under us by framework in low memory condition.
 2011-11-16 19:42:27 -08:00
Nicolas Roard
e88ca718ed Merge "Hack to workaround the fact that the EGL context can be removed from under us by framework in low memory condition." into ics-mr1 2011-11-16 19:40:04 -08:00
Nicolas Roard
2bc0b01ffe Hack to workaround the fact that the EGL context can be 
removed from under us by framework in low memory condition.

bug:5627977
Change-Id: I3c138985e3e6c16f7c15497a1a11ffed93cd8e78
 2011-11-16 19:31:00 -08:00
Matthew Xie
31063444a0 am 302afb93: Merge "Call notifyIncomingA2dpConnection with correct rejected status" into ics-mr1 
* commit '302afb93d4fd908949ac796eda8343f9683e616a':
  Call notifyIncomingA2dpConnection with correct rejected status
 2011-11-16 18:25:06 -08:00
Matthew Xie
302afb93d4 Merge "Call notifyIncomingA2dpConnection with correct rejected status" into ics-mr1 2011-11-16 18:20:50 -08:00
Mangesh Ghiware
5d4c2b0f84 am 4fdfdeed: Merge "Revert change to setInitialScale() to take display density into account." into ics-mr1 
* commit '4fdfdeedc64eef2efe3811198e8fad40aa1b8fc3':
  Revert change to setInitialScale() to take display density into account.
 2011-11-16 18:03:53 -08:00
Mangesh Ghiware
4fdfdeedc6 Merge "Revert change to setInitialScale() to take display density into account." into ics-mr1 2011-11-16 18:01:35 -08:00
satok
0427550509 am e5febfd5: Merge "Clean up the spell checker framework" into ics-mr1 
* commit 'e5febfd5bd9b19a01383760b523476ba7f013a5c':
  Clean up the spell checker framework
 2011-11-16 17:37:47 -08:00
satok
e5febfd5bd Merge "Clean up the spell checker framework" into ics-mr1 2011-11-16 17:35:54 -08:00
Matthew Xie
0901e601b5 Call notifyIncomingA2dpConnection with correct rejected status 
notifyIncomingA2dpConnection was called with wrong rejected status.
Fix this.
bug 5626476

Change-Id: Ie8e4a8bdc6f6357a62172c86c21ee547376952a4
 2011-11-16 17:14:36 -08:00
John Reck
f9a6c91f75 Fix add single character check 
Bug: 5618801

Change-Id: I42a19855b188c9175b8f7a293faa96027685052c
 2011-11-16 16:58:56 -08:00
Nick Pelly
a5193b24c1 Fix NPE on devices that don't have NFC. 
We should return null instead of NPE.

Bug: 5622939
Change-Id: I802f4a99ea9f5e73453d5ea30da4e1d9fa279b9c
 2011-11-16 16:49:01 -08:00
satok
060677f468 Clean up the spell checker framework 
Change-Id: I64c0d813e53a4ebf8d7e63463e36f6900f1aa7d3
 2011-11-17 09:40:56 +09:00
Matthew Xie
6da97a24e3 Merge "Check the bluetooth state for getUuid call" into ics-mr0 2011-11-16 15:31:03 -08:00
Jason Simmons
2a2c8b72c8 Merge "Unlink the Binder DeathRecipient when removing a Bluetooth service record" into ics-aah 2011-11-16 14:51:17 -08:00
Dianne Hackborn
56caf7751b am 717a25dc: Add new ManagedEGLContext class to help apps participate in memory trimming. 
* commit '717a25dc2a411edb548859cd6870363346c71b01':
  Add new ManagedEGLContext class to help apps participate in memory trimming.
 2011-11-16 14:37:51 -08:00
Dianne Hackborn
717a25dc2a Add new ManagedEGLContext class to help apps participate in memory trimming. 
This class provides an API for an application to know when it is time to
destroy its EGL context when memory is being trimmed.  By having this in
the framework, we can still detect whether it will be useful to destroy
any EGL contexts (because we know if doing so will destroy all of them).

Change-Id: I1eac8d640052778052926b875c7928008f752182
 2011-11-16 14:04:53 -08:00