83293 Commits

Author SHA1 Message Date
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
0109e70c91 am 229060e9: am 4e44348f: Merge "Fix shift/mask error in ArtbEvaluator" into jb-mr1-dev
* commit '229060e9f72c24c08845029f8340e17b9b3210e1':
  Fix shift/mask error in ArtbEvaluator
2012-08-09 14:56:25 -07:00
Chet Haase
229060e9f7 am 4e44348f: Merge "Fix shift/mask error in ArtbEvaluator" into jb-mr1-dev
* commit '4e44348f91e4df4e9ae71f5e6bd0eebf0dc87d12':
  Fix shift/mask error in ArtbEvaluator
2012-08-09 14:54:19 -07:00
Chet Haase
4e44348f91 Merge "Fix shift/mask error in ArtbEvaluator" into jb-mr1-dev 2012-08-09 14:52:25 -07:00
Joe Malin
cbd0e09aa7 am fba8c80b: am 4aa3c034: Fix contentprovider docs android:exported default
* commit 'fba8c80b26c289032c265faf2425852cc3fac9b6':
  Fix contentprovider docs android:exported default
2012-08-09 14:22:49 -07:00
Joe Malin
fba8c80b26 am 4aa3c034: Fix contentprovider docs android:exported default
* commit '4aa3c034f547b33c65896090d92012f159abbd32':
  Fix contentprovider docs android:exported default
2012-08-09 14:20:39 -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
da1f8467c8 Import translations. DO NOT MERGE
Change-Id: I6fd09debb2875eb29e20e3d81820cdcfc59bd413
Auto-generated-cl: translation import
2012-08-09 12:33:29 -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
Amith Yamasani
144b3d0a01 am 691ea437: am 2c02933b: Merge "Send BOOT_COMPLETED to all users." into jb-mr1-dev
* commit '691ea437dcdc20273acf2027a7daf5b22cd6e802':
  Send BOOT_COMPLETED to all users.
2012-08-09 11:50:26 -07:00
Amith Yamasani
691ea437dc am 2c02933b: Merge "Send BOOT_COMPLETED to all users." into jb-mr1-dev
* commit '2c02933b13b426637808d3d4fd57aea1ff11011a':
  Send BOOT_COMPLETED to all users.
2012-08-09 11:48:02 -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
mike wakerly
61fe5165f1 am 34e45175: am 1567a434: Fix typo in UsbManager javadoc.
* commit '34e45175e2e1bbd5869b5f3f90ae0509e12f25eb':
  Fix typo in UsbManager javadoc.
2012-08-09 11:41:02 -07:00
mike wakerly
34e45175e2 am 1567a434: Fix typo in UsbManager javadoc.
* commit '1567a4341bf642e17432a079d3de3381c7a93340':
  Fix typo in UsbManager javadoc.
2012-08-09 11:38:42 -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
1747cf158b Import translations. DO NOT MERGE
Change-Id: I96086f93081239211ccfe34ef83af25f1c1cdf62
Auto-generated-cl: translation import
2012-08-09 11:23:18 -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
The Android Automerger
c47ac79e31 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-08-09 09:29:51 -07:00
John Spurlock
2b53b80ee7 am 9a67ad9f: am 7c46e438: Merge "Fix the dock-insertion Dream entry codepath." into jb-mr1-dev
* commit '9a67ad9f4cdbf3afe3df9af04b51090e6f849ca5':
  Fix the dock-insertion Dream entry codepath.
2012-08-09 08:21:48 -07:00
John Spurlock
9a67ad9f4c am 7c46e438: Merge "Fix the dock-insertion Dream entry codepath." into jb-mr1-dev
* commit '7c46e4380e6c50c30aad80807f87af25f000c7ff':
  Fix the dock-insertion Dream entry codepath.
2012-08-09 08:19:41 -07:00
John Spurlock
dbd515d5e6 am 8909d058: am 634471ed: Load default Dream settings into a clean db.
* commit '8909d0582f64a4fa13c23ad30492826501db3042':
  Load default Dream settings into a clean db.
2012-08-09 08:19:08 -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
John Spurlock
8909d0582f am 634471ed: Load default Dream settings into a clean db.
* commit '634471edc409f00f38633e334cd6853954a2b093':
  Load default Dream settings into a clean db.
