88206 Commits

Author SHA1 Message Date
kmccormick@google.com
47972cea30 am 480ac7fc: am 596d0e38: am f53c5f36: am d1ae2721: Merge "Doc Update: Fixing images" into jb-dev-docs
* commit '480ac7fca61a29a7a1ca150ea0a583901971f137':
  Doc Update: Fixing images
2012-11-15 09:54:41 -08:00
kmccormick@google.com
480ac7fca6 am 596d0e38: am f53c5f36: am d1ae2721: Merge "Doc Update: Fixing images" into jb-dev-docs
* commit '596d0e3881782096f7a6ea9959e8dc5f07004623':
  Doc Update: Fixing images
2012-11-15 09:51:56 -08:00
kmccormick@google.com
596d0e3881 am f53c5f36: am d1ae2721: Merge "Doc Update: Fixing images" into jb-dev-docs
* commit 'f53c5f3683b71d232a78e04ea06649dd5e4bfee1':
  Doc Update: Fixing images
2012-11-15 09:49:21 -08:00
kmccormick@google.com
f53c5f3683 am d1ae2721: Merge "Doc Update: Fixing images" into jb-dev-docs
* commit 'd1ae2721fa7b350b979e75319812636ea31bb56b':
  Doc Update: Fixing images
2012-11-15 09:45:46 -08:00
&& repo sync -j8
d1ae2721fa Merge "Doc Update: Fixing images" into jb-dev-docs 2012-11-15 09:43:18 -08:00
Baligh Uddin
ecc2bcb512 Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev 2012-11-15 08:17:16 -08:00
Baligh Uddin
3893925901 am c3b6ee60: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit 'c3b6ee6068f7970c2a7f9da6f784adc2e6b2bceb':
  Import translations. DO NOT MERGE
2012-11-15 08:16:31 -08:00
Baligh Uddin
c3b6ee6068 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-11-15 08:13:48 -08:00
Baligh Uddin
8264bd80f2 am 36c7d313: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '36c7d313af815c8842d7ca9002ff36bfe347716b':
  Import translations. DO NOT MERGE
2012-11-15 08:06:37 -08:00
Baligh Uddin
aaf3fbc665 Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev 2012-11-15 08:03:08 -08:00
Baligh Uddin
36c7d313af Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-11-15 08:02:17 -08:00
Daniel Sandler
020d65290a Merge "Do not vibe when the default notification sound is Silent." into jb-mr1.1-dev 2012-11-15 05:05:44 -08:00
Daniel Sandler
83b2596155 Merge "Notification vibration improvements:" into jb-mr1.1-dev 2012-11-15 05:03:11 -08:00
Scott Main
0622ed7fbb am 0034beab: resolved conflicts for merge of 783e115b to jb-mr1-dev
* commit '0034beab72d6574de5009e5947729a2bfd17d66e':
  implement new organization for Training classes This also moves a few of the documents from API Guides > Best Practices into the new courses for best practices. This is also dependent on CL Ieac8a97a8d6fda41a3682241901150cfe16afc4d which generates the list of classes/lessons on each course landing page.
2012-11-14 19:13:05 -08:00
Scott Main
0034beab72 resolved conflicts for merge of 783e115b to jb-mr1-dev
Change-Id: Ibfd3023a845fb6cc549f05bcff2d6e4abc7e5a07
2012-11-14 19:10:18 -08:00
Scott Main
783e115b60 resolved conflicts for merge of e907a390 to jb-dev-plus-aosp
Change-Id: I4e216b81f33b4b7c238f74f1c475bc84df3f79ef
2012-11-14 19:04:05 -08:00
&& repo sync -j8
1019a9c44e Doc Update: Fixing images
Bug: 7542170
Change-Id: I18e5d360e21af9d30864456ae429b804314e1edb
2012-11-14 18:27:36 -08:00
Scott Main
e907a3909d am 22cc2764: implement new organization for Training classes This also moves a few of the documents from API Guides > Best Practices into the new courses for best practices. This is also dependent on CL Ieac8a97a8d6fda41a3682241901150cfe16afc4d which generates the lis
* commit '22cc2764cc74e52888b043e0c6371594305bb5e9':
  implement new organization for Training classes This also moves a few of the documents from API Guides > Best Practices into the new courses for best practices. This is also dependent on CL Ieac8a97a8d6fda41a3682241901150cfe16afc4d which generates the list of classes/lessons on each course landing page.
2012-11-14 17:38:15 -08:00
Scott Main
22cc2764cc implement new organization for Training classes
This also moves a few of the documents from API Guides > Best Practices
into the new courses for best practices.
This is also dependent on CL Ieac8a97a8d6fda41a3682241901150cfe16afc4d
which generates the list of classes/lessons on each course landing page.

