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

16294 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mathias Agopian
edfeb1229b am 083a557c: fix [2319255] crash in openGL : from the media recorder stress test. 
Merge commit '083a557c25e0032bc4900f335b6643d0badd09ce' into eclair-plus-aosp

* commit '083a557c25e0032bc4900f335b6643d0badd09ce':
  fix [2319255] crash in openGL : from the media recorder stress test.
 2009-12-10 16:08:12 -08:00
Mathias Agopian
083a557c25 fix [2319255] crash in openGL : from the media recorder stress test. 
never call eglCreateImageKHR() with a NULL native buffer, which can
happen in OOM conditions.
 2009-12-10 15:59:08 -08:00
Jean-Baptiste Queru
80ffd8c5ae resolved conflicts for merge of da9691e9 to master 2009-12-10 15:46:33 -08:00
Adam Powell
da9691e9d6 am 326d808b: Added View#dispatchViewVisibilityChanged and View#onDispatchVisibilityChanged; updated api; tests 
Merge commit '326d808b858359464b2ffeb84f2e0a8e0c79b600' into eclair-mr2-plus-aosp

* commit '326d808b858359464b2ffeb84f2e0a8e0c79b600':
  Added View#dispatchViewVisibilityChanged and View#onDispatchVisibilityChanged; updated api; tests
 2009-12-10 15:18:43 -08:00
Android (Google) Code Review
d2169dde42 Merge change If3bafe4f 
* changes:
  Encrypted File Systems. Recovery changes for framework. Modifications to allow for new call to recovery to toggle EFS settings.
 2009-12-10 14:51:23 -08:00
Adam Powell
326d808b85 Added View#dispatchViewVisibilityChanged and View#onDispatchVisibilityChanged; updated api; tests 
Reverted a change to InstrumentationTestCase that would have allowed @UiThreadTest on setUp() methods of tests.
 2009-12-10 14:49:14 -08:00
Andreas Huber
4a0ec3fda9 Initial checkin of software AVC video decoder based on PV source code. 2009-12-10 14:43:44 -08:00
Romain Guy
bf77a6e7a1 am a56a3528: am f2f68760: Merge change Ib3d582d7 into eclair-mr2 
Merge commit 'a56a3528ae8e42cf01dd0d5c5a1585a90f117011'

* commit 'a56a3528ae8e42cf01dd0d5c5a1585a90f117011':
  Fix crash with @UiThreadTest in InstrumentationTestCase.
 2009-12-10 14:43:03 -08:00
Andreas Huber
772f8f4b3b am 23915ddd: am eec100b2: Merge change If0d04246 into eclair-mr2 
Merge commit '23915ddde9ce3ed9f1ce50ea321c8fdce612faf0'

* commit '23915ddde9ce3ed9f1ce50ea321c8fdce612faf0':
  Don't count empty buffers when computing the frame rate.
 2009-12-10 14:42:47 -08:00
Andreas Huber
eab53392ae am b95ea9ec: am 6ae24d93: Merge change I3c01bb62 into eclair-mr2 
Merge commit 'b95ea9ecb2a7b0028c02e096589397e00fdef67a'

* commit 'b95ea9ecb2a7b0028c02e096589397e00fdef67a':
  Adding copyright headers to recently introduced decoder source files.
 2009-12-10 14:42:38 -08:00
Andreas Huber
b9015da87c am 5c5c85a5: am 987e7fb2: Merge change I9a275773 into eclair-mr2 
Merge commit '5c5c85a5050d5512e437be65ec00d3f31b8bf004'

* commit '5c5c85a5050d5512e437be65ec00d3f31b8bf004':
  Initial check in of AMR (NB and WB) decoders based on PV source code.
 2009-12-10 14:42:28 -08:00
Romain Guy
4d0eaf0c7b am 7d26aca8: am f44ecff4: Merge change Id432656e into eclair-mr2 
Merge commit '7d26aca8452ce01ea33c0b03ecec392c07bf867b'

