82685 Commits

Author SHA1 Message Date
Katie McCormick
1cfe4b40d3 am 9c311279: Merge "Doc change: 4K -> 4kb" into jb-dev
* commit '9c311279726598de073314fb6059feea66957219':
  Doc change: 4K -> 4kb
2012-08-01 16:24:25 -07:00
Katie McCormick
2184bae4e5 am 510d8179: am a5e150c9: Merge "cherrypick from master docs: Battery class C2DM -> GCM Change-Id: If5fe0034ae0bb72c321b591f84e79acbaf2e36f1" into jb-dev
* commit '510d817977af6761274e700178a854b9f9160d9c':
  cherrypick from master docs: Battery class C2DM -> GCM Change-Id: If5fe0034ae0bb72c321b591f84e79acbaf2e36f1
2012-08-01 16:22:31 -07:00
Katie McCormick
9c31127972 Merge "Doc change: 4K -> 4kb" into jb-dev 2012-08-01 16:21:53 -07:00
Katie McCormick
510d817977 am a5e150c9: Merge "cherrypick from master docs: Battery class C2DM -> GCM Change-Id: If5fe0034ae0bb72c321b591f84e79acbaf2e36f1" into jb-dev
* commit 'a5e150c95c6e7c38fc8643c3615f5664e2cd4582':
  cherrypick from master docs: Battery class C2DM -> GCM Change-Id: If5fe0034ae0bb72c321b591f84e79acbaf2e36f1
2012-08-01 16:16:22 -07:00
Katie McCormick
a65d0e78dd Doc change: 4K -> 4kb
Change-Id: Ic563436062c6bd17ba87f3b3cc4c765972b07289
2012-08-01 16:14:47 -07:00
Katie McCormick
a5e150c95c Merge "cherrypick from master docs: Battery class C2DM -> GCM Change-Id: If5fe0034ae0bb72c321b591f84e79acbaf2e36f1" into jb-dev 2012-08-01 16:13:36 -07:00
Scott Main
c221f35de3 am a9a3c25a: am c9506415: Group revert of the following commits for design docs:
* commit 'a9a3c25a52e91346bb898e2d8c33f5c8fdd0295d':
  Group revert of the following commits for design docs:
2012-08-01 16:09:29 -07:00
Scott Main
a9a3c25a52 am c9506415: Group revert of the following commits for design docs:
* commit 'c9506415d533c61a9607c5b61a1993747bafb406':
  Group revert of the following commits for design docs:
2012-08-01 16:07:18 -07:00
Katie McCormick
ec4ec27ea6 cherrypick from master docs: Battery class C2DM -> GCM Change-Id: If5fe0034ae0bb72c321b591f84e79acbaf2e36f1
Change-Id: I6342d1a3925d43719358d905fc29f2628c6e92b4
2012-08-01 16:01:18 -07:00
Scott Main
c9506415d5 Group revert of the following commits for design docs:
ce470e17fd4298c1b8aa9a5fd7493bde7a6be840
8874ab0473f4db10e71bf0537c0703db03bac4ee
bdd8d0fada73dabbda7f6f174c17317d1e30a79e
6443ca4cd9406ed8e9ba55461d4b2eb677aad17a
5ac5a324b377c8c5f29a3d368ebfdc76b0d02e3e
1edd4ae5c4748bd9d1e64f65dc554790063d59b8
be13fa0b7ac7929e65b1f3e40b2834ed0d9ed7ff
6a681afd38d9881154207436e5e145856e9d2f75
353474c0acdad9b8ffdb86d3d5f32137885dd720
2b1584c1d53cd1070d5157c07158828b4baf8844

Had to revert these because they're not ready to be published.

Change-Id: I704cf0df1db9aa159295bdf78e97cef9605addc6
2012-08-01 15:51:29 -07:00
Rajeev Sharma
c1deaa221f Vignette filter: precompute more values, simplify math, cleanup code
Change-Id: I29cfc313a5173fd393944dd9af58d0111a3d726a
2012-08-01 15:46:30 -07:00
Brian Carlstrom
2a5b147ec8 Change KeyStore to use Modified UTF-8 to match NativeCrypto
Bug: http://code.google.com/p/android/issues/detail?id=35141
Bug: 6869713

Change-Id: I61cb309786960072148ef97ea5afedb33dc45f4e
2012-08-01 15:44:52 -07:00
Ying Wang
880209e412 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-08-01 15:29:17 -07:00
Peter Ng
8a90d746ff am 7bf18315: am 2b1584c1: new confirming page and updates to progress and iconography
* commit '7bf18315505090f45cbe91ad025e772c3ea7ebc4':
  new confirming page and updates to progress and iconography