Change-Id: I8132f72f78d844c3b035c7aa269ad3b88a25d02a
2012-11-14 17:30:24 -08:00
Joe Fernandez
335cbfa89a am e3be79be: Merge "docs: Added note on MIPS system image additions" into jb-mr1-dev
* commit 'e3be79be3f81f1af67f4f6704ae452512065bce6':
  docs: Added note on MIPS system image additions
2012-11-14 17:00:55 -08:00
Joe Fernandez
e3be79be3f Merge "docs: Added note on MIPS system image additions" into jb-mr1-dev 2012-11-14 16:57:30 -08:00
Scott Main
ca22aee863 am 8680f8ff: Merge "docs: add warning for adt bundle on 32-bit os" into jb-mr1-dev
* commit '8680f8ff6d623dfee833e378ec5900769cd5c8c2':
  docs: add warning for adt bundle on 32-bit os
2012-11-14 15:13:28 -08:00
Scott Main
8680f8ff6d Merge "docs: add warning for adt bundle on 32-bit os" into jb-mr1-dev 2012-11-14 15:10:18 -08:00
Scott Main
226fe97155 docs: add warning for adt bundle on 32-bit os
Change-Id: I0a2a62f66e64290006d67b9509b4223588d654b7
2012-11-14 15:09:45 -08:00
Daniel Sandler
d4d2de2a77 Do not vibe when the default notification sound is Silent.
(This relates to the new vibration fallback behavior, where
notifications that expect to make a sound should always
vibrate in vibrate mode. We should not vibrate if the
notification's sound is silent, but we should also not
vibrate if the notification uses the default sound and the
default is silent.)

Bug: 7537077
Change-Id: I08e149c8c00ef2d2f61e418d88a086cb5e9cf241
2012-11-14 16:42:04 -05:00
Victoria Lease
75819a9cdd Merge "Resolve LocationManager + ActivityManager conflict" into jb-mr1.1-dev 2012-11-14 13:18:58 -08:00
Quddus Chong
f4ad01922d am 73b1f68e: Merge "docs: Updated uiautomator API docs to reflect correct API level. bug: 7538348" into jb-mr1-dev
* commit '73b1f68e3ca6eb5361f83565c8f37d45393a7e80':
  docs: Updated uiautomator API docs to reflect correct API level. bug: 7538348
2012-11-14 13:10:15 -08:00
Quddus Chong
73b1f68e3c Merge "docs: Updated uiautomator API docs to reflect correct API level. bug: 7538348" into jb-mr1-dev 2012-11-14 13:08:26 -08:00
Quddus Chong
8fcab20dfd docs: Updated uiautomator API docs to reflect correct API level.
bug: 7538348

Change-Id: I03cdc53096a87e79ed8d4584dd0f726e8337c2a2
2012-11-14 11:53:34 -08:00
Daniel Sandler
edbb380950 Notification vibration improvements:
- When notifications vibrate as a fallback (that is,
   because they want to play a sound but the device is in
   vibrate mode), this no longer requires the VIBRATE
   permission.
 - As a bonus, if your notifications use DEFAULT_VIBRATE,
   you don't need the VIBRATE permission either.
 - If you specify a custom vibration pattern, you'll still
   need the VIBRATE permission for that.
 - Notifications vibrating in fallback mode use a different
   vibration pattern.
 - The DEFAULT_VIBRATE and fallback vibrate patterns are now
   specified in config.xml.

Bug: 7531442
Change-Id: I7a2d8413d1becc53b9d31f0d1abbc2acc3f650c6
2012-11-14 11:50:11 -08:00
Joe Fernandez
3d4f229172 docs: Added note on MIPS system image additions
Change-Id: I21e79563ea92358f274c90d3495439182aa4450e
2012-11-14 11:37:34 -08:00
Roman Nurik
8aa3db48a4 am 6ed48015: Merge "docs: Update Nexus 10 device frames for darker, more accurate bezel rendering." into jb-mr1-dev
* commit '6ed48015190d67d4a5f916d6c7f5365e3c10d0bf':
  docs: Update Nexus 10 device frames for darker, more accurate bezel rendering.
