Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
62,557 Commits 3 Branches 0 Tags
3526b00a53a2582a51ff8b98ac1400a48f351107
Commit Graph

21464 Commits

Author SHA1 Message Date
Romain Guy
3526b00a53 am c26e4d18: am 8cd39e3a: Merge "Notify views when EGL resources are about to be destroyed Bug #5639899" into ics-mr1 
* commit 'c26e4d18a20ab0b3e769fb3e547994f1c27d6713':
  Notify views when EGL resources are about to be destroyed Bug #5639899
 2011-11-21 21:08:42 -08:00
Adam Powell
79de26ea20 am 516035f0: am fb0784da: Merge "Fix bug 5521467 - Monkeys and ActionBar custom tab views" into ics-mr1 
* commit '516035f0923aad612932327546e780c7c241ceda':
  Fix bug 5521467 - Monkeys and ActionBar custom tab views
 2011-11-21 21:08:40 -08:00
Nick Pelly
082ccca5ff am 4fb747f3: am 043a8b14: Merge "Replace vendor specific NfcGoogle.apk with generic Nfc.apk" into ics-mr1 
* commit '4fb747f329523d6b3a7efc59a4360a249cdaa5ad':
  Replace vendor specific NfcGoogle.apk with generic Nfc.apk
 2011-11-21 21:08:29 -08:00
John Reck
7b0fdc100e am 786513ab: am 0507ac4d: Use isHighEndGfx to determine texture pool 
* commit '786513aba608d958e69deee3fbdf003bdf5d9632':
  Use isHighEndGfx to determine texture pool
 2011-11-21 21:07:33 -08:00
Romain Guy
8cd39e3a10 Merge "Notify views when EGL resources are about to be destroyed Bug #5639899" into ics-mr1 2011-11-21 17:57:05 -08:00
Adam Powell
fb0784da5f Merge "Fix bug 5521467 - Monkeys and ActionBar custom tab views" into ics-mr1 2011-11-21 17:34:57 -08:00
Nick Pelly
cee040eb27 Merge "Throw a nicer error message when using an invalid context to create Nfc" 2011-11-21 17:31:45 -08:00
Adam Powell
05c8277f34 Fix bug 5521467 - Monkeys and ActionBar custom tab views 
Remove custom tab views from old parents if applicable.

Change-Id: I7892f0f271e91a4fc9e26694557e82b81f3fd31a
 2011-11-21 17:14:56 -08:00
Nick Pelly
b04cce0eb5 Throw a nicer error message when using an invalid context to create Nfc 
This can happen when using getContext() instead of getTargetContext()
in an InstrumentationTestCase.

Bug: 5644274
Change-Id: I020a637c271e25bcf25ae2927fd878001d5fea0a
 2011-11-21 17:09:31 -08:00
satok
afb1a9e279 Merge "add sentence level spell checker hidden apis" 2011-11-21 16:30:07 -08:00
satok
0dc1f648a0 add sentence level spell checker hidden apis 
Change-Id: If65c89044bed064fd01a554e33176f64f7c21c0f
 2011-11-22 09:18:12 +09: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
Irfan Sheriff
b9c955664b Add support for infinite dhcp lease time 
Bug: 5649076
Change-Id: I29e3b41d8bd1173b155f3173e65a3b45ad17a45c
 2011-11-21 14:03:00 -08:00
John Reck
0507ac4d94 Use isHighEndGfx to determine texture pool 
Bug: 5639612

Change-Id: I0ccbf74c2638b61b7eb0769c851e74700f0aa191
 2011-11-21 13:30:32 -08:00
Romain Guy
31f2c2e946 Notify views when EGL resources are about to be destroyed 
Bug #5639899

Change-Id: I7c5d8bebf02294426f5b3ab1358a31c38a4fd064
 2011-11-21 10:55:41 -08:00
Kristian Monsen
38bc731875 am 376e93fc: am 7859c184: Merge "Improving PictureListener deprecating comments" into ics-mr1 
* commit '376e93fcea19cd491af59631f3934ab036e1e846':
  Improving PictureListener deprecating comments
 2011-11-20 07:31:41 -08:00
Kristian Monsen
7859c1842c Merge "Improving PictureListener deprecating comments" into ics-mr1 2011-11-20 07:26:59 -08:00
Daniel Sandler
711683cd96 am 25a43ada: am 9b5d7a59: Merge "Dreams (now Screen Candy) development." into ics-mr1 
* commit '25a43adabb70aa769a097c6cb09d71b031431677':
  Dreams (now Screen Candy) development.
 2011-11-19 20:48:21 -08:00
Daniel Sandler
9b5d7a59f3 Merge "Dreams (now Screen Candy) development." into ics-mr1 2011-11-19 20:42:19 -08:00
Svetoslav Ganov
e9dc7c9f03 am bdc2912d: am d8a3cabc: Merge "Text selection AccessibilityEvents are missing text." into ics-mr1 
* commit 'bdc2912da64e5e6402c73997d637224d905ae825':
  Text selection AccessibilityEvents are missing text.
 2011-11-18 15:23:19 -08:00