2012-08-01 15:14:38 -07:00
Peter Ng
7bf1831550 am 2b1584c1: new confirming page and updates to progress and iconography
* commit '2b1584c1d53cd1070d5157c07158828b4baf8844':
  new confirming page and updates to progress and iconography
2012-08-01 15:12:26 -07:00
Brian Carlstrom
4faeef378e Merge "Improve test key names to reproduce public issue" 2012-08-01 15:06:35 -07:00
Katie McCormick
dd983ad556 cherrypick from master docs: GCM changes Change-Id: Id5454e70455bae14ab4605021a6c1bcab0292ae9
Conflicts:

	docs/html/guide/google/gcm/gcm.jd

Change-Id: I9bd42a8a8842e26797ec4a6e7e45962b1560dc6a
2012-08-01 14:55:22 -07:00
Chris Wren
45aaa4a8f4 am 790474ba: am f11e0e71: Merge "Add missing docs to notification style rebuilder functions." into jb-dev
* commit '790474ba3a2fb149090ced7d38247aed6f6a2d59':
  Add missing docs to notification style rebuilder functions.
2012-08-01 14:48:56 -07:00
Scott Main
4861668e4c am c82875e4: am e2594672: Merge "dashboard update for 8/1" into jb-dev
* commit 'c82875e4c1997f8d6d950a74e1353eb5b2c5ae19':
  dashboard update for 8/1
2012-08-01 14:48:42 -07:00
Robert Greenwalt
6c5cec881a am 6b6ce6bf: am a5637bac: Merge "Telephony: Add HSPAP to getTcpBufferSizesPropName"
* commit '6b6ce6bfce56c2f3ce007b33d3f834f8dd62b626':
  Telephony: Add HSPAP to getTcpBufferSizesPropName
2012-08-01 14:48:34 -07:00
Jeff Sharkey
6a916ed0c0 Merge "Add trimToSize() to public API." into jb-mr1-dev 2012-08-01 14:34:47 -07:00
Jeff Sharkey
d96b585f5c Add trimToSize() to public API.
Bug: 6602490
Bug: http://code.google.com/p/android/issues/detail?id=35349
Change-Id: Ib3bc7fee05bb0edc375ebee1c40a1d7bd82e2a17
2012-08-01 14:20:04 -07:00
Teng-Hui Zhu
3a68038249 Merge "Add license info to the HTML5Video files." into jb-mr1-dev 2012-08-01 14:19:46 -07:00
Teng-Hui Zhu
778029e5c6 Add license info to the HTML5Video files.
Change-Id: I44775bcdcc48d2c024b086098e140dae92f53339
2012-08-01 13:59:39 -07:00
Katie McCormick
613d0b1253 Doc update: Misc minor GCM updates.
Change-Id: Id5454e70455bae14ab4605021a6c1bcab0292ae9

Conflicts:

	docs/html/guide/google/gcm/gcm.jd
2012-08-01 13:45:15 -07:00
Dianne Hackborn
e6184f8396 Merge "Start moving away from DisplayMetrics.DENSITY_DEVICE." into jb-mr1-dev 2012-08-01 13:39:45 -07:00
Peter Ng
2b1584c1d5 new confirming page and updates to progress and iconography
Change-Id: I060ac3c34cf268d77b46ac235a2726202a4bb222
2012-08-01 13:16:02 -07:00
Chris Wren
790474ba3a am f11e0e71: Merge "Add missing docs to notification style rebuilder functions." into jb-dev
* commit 'f11e0e7176489f5213acaa7e36c677882854cb8d':
  Add missing docs to notification style rebuilder functions.
2012-08-01 13:04:02 -07:00
Irfan Sheriff
ff9091912b Merge "Update statemachine for bssid change in supplicant" into jb-mr1-dev 2012-08-01 13:01:54 -07:00
Chris Wren
f11e0e7176 Merge "Add missing docs to notification style rebuilder functions." into jb-dev 2012-08-01 13:01:33 -07:00
Scott Main
c82875e4c1 am e2594672: Merge "dashboard update for 8/1" into jb-dev
* commit 'e2594672d279234459aba308c093f444b04c5e91':
  dashboard update for 8/1
2012-08-01 12:54:29 -07:00
Ying Wang
0bd4ca2f31 Import translations. DO NOT MERGE
Change-Id: I9800c2ea2bfd95bb615962f7b8e94dfc47a847ff
Auto-generated-cl: translation import
2012-08-01 12:50:06 -07:00
Scott Main
e2594672d2 Merge "dashboard update for 8/1" into jb-dev 2012-08-01 12:46:40 -07:00
Irfan Sheriff
67718ac036 Update statemachine for bssid change in supplicant
We now use bssid instead of pending_bssid which was only valid in ASSOCIATING state.
This allows us to correctly update bssid during roaming.