* commit '7d26aca8452ce01ea33c0b03ecec392c07bf867b':
  Add support for @UiThreadTest on setUp() and tearDown() in InstrumentationTestCase.
 2009-12-10 14:42:18 -08:00
Fred Quintana
34bb115367 am c7afd922: am 97ef7637: - move the EventLog stuff out of ATSA - move the google calendar sync adapter settings out of Settings.java 
Merge commit 'c7afd9221babd89ca4acd859c608f41c29f3731b'

* commit 'c7afd9221babd89ca4acd859c608f41c29f3731b':
  - move the EventLog stuff out of ATSA
 2009-12-10 14:42:07 -08:00
Doug Zongker
36b1907693 am fc96523b: am b3c1f1cf: Merge change I7daa7ae8 into eclair-mr2 
Merge commit 'fc96523b94ddaad1da39bee0d6861e2186d8479c'

* commit 'fc96523b94ddaad1da39bee0d6861e2186d8479c':
  move event log tags used by SyncAdapter into a local .logtags file
 2009-12-10 14:41:31 -08:00
Bjorn Bringert
da157b94df am deb83f99: am 159f0015: Merge change I98819b18 into eclair-mr2 
Merge commit 'deb83f9944bb08d1d042330d9f8969f3f6124f3b'

* commit 'deb83f9944bb08d1d042330d9f8969f3f6124f3b':
  Allow resource and file URIs in ImageView.setImageURI()
 2009-12-10 14:40:09 -08:00
Bjorn Bringert
e11a001119 am c0c7b32e: am 45e77ce3: Merge change I154386b1 into eclair-mr2 
Merge commit 'c0c7b32e0b5ab6af749db638a7f08d8a3767d167'

* commit 'c0c7b32e0b5ab6af749db638a7f08d8a3767d167':
  Use unbundled QSB for global search
 2009-12-10 14:39:57 -08:00
Jean-Baptiste Queru
3e37093473 remove classes from the preloaded list 2009-12-10 14:23:25 -08:00
Kenny Root
bb79f64b89 Add string resource type inspection 
Allows "aapt dump --values resource" to print out whether a string in a
ResStringPool is in UTF-8 or UTF-16 encoding.

Change-Id: I6478884a70a3b46fee862dece6cb33454fc34843
 2009-12-10 14:22:08 -08:00
Romain Guy
a56a3528ae am f2f68760: Merge change Ib3d582d7 into eclair-mr2 
Merge commit 'f2f68760eb10b52bd53d6a266f9b5e2b06037d9f' into eclair-mr2-plus-aosp

* commit 'f2f68760eb10b52bd53d6a266f9b5e2b06037d9f':
  Fix crash with @UiThreadTest in InstrumentationTestCase.
 2009-12-10 13:50:11 -08:00
Android (Google) Code Review
f2f68760eb Merge change Ib3d582d7 into eclair-mr2 
* changes:
  Fix crash with @UiThreadTest in InstrumentationTestCase.
 2009-12-10 13:46:10 -08:00
Romain Guy
b3d582d79d Fix crash with @UiThreadTest in InstrumentationTestCase. 2009-12-10 13:45:31 -08:00
Marco Nelissen
1b4a9c0c4d am 92993a62: am 7cd40294: Merge change I2cb78a66 into eclair-mr2 
Merge commit '92993a620b04008a764c52982b9981c1758d9e9e'

* commit '92993a620b04008a764c52982b9981c1758d9e9e':
  Add convenience function to MediaStore to move a playlist item
 2009-12-10 13:32:01 -08:00
Patrick Scott
1baf0871cc am 6f04e61b: am c7f7c940: Merge change Id469ba88 into eclair-mr2 
Merge commit '6f04e61b9e8133976a19d863eef63e53857e1060'

