mike wakerly
a060d627f3
am 30206968: am ceff3415: am 1022b999: Merge "Fix typo in UsbManager javadoc." into jb-dev
...
* commit '30206968e99f48d311a90fed8b8591df2fef2c98':
Fix typo in UsbManager javadoc.
2012-08-10 12:40:35 -07:00
Scott Main
95c261344e
am 2d22538f: am 4b4bd1b3: am 607079d8: docs: SDK r20.0.3, Support Library r10 Release Notes plus some OCD cleanup to the ADT install steps
...
* commit '2d22538f29c92071e2e56b728d6bf0f9eee1682e':
docs: SDK r20.0.3, Support Library r10 Release Notes plus some OCD cleanup to the ADT install steps
2012-08-10 12:40:31 -07:00
The Android Open Source Project
c47d63d103
am 3401c2e9: (-s ours) Reconcile with jb-mr0-release - do not merge
...
* commit '3401c2e9e1343c964eb9495cbf8568172c14ac82':
2012-08-10 12:36:46 -07:00
Scott Main
68b3f065b6
am 922e038b: am ea31b47a: Merge "fix misc doc bugs from external issues" into jb-dev
...
* commit '922e038b087076260ae7e29facc8121d46e8ba3c':
fix misc doc bugs from external issues
2012-08-10 12:36:34 -07:00
mike wakerly
30206968e9
am ceff3415: am 1022b999: Merge "Fix typo in UsbManager javadoc." into jb-dev
...
* commit 'ceff34155019bfc69be5b786097d4195fc035afe':
Fix typo in UsbManager javadoc.
2012-08-10 12:36:30 -07:00
Scott Main
2d22538f29
am 4b4bd1b3: am 607079d8: docs: SDK r20.0.3, Support Library r10 Release Notes plus some OCD cleanup to the ADT install steps
...
* commit '4b4bd1b3456096b5f92372230f4ccae225ddd5c4':
docs: SDK r20.0.3, Support Library r10 Release Notes plus some OCD cleanup to the ADT install steps
2012-08-10 12:36:26 -07:00
Baligh Uddin
7762fb8065
Import translations. DO NOT MERGE
...
Change-Id: I58f0e82f25a2b09c253e2a495eb2774c5cc0e806
Auto-generated-cl: translation import
2012-08-10 11:15:32 -07:00
Baligh Uddin
63fe5cdc74
Import translations. DO NOT MERGE
...
Change-Id: I8948cd5b0992133db9dc8e676b5d43b54d672e85
Auto-generated-cl: translation import
2012-08-10 11:14:46 -07:00
Daniel Sandler
1bb219bdcf
am 52ea2140: am 9252dbd3: Add fullscreen to Dream.lightsOut().
...
* commit '52ea21400ba5886a4a91c815278248d8e9bcfc51':
Add fullscreen to Dream.lightsOut().
2012-08-10 11:03:03 -07:00
Daniel Sandler
52ea21400b
am 9252dbd3: Add fullscreen to Dream.lightsOut().
...
* commit '9252dbd314bbce75f1e57330c5a911c9f6428cf5':
Add fullscreen to Dream.lightsOut().
2012-08-10 11:01:00 -07:00
Daniel Sandler
9252dbd314
Add fullscreen to Dream.lightsOut().
...
Also don't go into lightsOut() by default in
onAttachedToWindow(), in case some dream doesn't want to do
that.
We should probably make this even more flexible, but
this is a start.
Change-Id: I606b42a288259902e89d59595ad60548a89866da
2012-08-10 13:57:32 -04:00
Baligh Uddin
c44eecb4ad
Import translations. DO NOT MERGE
...
Change-Id: I5429a1dbfcbd08ea14d96f9fa15824e704fc4c7d
Auto-generated-cl: translation import
2012-08-10 10:11:17 -07:00
Baligh Uddin
27f5b08c6e
Import translations. DO NOT MERGE
...
Change-Id: Id5a310cbff83648052cf674e47e50aab30398fbb
Auto-generated-cl: translation import
2012-08-10 10:02:54 -07:00
Jean-Baptiste Queru
cb80cb700d
am 37548994: Merge "StorageManager: fix issue that GREF has increased to 2011 in system server with intel stress test."
...
* commit '37548994e69292932e9e2fafb7cba6c53e3a2bcd':
StorageManager: fix issue that GREF has increased to 2011 in system server with intel stress test.
2012-08-10 09:26:53 -07:00
Jean-Baptiste Queru
d2388b50a5
am 53ad027c: Merge "MtpStorage: correct the size of reserve space for MTP"
...
* commit '53ad027c46bf578e26e5db70319b17a671ce8a36':
MtpStorage: correct the size of reserve space for MTP
2012-08-10 09:26:47 -07:00
Jean-Baptiste Queru
37548994e6
Merge "StorageManager: fix issue that GREF has increased to 2011 in system server with intel stress test."
2012-08-10 09:04:05 -07:00
Jean-Baptiste Queru
53ad027c46
Merge "MtpStorage: correct the size of reserve space for MTP"
2012-08-10 09:03:42 -07:00
The Android Open Source Project
71266a4c03
am 69718942: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit '697189428a77b3661a9c7caadd189528a85beed1':
It seems that apparently useless public APIs are actually useful Bug #6953651
Revert "Pass URLs to package verifiers"
2012-08-10 08:55:49 -07:00
The Android Open Source Project
697189428a
Reconcile with jb-mr1-release - do not merge
...
Change-Id: I8f2106b703a9b4f6daec48c4cd4eacac3a1c8165
2012-08-10 08:52:32 -07:00
The Android Open Source Project
3401c2e9e1
Reconcile with jb-mr0-release - do not merge
...
Change-Id: I29880eeaee48f2f841d9bfbf21c310e495f26ddc
2012-08-10 08:34:23 -07:00
Daniel Sandler
045b878748
am 4f924dd2: am 69509926: Merge "More termination conditions for Dreams." into jb-mr1-dev
...
* commit '4f924dd254b2798aaa0a1ece06163babcfdb954d':
More termination conditions for Dreams.
2012-08-10 07:30:17 -07:00
Daniel Sandler
4f924dd254
am 69509926: Merge "More termination conditions for Dreams." into jb-mr1-dev
...
* commit '69509926454e4f873bb48ecaa932ccbd76d5b123':
More termination conditions for Dreams.
2012-08-10 07:28:23 -07:00
Daniel Sandler
6950992645
Merge "More termination conditions for Dreams." into jb-mr1-dev
2012-08-10 07:26:15 -07:00
Daniel Sandler
a2fbe53f1e
More termination conditions for Dreams.
...
Default implementation of Dreams will finish() on KEYCODE_BACK.
PhoneStatusBar will awaken() from any Dream when the Home key is pressed.
Change-Id: I55e2a5d533a7fb93debc4c54514dba3b9098f009
2012-08-10 01:19:03 -04:00
Baligh Uddin
01b2588ee6
am 53556be1: (-s ours) am 3b89190b: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit '53556be1492d34123b5d053025388a989e51ad23':
Import translations. DO NOT MERGE
2012-08-09 20:49:26 -07:00
Baligh Uddin
53556be149
am 3b89190b: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit '3b89190b2e82ce0ebc3c633cc1b5e9161304ee1f':
Import translations. DO NOT MERGE
2012-08-09 20:47:22 -07:00
Baligh Uddin
3b89190b2e
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
2012-08-09 20:44:41 -07:00
Baligh Uddin
48667818d3
Merge "Import translations. DO NOT MERGE"
2012-08-09 20:43:09 -07:00
Baligh Uddin
1179455493
am 3919ca63: (-s ours) am 21264a77: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit '3919ca638d6dd52575f3da8957fe1754edb7623a':
Import translations. DO NOT MERGE
2012-08-09 19:59:22 -07:00
Baligh Uddin
3919ca638d
am 21264a77: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit '21264a77a7a02c7c1139f81db0be135c59d21d9e':
Import translations. DO NOT MERGE
2012-08-09 19:57:15 -07:00
Baligh Uddin
21264a77a7
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
2012-08-09 19:54:39 -07:00
Baligh Uddin
a06850d398
Merge "Import translations. DO NOT MERGE"
2012-08-09 19:53:12 -07:00
Brian Muramatsu
b2a0ad4c2e
am 84b3fccc: am 14262d79: Merge "Control GPS logging with property" into jb-mr1-dev
...
* commit '84b3fccc56a6c5929bfb3a50ebdd6b5503141cfc':
Control GPS logging with property
2012-08-09 18:50:53 -07:00
Brian Muramatsu
84b3fccc56
am 14262d79: Merge "Control GPS logging with property" into jb-mr1-dev
...
* commit '14262d79c42072b01d8beccc3a0d688938da4214':
Control GPS logging with property
2012-08-09 18:48:38 -07:00
Brian Muramatsu
14262d79c4
Merge "Control GPS logging with property" into jb-mr1-dev
2012-08-09 18:46:10 -07:00
Adam Powell
14de557208
am 1b8e5de1: am f6e80228: Merge "Sync fling physics between Scroller/OverScroller" into jb-mr1-dev
...
* commit '1b8e5de1beff2f54797e03c05cca1e8043895495':
Sync fling physics between Scroller/OverScroller
2012-08-09 17:32:01 -07:00
Adam Powell
1b8e5de1be
am f6e80228: Merge "Sync fling physics between Scroller/OverScroller" into jb-mr1-dev
...
* commit 'f6e802283cea8d682d05ee15fe0d500cff118533':
Sync fling physics between Scroller/OverScroller
2012-08-09 17:27:43 -07:00
Adam Powell
f6e802283c
Merge "Sync fling physics between Scroller/OverScroller" into jb-mr1-dev
2012-08-09 17:22:29 -07:00
Brian Muramatsu
1715cb36d9
Control GPS logging with property
...
This allows users of the PDK to debug GPS issues.
Change-Id: I4aff12e124f4264abd1a0be012df4c431044189c
2012-08-09 17:14:13 -07:00
Scott Main
922e038b08
am ea31b47a: Merge "fix misc doc bugs from external issues" into jb-dev
...
* commit 'ea31b47a72a6fed1269e2ba3c29c438212322bf0':
fix misc doc bugs from external issues
2012-08-09 17:03:16 -07:00
Scott Main
ea31b47a72
Merge "fix misc doc bugs from external issues" into jb-dev
2012-08-09 17:00:52 -07:00
Adam Powell
990dfc6f90
Sync fling physics between Scroller/OverScroller
...
Bug 6793537
Have the default fling physics for Scroller follow the newer patterns
from OverScroller.
Make some constants determined by DisplayMetrics density in
OverScroller per-instance rather than static.
Change-Id: I5308e4bb8eca63e95cf3f1eee1ba4fa5391023b0
2012-08-09 16:55:08 -07:00
mike wakerly
ceff341550
am 1022b999: Merge "Fix typo in UsbManager javadoc." into jb-dev
...
* commit '1022b9999de8fb022db6923a55e37ffc7dfca176':
Fix typo in UsbManager javadoc.
2012-08-09 16:49:07 -07:00
mike wakerly
1022b9999d
Merge "Fix typo in UsbManager javadoc." into jb-dev
2012-08-09 16:47:11 -07:00
Scott Main
4b4bd1b345
am 607079d8: docs: SDK r20.0.3, Support Library r10 Release Notes plus some OCD cleanup to the ADT install steps
...
* commit '607079d8098f3bf6632913a6edd0bc6d6f9167d7':
docs: SDK r20.0.3, Support Library r10 Release Notes plus some OCD cleanup to the ADT install steps
2012-08-09 16:43:18 -07:00
Scott Main
cb0b2df114
fix misc doc bugs from external issues
...
Change-Id: I11b1d524dd2159b58c65d3ef7a76af15624ae365
2012-08-09 16:38:12 -07:00
mike wakerly
0099d67d68
Fix typo in UsbManager javadoc.
...
Closes http://b.android.com/32863
Change-Id: I8fc03ee70209413f279f606b393e79c12ee9c0d2
2012-08-09 16:31:26 -07:00
mike wakerly
2665c988af
am af4fa8d7: am 8046b5e0: Merge "UsbRequest: set ByteBuffer.position() upon success." into jb-mr1-dev
...
* commit 'af4fa8d73981126bfbdd68f0e17640624bb1693c':
UsbRequest: set ByteBuffer.position() upon success.
2012-08-09 16:14:13 -07:00
mike wakerly
af4fa8d739
am 8046b5e0: Merge "UsbRequest: set ByteBuffer.position() upon success." into jb-mr1-dev
...
* commit '8046b5e00dc24fc5f5de86435e2e0d4b04520ac7':
UsbRequest: set ByteBuffer.position() upon success.
2012-08-09 16:11:58 -07:00
mike wakerly
8046b5e00d
Merge "UsbRequest: set ByteBuffer.position() upon success." into jb-mr1-dev
2012-08-09 16:10:11 -07:00