Change-Id: Idffff329828196ecbfc5015882d3665c932cf1e6
2012-08-01 12:19:40 -07:00
Robert Greenwalt
6b6ce6bfce am a5637bac: Merge "Telephony: Add HSPAP to getTcpBufferSizesPropName"
* commit 'a5637bac23611a985696c92b49f93964f435ecb5':
  Telephony: Add HSPAP to getTcpBufferSizesPropName
2012-08-01 12:14:33 -07:00
Chris Wren
0bd664dab4 Add missing docs to notification style rebuilder functions.
Bug: 6914726
Change-Id: I13efae036610523ec6f83696d3337054e79856aa
2012-08-01 15:06:56 -04:00
Scott Main
45c159e31f dashboard update for 8/1
Change-Id: I87e037c8128b4108ef94e18e7267304eb22083b9
2012-08-01 11:20:38 -07:00
Robert Greenwalt
a5637bac23 Merge "Telephony: Add HSPAP to getTcpBufferSizesPropName" 2012-08-01 11:01:21 -07:00
Dianne Hackborn
908aecc3a6 Start moving away from DisplayMetrics.DENSITY_DEVICE.
This puts in most of the infrastructure needed to allow us to
switch between different densities at run time.  The main remaining
uses of the global are to initialize the Bitmap object (not sure
what to do about that since it doesn't have anything passed in
the constructor to get this information from), and being able to
load drawables if we need a different density than what was preloaded
by zygote.

Change-Id: Ifdbfd6b7a5c59e6aa22e63b95b78d96af3d96848
2012-08-01 10:54:39 -07:00
James Dong
b198004985 Merge "Added a key to retrieve the rotation angle in MediaMetadataRetriever.java class" into jb-mr1-dev 2012-08-01 10:33:28 -07:00
Roman Nurik
49771c3bea am 1d17f5a9: am da5cb90b: Merge "docs: Add Device Art Generator for Nexus devices to d.a.c/distribute." into jb-dev
* commit '1d17f5a917a1abd5dd6eb100e5f791cacc65d524':
  docs: Add Device Art Generator for Nexus devices to d.a.c/distribute.
2012-08-01 10:06:49 -07:00
Scott Main
b8babd6837 am bca68970: am 0d9d5831: Merge "fix more broken links" into jb-dev
* commit 'bca689703da6f64bfee05dd204149d0f40762344':
  fix more broken links
2012-08-01 10:06:29 -07:00
Craig Mautner
28e000ef72 Merge "Remove debugging for b6829431." into jb-mr1-dev 2012-08-01 10:04:38 -07:00
Roman Nurik
1d17f5a917 am da5cb90b: Merge "docs: Add Device Art Generator for Nexus devices to d.a.c/distribute." into jb-dev
* commit 'da5cb90b992a28c0affe0d52b3b53c1a7b839eb2':
  docs: Add Device Art Generator for Nexus devices to d.a.c/distribute.
2012-08-01 10:02:41 -07:00
Scott Main
bca689703d am 0d9d5831: Merge "fix more broken links" into jb-dev
* commit '0d9d583103aca82b6bc0be719b3579ee83760209':
  fix more broken links
2012-08-01 10:02:24 -07:00
Craig Mautner
1c43719c47 Remove debugging for b6829431.
Change-Id: If7da858722d5d0a5e7db2bc249d454bdee1ec94e
2012-08-01 10:01:16 -07:00
Roman Nurik
da5cb90b99 Merge "docs: Add Device Art Generator for Nexus devices to d.a.c/distribute." into jb-dev 2012-08-01 09:59:54 -07:00
Scott Main
0d9d583103 Merge "fix more broken links" into jb-dev 2012-08-01 09:58:53 -07:00
Roman Nurik
37eecc7e92 docs: Add Device Art Generator for Nexus devices to d.a.c/distribute.
Most of this code is adapted from my code.google.com/p/android-ui-utils
project.

Change-Id: If6763bc7a490e53bd31d5a713158577fa74cfd7b
2012-08-01 09:05:37 -07:00
Peter Ng
5a912ac8b9 am 31737eaa: am a8666422: Merge "moving accessibility image to callouts" into jb-dev
* commit '31737eaa39bd0ef21a3cdc5470bbf124c70a6948':
  moving accessibility image to callouts
2012-08-01 08:59:37 -07:00