* commit '6f04e61b9e8133976a19d863eef63e53857e1060':
  Listen for window orientation events.
 2009-12-10 13:31:49 -08:00
Grace Kloba
35fb30b63e am bf0b4da2: am 5f68d6fa: Enable longpress and doubletap to WebKit as touch event if it is requested. 
Merge commit 'bf0b4da21fc66aed658608ec2861646c280681e2'

* commit 'bf0b4da21fc66aed658608ec2861646c280681e2':
  Enable longpress and doubletap to WebKit as touch
 2009-12-10 13:31:36 -08:00
Fred Quintana
0be44d6b48 am aa02bae8: am 029074ff: fix build 
Merge commit 'aa02bae8309797d22d28c7f6a2aaa23ebcee6be3'

* commit 'aa02bae8309797d22d28c7f6a2aaa23ebcee6be3':
  fix build
 2009-12-10 13:31:22 -08:00
Fred Quintana
b6bce69992 am c5ab618e: am 563bfade: fix a build breakage 
Merge commit 'c5ab618e543a5d05e9f9660d0e9f1937c7d74fa0'

* commit 'c5ab618e543a5d05e9f9660d0e9f1937c7d74fa0':
  fix a build breakage
 2009-12-10 13:31:09 -08:00
Jean-Baptiste Queru
d9f2d9f22e resolved conflicts for merge of 3d2560ad to master 2009-12-10 13:29:19 -08:00
Andreas Huber
23915ddde9 am eec100b2: Merge change If0d04246 into eclair-mr2 
Merge commit 'eec100b2f44caaea048d3abd898df3c7308865d5' into eclair-mr2-plus-aosp

* commit 'eec100b2f44caaea048d3abd898df3c7308865d5':
  Don't count empty buffers when computing the frame rate.
 2009-12-10 13:14:33 -08:00
Android (Google) Code Review
eec100b2f4 Merge change If0d04246 into eclair-mr2 
* changes:
  Don't count empty buffers when computing the frame rate.
 2009-12-10 13:11:50 -08:00
Maryam Garrett
ab9289320f Allows users to scroll while in select mode. 
This change allows the user to select-n-scroll. While a user
is in select mode, and they try to scroll, the textbox will
scroll in the direction of the selection, and expand the selection.
 2009-12-10 16:00:32 -05:00
Andreas Huber
b95ea9ecb2 am 6ae24d93: Merge change I3c01bb62 into eclair-mr2 
Merge commit '6ae24d9365e21ac2770f2354cc1631751bffe3e6' into eclair-mr2-plus-aosp

* commit '6ae24d9365e21ac2770f2354cc1631751bffe3e6':
  Adding copyright headers to recently introduced decoder source files.
 2009-12-10 12:42:18 -08:00
Android (Google) Code Review
6ae24d9365 Merge change I3c01bb62 into eclair-mr2 
* changes:
  Adding copyright headers to recently introduced decoder source files.
 2009-12-10 12:37:59 -08:00
Andreas Huber
5c5c85a505 am 987e7fb2: Merge change I9a275773 into eclair-mr2 
Merge commit '987e7fb2d43130deb756353ca8f098b0a0a3beeb' into eclair-mr2-plus-aosp

* commit '987e7fb2d43130deb756353ca8f098b0a0a3beeb':
  Initial check in of AMR (NB and WB) decoders based on PV source code.
 2009-12-10 12:32:31 -08:00
Android (Google) Code Review
987e7fb2d4 Merge change I9a275773 into eclair-mr2 
* changes:
  Initial check in of AMR (NB and WB) decoders based on PV source code.
 2009-12-10 12:29:39 -08:00
