ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 6 Pull Requests Releases Wiki Activity
11,451 Commits 2 Branches 0 Tags 54 MiB
cbe41ce95b
Commit Graph

11451 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jean-Baptiste Queru
f1d0d955f8 resolved conflicts for merge of da9691e9 to master 2009-12-10 15:46:33 -08:00
Adam Powell
83786300ea 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
2de58fdd8f 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
Romain Guy
567acc429d 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
f74e5f997a 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
1409d583f2 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
e142eb55e3 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
6acb7dd06d 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
310ef29711 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
e1751b8b48 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
bc34a5365a 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
11cc4f52ae 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
Kenny Root
ccb5b89029 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
03f38be81d 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
39dd163183 Merge change Ib3d582d7 into eclair-mr2 
* changes:
  Fix crash with @UiThreadTest in InstrumentationTestCase.
 2009-12-10 13:46:10 -08:00
Marco Nelissen
46c4fc2266 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
350401f6d1 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
8f3dface92 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
c532509283 am aa02bae8: am 029074ff: fix build 
Merge commit 'aa02bae8309797d22d28c7f6a2aaa23ebcee6be3'

* commit 'aa02bae8309797d22d28c7f6a2aaa23ebcee6be3':
  fix build
 2009-12-10 13:31:22 -08:00
Fred Quintana
80f10677fa 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
d9c4c6aacf resolved conflicts for merge of 3d2560ad to master 2009-12-10 13:29:19 -08:00
Andreas Huber
fa8dceeeea 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
6406aba945 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
Andreas Huber
3416c15e0d 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
49890fdd68 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
785e0eaf75 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
4cf3d84549 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
Patrick Scott
d16c9b79b0 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
0e5f195e7c 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
510e30040f 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
34ca404728 resolved conflicts for merge of fac57636 to master 2009-12-10 12:13:54 -08:00
Romain Guy
0634f06b97 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
95e736849c resolved conflicts for merge of 44a95cc0 to master 2009-12-10 11:57:09 -08:00
Fred Quintana
9c2b636c7f 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
55f78f8ef6 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
Android (Google) Code Review
bf298d0db0 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
Android (Google) Code Review
a3e96b35cb Merge change If44760b8 
* changes:
  resolved conflicts for merge of 00666295 to master
 2009-12-10 11:21:37 -08:00
Jack Palevich
bf948e049f resolved conflicts for merge of 00666295 to master 2009-12-10 11:20:38 -08:00
Doug Zongker
8011c34fc4 am b3c1f1cf: Merge change I7daa7ae8 into eclair-mr2 
Merge commit 'b3c1f1cff4ecf5c88a0bd00d421beeb022bb41e4' into eclair-mr2-plus-aosp

* commit 'b3c1f1cff4ecf5c88a0bd00d421beeb022bb41e4':
  move event log tags used by SyncAdapter into a local .logtags file
 2009-12-10 10:21:39 -08:00
Android (Google) Code Review
0df13ef9cc Merge change I7daa7ae8 into eclair-mr2 
* changes:
  move event log tags used by SyncAdapter into a local .logtags file
 2009-12-10 10:17:17 -08:00
Dianne Hackborn
ec29e558ec am ea483723: am 9fbb534e: Merge change Iafbeb31b into eclair-mr2 
Merge commit 'ea483723b3cc630cf5b5b6fda7b08d9592bdbbde'

* commit 'ea483723b3cc630cf5b5b6fda7b08d9592bdbbde':
  Maybe really fix windows build.
 2009-12-10 09:20:51 -08:00
Dianne Hackborn
5d45497b15 am 0f62abd9: am 4c8454d8: am e851cdc6: Merge change Ifd95b9f5 into eclair 
Merge commit '0f62abd986e1900ab4260e559b2dc7d917b6470f'

* commit '0f62abd986e1900ab4260e559b2dc7d917b6470f':
  Fix #2313382: SECURITY: Live wallpapers get touch events through the lock screen.
 2009-12-10 09:20:36 -08:00
Jean-Baptiste Queru
3418f71f81 resolved conflicts for merge of cfccf5a1 to master 2009-12-10 09:19:02 -08:00
Dianne Hackborn
a000837e76 am b901f0c6: am 484fe4d6: Merge change I06fb2c1c into eclair-mr2 
Merge commit 'b901f0c6dd4c833e4d5a0aa409066d25762abbbb'

* commit 'b901f0c6dd4c833e4d5a0aa409066d25762abbbb':
  Hopefully fix Windows build
 2009-12-10 09:12:16 -08:00
Romain Guy
99361654d1 am 274b8c58: am 7b935e84: Merge change Iead0d4d8 into eclair-mr2 
Merge commit '274b8c584161342af2d1f6dc616995d98f6796ad'

* commit '274b8c584161342af2d1f6dc616995d98f6796ad':
  Fix the build when ViewDebug.TRACE_RECYCLER is set to true.
 2009-12-10 09:12:00 -08:00
Wink Saville
f67c6d63df am 9f4cea68: am a41e0680: Merge change I36785a9d into eclair-mr2 
Merge commit '9f4cea6846aa4ac2ec57c97f5da17822eb9b9727'

* commit '9f4cea6846aa4ac2ec57c97f5da17822eb9b9727':
  Telephony: Make resetting radio on a radio technology change optional
 2009-12-10 09:11:44 -08:00
Paul Westbrook
c2948f1eb0 resolved conflicts for merge of 1cf55c56 to master 2009-12-10 08:51:27 -08:00
Dianne Hackborn
019f540119 am eb68a226: am af9788a9: Merge change Ia53c6725 into eclair-mr2 
Merge commit 'eb68a226563f60265663f1688dda77c4f909e5de'

* commit 'eb68a226563f60265663f1688dda77c4f909e5de':
  Add bindService API to not bring ot foreground.
 2009-12-10 07:55:00 -08:00
Robert Greenwalt
d02ab584a6 am 5ee73c71: am 7614d3d8: am 68b15b68: Porting change I064698b3 from mr2 to eclair. 
Merge commit '5ee73c716bd1d5e5e74bc87d8dafce1ad2be4f0e'

* commit '5ee73c716bd1d5e5e74bc87d8dafce1ad2be4f0e':
  Porting change I064698b3 from mr2 to eclair.
 2009-12-10 07:54:43 -08:00
Romain Guy
386e0dbc2f am e0b52cad: am ea4823c1: Improve javadoc in View. 
Merge commit 'e0b52cad927259b1a9ea2e68887dd769e8667faf'

* commit 'e0b52cad927259b1a9ea2e68887dd769e8667faf':
  Improve javadoc in View.
 2009-12-10 07:54:26 -08:00