2012-08-09 08:16:58 -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
03a6826cb7 am ec89177b: (-s ours) am b7649306: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit 'ec89177b2ecac120566a1614260235ef8f09478f':
  Import translations. DO NOT MERGE
2012-08-08 20:47:39 -07:00
Baligh Uddin
ec89177b2e am b7649306: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit 'b7649306e9c8c06128c0f405f9da97c95f8be336':
  Import translations. DO NOT MERGE
2012-08-08 20:45:34 -07:00
Baligh Uddin
b7649306e9 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-08-08 20:43:29 -07:00
Baligh Uddin
b078625fdf Merge "Import translations. DO NOT MERGE" 2012-08-08 20:39:56 -07:00
Amith Yamasani
4860cfc684 Send BOOT_COMPLETED to all users.
At least until we have a concept of logged-in users.

Change-Id: I65e3bed2aeef9692dbc64169cf02a7451cfed1cd
2012-08-08 19:15:58 -07:00
Jeff Brown
1c06d659e6 am c698c9cc: am a1300467: Merge "Enable use of Surface as a native window in EGL14 wrapper." into jb-mr1-dev
* commit 'c698c9cc6af3ebedb455562434658024de324124':
  Enable use of Surface as a native window in EGL14 wrapper.
2012-08-08 18:46:16 -07:00
Jeff Brown
c698c9cc6a am a1300467: Merge "Enable use of Surface as a native window in EGL14 wrapper." into jb-mr1-dev
* commit 'a1300467332e3189e1b7c02af03fd66aac8e79e9':
  Enable use of Surface as a native window in EGL14 wrapper.
2012-08-08 18:43:25 -07:00
Jeff Brown
a130046733 Merge "Enable use of Surface as a native window in EGL14 wrapper." into jb-mr1-dev 2012-08-08 18:41:05 -07:00
Jeff Brown
415e6ba016 am 35489c0a: am 1670dc9a: Merge "Add FloatMath.exp." into jb-mr1-dev
* commit '35489c0a3d61092487c1678793256ba754aa677d':
  Add FloatMath.exp.
2012-08-08 18:32:57 -07:00
Jeff Brown
35489c0a3d am 1670dc9a: Merge "Add FloatMath.exp." into jb-mr1-dev
* commit '1670dc9abf60368cca64c66df038aef76c1f0675':
  Add FloatMath.exp.
2012-08-08 18:31:30 -07:00
Jeff Brown
1670dc9abf Merge "Add FloatMath.exp." into jb-mr1-dev 2012-08-08 18:29:08 -07:00
Jeff Brown
6ffebb03b9 am 205a9c08: am b7df3a71: Merge "Make display info accessible from hidden api." into jb-mr1-dev
* commit '205a9c08c94b5cee1b9b04ff4a1f448e5330236b':
  Make display info accessible from hidden api.
2012-08-08 18:25:06 -07:00
Jeff Brown
1296c63bf1 Enable use of Surface as a native window in EGL14 wrapper.
Change-Id: Ia3546fd02f9b60d4505fbc0602522b95e3e5b6be
2012-08-08 18:23:59 -07:00
Jeff Brown
5d728bb9ff Add FloatMath.exp.
Change-Id: I7f215e5fd4cb942ddee56eebaef04be565ac79f3
2012-08-08 18:23:53 -07:00
Jeff Brown
205a9c08c9 am b7df3a71: Merge "Make display info accessible from hidden api." into jb-mr1-dev
* commit 'b7df3a714f43ee6fe0861e8bc81c4b15082b751e':
  Make display info accessible from hidden api.
2012-08-08 18:23:41 -07:00
Jeff Brown
b7df3a714f Merge "Make display info accessible from hidden api." into jb-mr1-dev 2012-08-08 18:21:27 -07:00
Wink Saville
7e355ac99a am 8498f32b: am f0875570: am eb2257cc: am 6f2361e7: Merge "Telephony: Dynamically instantiate IccCard"
* commit '8498f32bb9c2e4371c652d937ea05781239862cf':
  Telephony: Dynamically instantiate IccCard
2012-08-08 17:49:43 -07:00