2012-11-14 11:36:11 -08:00
Roman Nurik
6ed4801519 Merge "docs: Update Nexus 10 device frames for darker, more accurate bezel rendering." into jb-mr1-dev 2012-11-14 11:34:03 -08:00
Roman Nurik
2a45c152bd docs: Update Nexus 10 device frames for darker, more accurate bezel rendering.
Change-Id: Id0a17f187c4ca3c24295257b0c5ca653d1c8cd4d
2012-11-14 10:49:08 -08:00
Baligh Uddin
e3ade134fe Import translations. DO NOT MERGE
Change-Id: I940584ca0ba981c5af42430d3166798595ff656b
Auto-generated-cl: translation import
2012-11-14 10:40:07 -08:00
Baligh Uddin
dd0ffba856 Import translations. DO NOT MERGE
Change-Id: I28291cc43ab74267b771dacf7dc570447a4a3dcf
Auto-generated-cl: translation import
2012-11-14 10:39:26 -08:00
Baligh Uddin
0a26a6ca82 Import translations. DO NOT MERGE
Change-Id: I13afa2f030ae612ee052a52180bfd00d2f49b1e7
Auto-generated-cl: translation import
2012-11-14 10:13:51 -08:00
Baligh Uddin
2303f4242f Import translations. DO NOT MERGE
Change-Id: I44ee12f2a6399347b884f91259117be4774b964b
Auto-generated-cl: translation import
2012-11-14 10:11:28 -08:00
Andreas Huber
99a86d0633 Clarify that MediaFormat.KEY_IS_ADTS only applies to decoding AAC audio content
and cannot be used to configure the _encoder_ to emit ADTS content.

Change-Id: I47177099b204027b726b2c7ec9b93be6835d88f6
related-to-bug: 7542186
2012-11-14 09:16:59 -08:00
Victoria Lease
61ecb02f54 Resolve LocationManager + ActivityManager conflict
LocationManagerService was serially stuffing the same Location into
multiple Intents, which it would immediately hand off to
ActivityManagerService, running as a different thread in the same
process. LocationManager would continue to work with that Location
while ActivityManagerService worked with a Parceled version of it.

However, Location.mExtras is also a Bundle, and both
ActivityManagerService and LocationManagerService ended up working
with references to the same Bundle. ActivityManagerService needs
it in Parceled form (ie mParceledData != null), but
LocationManagerService was triggering Bundle.unparcel() when
referencing the data contained within.

As a result, LocationManagerService was able to trigger NPE (or
worse) in ActivityManagerService by manipulating the mExtras
member of a Location that was in the process of being reported to
listeners.

To resolve this issue, I copy-construct a new Location to report to
each listener. This should prevent ActivityManagerService and
LocationManagerService from referencing the same Bundle data, as
Location's copy constructor also copyconstructs the mExtras member,
rather than simply share references.

Bug: 7518371
Change-Id: I1a92615cba361831494447d5de085a8d910b6b2c
2012-11-13 15:12:51 -08:00
Joe Malin
faa38a08d5 am 4422596d: am ce37f1da: am 4979a0b5: am 5f32d337: Merge "Notification.java javadoc: addAction" into jb-dev-docs
* commit '4422596ddb295f812bb0970ec7f75d3c45d05020':
  Notification.java javadoc: addAction
2012-11-13 14:26:44 -08:00
Joe Malin
4422596ddb am ce37f1da: am 4979a0b5: am 5f32d337: Merge "Notification.java javadoc: addAction" into jb-dev-docs
* commit 'ce37f1da3619dcb4e53ca014cf4a17885cc3af0f':
  Notification.java javadoc: addAction
2012-11-13 14:25:09 -08:00
Joe Malin
ce37f1da36 am 4979a0b5: am 5f32d337: Merge "Notification.java javadoc: addAction" into jb-dev-docs
* commit '4979a0b59486d737a4d9267af9b38f237705e26f':
  Notification.java javadoc: addAction
2012-11-13 14:22:58 -08:00
Joe Malin
4979a0b594 am 5f32d337: Merge "Notification.java javadoc: addAction" into jb-dev-docs
* commit '5f32d3375b13e581d3101ed8e928fd6a463f3809':
  Notification.java javadoc: addAction
2012-11-13 14:20:54 -08:00
Joe Malin
5f32d3375b Merge "Notification.java javadoc: addAction" into jb-dev-docs 2012-11-13 14:14:23 -08:00
Joe Fernandez
e05d4de55a am 9b703463: Merge "docs: Update platform version page with 4.2 release" into jb-mr1-dev
* commit '9b703463ebf67182e78dd2b05183636fbb37f3c9':
  docs: Update platform version page with 4.2 release
2012-11-13 13:38:25 -08:00
Joe Fernandez
9b703463eb Merge "docs: Update platform version page with 4.2 release" into jb-mr1-dev 2012-11-13 13:36:01 -08:00
Joe Fernandez
3bdf4b6ca5 docs: Update platform version page with 4.2 release
Change-Id: I98f8090a8cf8100584a428c407374d7188d1f42b
2012-11-13 12:31:57 -08:00
Scott Main
17a3f233de am f20b146f: Merge "docs: add ndk tos wall" into jb-mr1-dev
* commit 'f20b146fffdb672fb5b541d150240f8ef21a8710':
  docs: add ndk tos wall
2012-11-13 11:42:53 -08:00
Scott Main
f20b146fff Merge "docs: add ndk tos wall" into jb-mr1-dev 2012-11-13 11:41:14 -08:00