Andreas Huber
3c01bb627a Adding copyright headers to recently introduced decoder source files. 2009-12-10 12:28:22 -08:00
Andreas Huber
a30d400838 Initial check in of AMR (NB and WB) decoders based on PV source code. 2009-12-10 12:23:55 -08:00
Andreas Huber
f0d04246f4 Don't count empty buffers when computing the frame rate. 2009-12-10 12:21:57 -08:00
Patrick Scott
aaeef5cc64 am a14b4890: am a50d4508: Merge change I75481cb8 into eclair-mr2 
Merge commit 'a14b4890b914971c01bf130697090e7e775aeab4'

* commit 'a14b4890b914971c01bf130697090e7e775aeab4':
  Check that the resolved activity is not in our package.
 2009-12-10 12:17:12 -08:00
Leon Scroggins
613e1632e0 am b23806b9: am 47fabbfc: Pass a message to move the focus when user hits "Next". 
Merge commit 'b23806b92f8f5e19a7a73380da4689607c4d4e49'

* commit 'b23806b92f8f5e19a7a73380da4689607c4d4e49':
  Pass a message to move the focus when user hits "Next".
 2009-12-10 12:16:57 -08:00
Jack Palevich
bcf848e096 am 74befcc7: am 981ccfbb: Implement Matrix Palette extension. 
Merge commit '74befcc7fd721ca34f60bf75e18ce6faaab37aef'

* commit '74befcc7fd721ca34f60bf75e18ce6faaab37aef':
  Implement Matrix Palette extension.
 2009-12-10 12:16:37 -08:00
Jack Palevich
4c2fc8cb25 resolved conflicts for merge of fac57636 to master 2009-12-10 12:13:54 -08:00
Romain Guy
7d26aca845 am f44ecff4: Merge change Id432656e into eclair-mr2 
Merge commit 'f44ecff46732f30977da91eb9614673bad8282f8' into eclair-mr2-plus-aosp

* commit 'f44ecff46732f30977da91eb9614673bad8282f8':
  Add support for @UiThreadTest on setUp() and tearDown() in InstrumentationTestCase.
 2009-12-10 11:59:15 -08:00
Jack Palevich
b9863ec01b resolved conflicts for merge of 44a95cc0 to master 2009-12-10 11:57:09 -08:00
Fred Quintana
c7afd9221b am 97ef7637: - move the EventLog stuff out of ATSA - move the google calendar sync adapter settings out of Settings.java 
Merge commit '97ef7637c6799e72956db8e08192539f1b1942f6' into eclair-mr2-plus-aosp

* commit '97ef7637c6799e72956db8e08192539f1b1942f6':
  - move the EventLog stuff out of ATSA
 2009-12-10 11:55:30 -08:00
Android (Google) Code Review
f44ecff467 Merge change Id432656e into eclair-mr2 
* changes:
  Add support for @UiThreadTest on setUp() and tearDown() in InstrumentationTestCase.
 2009-12-10 11:54:13 -08:00
Roman Nurik
0e71bdc6ac Add ContactManager, MultiResolution, Wiktionary, and WiktionarySimple to samples index. Also add latest samples zip file. 2009-12-10 11:45:33 -08:00
Android (Google) Code Review
c754a501ed Merge changes I513b7234,Ie3d05fcf 
* changes:
  cherry-pick of am 7cd40294: Merge change I2cb78a66 into eclair-mr2
  use a fixed value for public ID
 2009-12-10 11:37:59 -08:00
Marco Nelissen
e3d05fcf39 cherry-pick of am 7cd40294: Merge change I2cb78a66 into eclair-mr2 
Merge commit '7cd4029473431c56100e52f631b9733829dc3171' into eclair-mr2-plus-aosp

* commit '7cd4029473431c56100e52f631b9733829dc3171':
  Add convenience function to MediaStore to move a playlist item
 2009-12-10 11:36:44 -08:00
Android (Google) Code Review
f948ff8138 Merge change If44760b8 
* changes:
  resolved conflicts for merge of 00666295 to master
 2009-12-10 11:21:37 -08:00
Jack Palevich
f44760b8fd resolved conflicts for merge of 00666295 to master 2009-12-10 11:20:38 -08:00