Jean-Baptiste Queru
d0604565ee
am d2388b50: am 53ad027c: Merge "MtpStorage: correct the size of reserve space for MTP"
...
* commit 'd2388b50a5c16b920bdd656448107a21e49d753b':
MtpStorage: correct the size of reserve space for MTP
2012-08-10 12:44:09 -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
63fe5cdc74
Import translations. DO NOT MERGE
...
Change-Id: I8948cd5b0992133db9dc8e676b5d43b54d672e85
Auto-generated-cl: translation import
2012-08-10 11:14:46 -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
27f5b08c6e
Import translations. DO NOT MERGE
...
Change-Id: Id5a310cbff83648052cf674e47e50aab30398fbb
Auto-generated-cl: translation import
2012-08-10 10:02:54 -07:00
Joe Malin
955d7cceda
Bug 6954576: Typos and errors in topic
...
Change-Id: Ibc42e84b1662d12ca5494a59ad67365759017c1d
2012-08-10 09:56: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
3401c2e9e1
Reconcile with jb-mr0-release - do not merge
...
Change-Id: I29880eeaee48f2f841d9bfbf21c310e495f26ddc
2012-08-10 08:34: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
3b89190b2e
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
2012-08-09 20:44:41 -07:00
Baligh Uddin
21264a77a7
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
2012-08-09 19:54:39 -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
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
8046b5e00d
Merge "UsbRequest: set ByteBuffer.position() upon success." into jb-mr1-dev
2012-08-09 16:10:11 -07:00
Irfan Sheriff
35cf42d0b6
Merge "Add control to disable suspend optimizations" into jb-mr1-dev
2012-08-09 15:53:17 -07:00
Irfan Sheriff
3fb4ba616e
Add control to disable suspend optimizations
...
Add an advanced setting that allows user to turn off power savings at screen off.
Bug: 5885175
Change-Id: I2dd013b86d7500a2ad1f9ec75d86551808f05543
2012-08-09 15:50:55 -07:00
John Spurlock
c5bfe19626
Merge "Fix screen timeout determination for starting dream." into jb-mr1-dev
2012-08-09 15:43:25 -07:00
mike wakerly
a3665ba95d
UsbRequest: set ByteBuffer.position() upon success.
...
Also clears allocated buffer before copying.
Closes http://b.android.com/28023
Bug: 5385026
Bug: 6766413
Change-Id: Icf2c1d45db4fb2a9bd1fcfdb29aa7308034faaf0
2012-08-09 15:28:10 -07:00
Adam Powell
a7bbbabc15
Merge "Some simple skip-layout optimizations for ImageView" into jb-mr1-dev
2012-08-09 15:19:46 -07:00
Adam Powell
f96ce02613
Some simple skip-layout optimizations for ImageView
...
Mirror the optimization from setImageDrawable into setImageResource
and setImageURI where we won't requestLayout() if the drawable's size
didn't change.
Bug 6359116
Change-Id: Iaae2100f3bddb2737628e31483b471c9e22d945f
2012-08-09 15:09:53 -07:00
Chet Haase
4e44348f91
Merge "Fix shift/mask error in ArtbEvaluator" into jb-mr1-dev
2012-08-09 14:52:25 -07:00
Chet Haase
9b5599894b
Fix shift/mask error in ArtbEvaluator
...
Shifting from the left copies the MSB along with it. This causes a problem
in ArgbEvaluator, which shifts the top byte down by 24 for the start/end
colors, and then uses those values to interpolate alpha values. The correct
appraoch (used with the other color components) is to mask by 0xff after the
shift.
Issue #6960514 External bug: ArgbEvaluator can't evaluate alpha value properly
Change-Id: I750d38ddfecc5f30d8dab7c6d27d1a7ac06361c3
2012-08-09 14:16:29 -07:00
Scott Main
607079d809
docs: SDK r20.0.3, Support Library r10 Release Notes
...
plus some OCD cleanup to the ADT install steps
Change-Id: I760ddb284da2a3f53741b75d6ff0e02af8181c9a
2012-08-09 14:13:22 -07:00
Joe Malin
4aa3c034f5
Fix contentprovider docs android:exported default
...
Change-Id: I30682905e99fa3d05b6315c011e290fe509588f4
2012-08-09 13:02:36 -07:00
Baligh Uddin
03cfc54231
Import translations. DO NOT MERGE
...
Change-Id: I813d5cfc5f5b60e98f635dc62e9935299c903171
Auto-generated-cl: translation import
2012-08-09 12:32:26 -07:00
John Spurlock
b9ba2b6768
Fix screen timeout determination for starting dream.
...
It turns out OFF_BECAUSE_OF_TIMEOUT is not the best indicator
of actual screen timeout.
For example, it is the reason passed down when acquiring a wake lock.
This was causing us to launch Dreams in the wrong situations, and
deadlocking on calls to WindowManager.
This fix simply adds an additional check ensuring the intention is to
turn the screen off.
Change-Id: If8adff446b5b1fcb19424b45878b75bfd0552b90
2012-08-09 14:47:49 -04:00
Amith Yamasani
2c02933b13
Merge "Send BOOT_COMPLETED to all users." into jb-mr1-dev
2012-08-09 11:45:55 -07:00
The Android Automerger
7534553d4c
merge in jb-mr0-release history after reset to jb-dev
2012-08-09 11:37:03 -07:00
mike wakerly
1567a4341b
Fix typo in UsbManager javadoc.
...
Closes http://b.android.com/32863
Change-Id: I8fc03ee70209413f279f606b393e79c12ee9c0d2
2012-08-09 11:25:16 -07:00
Baligh Uddin
a28604840c
Import translations. DO NOT MERGE
...
Change-Id: Icbcdd3a3c7dc300c30f23cc8870e8f6df63e22c6
Auto-generated-cl: translation import
2012-08-09 11:14:23 -07:00
John Spurlock
7c46e4380e
Merge "Fix the dock-insertion Dream entry codepath." into jb-mr1-dev
2012-08-09 08:17:14 -07:00
Daniel Sandler
015b9f45d4
Fix the dock-insertion Dream entry codepath.
...
Bug: 6956040
Change-Id: I663e13f8a28db13b94d0f5aa4dbcf0cd64ef22fe
2012-08-09 11:11:33 -04:00
John Spurlock
634471edc4
Load default Dream settings into a clean db.
...
Set the Dream defaults during onCreate, not only onUpgrade.
Bug: 6959513
Change-Id: Ia93097edaf1150813c75b6be809db9c97987868f
2012-08-09 10:41:37 -04:00
Baligh Uddin
b7649306e9
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
2012-08-08 20:43:29 -07:00