Wei Huang
2e5f5c973f am bcedde3c: am c2fff5ea: Merge "Unlock camera AWB lock only when white-balance is changed." into ics-mr1 
* commit 'bcedde3cd614e2a241f4c4dad626b840fd9c2424':
  Unlock camera AWB lock only when white-balance is changed.
 2011-11-18 15:23:17 -08:00
Bart Sears
3f6114164f am cb513ba7: am e6a96560: Merge "Content and viewport rects set in one step." into ics-mr1 
* commit 'cb513ba7f14fdf08b5729edef5baf22e302e3e08':
  Content and viewport rects set in one step.
 2011-11-18 15:22:57 -08:00
Svetoslav Ganov
d8a3cabcb1 Merge "Text selection AccessibilityEvents are missing text." into ics-mr1 2011-11-18 14:39:05 -08:00
Daisuke Miyakawa
26650aef86 Merge "Introduce Callable URI as hidden API" 2011-11-18 14:02:28 -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
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
a5ca41e9cc am a4f5c425: am 2b9af44e: am 6da97a24: Merge "Check the bluetooth state for getUuid call" into ics-mr0 
* commit 'a4f5c425b822a46fc49bc87bba82688570584ff1':
  Check the bluetooth state for getUuid call
 2011-11-17 15:13:03 -08:00
Nick Pelly
f955d057dd am c6a0277b: am 63b7360e: Merge "Fix NPE on devices that don\'t have NFC." into ics-mr1 
* commit 'c6a0277bca29359ec1aee123495065982d2eea7a':
  Fix NPE on devices that don't have NFC.
 2011-11-17 15:12:56 -08:00
Michael Kolb
778f146cf4 am 5397bb52: am 852585c0: Merge "Draw input field focus ring in WebTextView" into ics-mr1 
* commit '5397bb52fba04e8dc8496d731611210213847308':
  Draw input field focus ring in WebTextView
 2011-11-17 15:12:49 -08:00
John Reck
a93a7d6d15 am 0551287f: am 775e986e: Merge "Fix add single character check" into ics-mr1 
* commit '0551287f6ed06511feae2a6b3700a9bca4cfc3cd':
  Fix add single character check
 2011-11-17 13:20:15 -08:00
John Reck
6810017f6a am 2c6afef8: am 1da3d656: Merge "Undeprecate LayoutAlgorithm" into ics-mr1 
* commit '2c6afef8766371bf933f8675c80687802ce045e0':
  Undeprecate LayoutAlgorithm
 2011-11-17 13:20:12 -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
63b7360e9d Merge "Fix NPE on devices that don't have NFC." into ics-mr1 2011-11-17 12:48:48 -08:00
Michael Kolb
852585c034 Merge "Draw input field focus ring in WebTextView" into ics-mr1 2011-11-17 12:22:58 -08:00
Ben Murdoch
131ed03f30 am e6269f79: am fead0e14: Merge changes I59323dc5,I31a01aa3 into ics-mr1 
* commit 'e6269f7988a2ec0d1f9ea37d92d6b0ca2f3dc3b8':
  WebViewDatabase v11 for ICS.
  Fix a bug in the database upgrade process, and refactor slightly.
 2011-11-17 11:46:30 -08:00
Nicolas Roard
0ecd89bce3 am e788fa84: 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 'e788fa84f1fac845e50922fc536694ce1cc2fbdb':
  Hack to workaround the fact that the EGL context can be removed from under us by framework in low memory condition.
 2011-11-17 11:46:09 -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
Jesse Wilson
9ab5fa0aaa Merge "Add a link from LruCache to the Android support package (compatibility library)." 2011-11-17 10:42:48 -08:00
Jesse Wilson
02db1b6c00 Add a link from LruCache to the Android support package (compatibility library). 
Change-Id: Ibd16410856cd8a0a991b4a403fedd9ac4e1ecaad
 2011-11-17 13:40:01 -05: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
Matthew Xie
1bce803f66 am 37fb92fb: am 302afb93: Merge "Call notifyIncomingA2dpConnection with correct rejected status" into ics-mr1 
* commit '37fb92fb634d10ca94731a73f2a60d86135baa6a':
  Call notifyIncomingA2dpConnection with correct rejected status
 2011-11-17 07:48:29 -08:00
Mangesh Ghiware
163994c1d4 am 55116350: am 4fdfdeed: Merge "Revert change to setInitialScale() to take display density into account." into ics-mr1 
* commit '5511635090072ce02a4fb07ec25a7c279a7bbc8a':
  Revert change to setInitialScale() to take display density into account.
 2011-11-17 07:48:24 -08:00
satok
8bc972a5a4 am 9e502e90: am e5febfd5: Merge "Clean up the spell checker framework" into ics-mr1 
* commit '9e502e90b58b4d0bbb792ef1c40dcfd9b9322ce8':
  Clean up the spell checker framework
 2011-11-17 07:48:17 -08:00