4550 Commits

Author SHA1 Message Date
Dan Morrill
26cee9f355 am 466bd636: Merge "New method returning user metadata." into jb-mr1-dev
* commit '466bd636812684aeb8161f144597cc3b3ed39078':
  New method returning user metadata.
2012-09-21 17:46:29 -07:00
Daniel Sandler
faded6e63b am 0887711d: Merge "Add Notification.Builder.setShowWhen(boolean)." into jb-mr1-dev
* commit '0887711d0f76d858501fd017259ddfdc1950eb3f':
  Add Notification.Builder.setShowWhen(boolean).
2012-09-21 17:45:35 -07:00
Jim Miller
eea4be2743 am 3e87eafc: Merge "Fix the build." into jb-mr1-dev
* commit '3e87eafc7d1aef95801f1758bb78da8b2f960a75':
  Fix the build.
2012-09-21 17:44:42 -07:00
Adam Cohen
8562cb5982 Merge "Changing public method to @hide, doesn't have to be public" into jb-mr1-dev 2012-09-21 16:56:31 -07:00
Adam Cohen
bd1e0076c6 Changing public method to @hide, doesn't have to be public
Change-Id: I4c87b154fd99376a0337f9fc65024e13ddb74da5
2012-09-21 16:51:50 -07:00
Jason Sams
7b3132d97a Merge "Add Blend intrinsic." into jb-mr1-dev 2012-09-21 16:24:07 -07:00
Jason Sams
f70bb04346 Add Blend intrinsic.
Change-Id: I6f679c910fc23fe7441e17ad66bcf5f3dd7425a0
2012-09-21 16:10:49 -07:00
Eino-Ville Talvala
5ce25d7170 Merge "NEW_API: Add android.hardware.Camera.CameraInfo#canDisableShutterSound" into jb-mr1-dev 2012-09-21 16:05:59 -07:00
Philip Milne
2f6d882952 Fix for bug: #7173350. elapsedRealtimeNano() -> elapsedRealtimeNanos()
Change-Id: I71c24ea10093ece07a0780e97bc641ff548c1a44
2012-09-21 15:54:41 -07:00
Jim Miller
1ed9fa10de Merge "Make DPM API for disabling keyguard widgets more generic" into jb-mr1-dev 2012-09-21 15:21:33 -07:00
Wink Saville
c6e4917add Refactor Cell Location public API.
Bug: 7189651
Change-Id: I173412095a5f7ae6116ee65b5315782f1c0c7688
2012-09-21 13:54:05 -07:00
Philip Milne
7b75781845 Bug #6110465. Optical bounds support for all ViewGroup subclasses.
This CL generalizes the optical bounds support previously contained in the
GridLayout implementation and then incorporates the new form directly into
the base View and ViewGroup implementations. After this change, GridLayout is
returned to an 'optical bounds' unaware state, and all layouts (including non-platform
ones) inherit the ability to perform their layout operation by optical (rather than clip)
bounds using their existing implementations.

The "layoutMode" property of ViewGroup and its associated constants are
made public in this CL.

Change-Id: Ic1bba0e1c6fc14da4aeab0b28c975d562b5f82dd
2012-09-21 13:48:40 -07:00
John Reck
cea904c91e am e6ff4784: Merge "Use less static synchronized" into jb-mr1-dev
* commit 'e6ff47840fc6d8ac5ba551101684011e328b4caa':
  Use less static synchronized
2012-09-21 13:34:36 -07:00
Romain Guy
5172316cb2 am a1583288: am 4187f928: Merge "API REVIEW: Undeprecate Location.dump() Bug #7173109" into jb-mr1-dev
* commit 'a1583288aa9e6b740d843b82ccdfd386c8f99455':
  API REVIEW: Undeprecate Location.dump() Bug #7173109
2012-09-21 12:47:25 -07:00
Bjorn Bringert
5c28267461 am f9173428: am 45b07b94: Merge "Add intents to open text and video from search." into jb-mr1-dev
* commit 'f9173428688ce2b6192e72fd70d18ff74cbb34be':
  Add intents to open text and video from search.
2012-09-21 12:46:50 -07:00
Dan Morrill
9589c79914 am 7c987ca4: am 466bd636: Merge "New method returning user metadata." into jb-mr1-dev
* commit '7c987ca47cf37af719d05b161e7b516c0dee8740':
  New method returning user metadata.
2012-09-21 12:45:08 -07:00
Daniel Sandler
94b5cd9b37 am 89e27caa: am 0887711d: Merge "Add Notification.Builder.setShowWhen(boolean)." into jb-mr1-dev
* commit '89e27caa0cc4a488eaf202c2478204238f95fc0a':
  Add Notification.Builder.setShowWhen(boolean).
2012-09-21 12:44:19 -07:00
John Spurlock
2250550187 Merge "Additions to Dream public api." into jb-mr1-dev 2012-09-21 12:28:35 -07:00
Romain Guy
4187f92892 Merge "API REVIEW: Undeprecate Location.dump() Bug #7173109" into jb-mr1-dev 2012-09-21 11:20:58 -07:00
Romain Guy
8a624ef0fe API REVIEW: Undeprecate Location.dump()
Bug #7173109

Change-Id: Ia2f4a5b6255dae7ace4702f7d66ec30a077c9c79
2012-09-21 11:20:00 -07:00
Glenn Kasten
43e5916e67 am d86077c3: Merge "Expose android.media.AudioManager.getProperty()" into jb-mr1-dev
* commit 'd86077c3792ca03f004376d81e449a3ecdaa5e8b':
  Expose android.media.AudioManager.getProperty()
2012-09-21 11:04:39 -07:00
Bjorn Bringert
45b07b9427 Merge "Add intents to open text and video from search." into jb-mr1-dev 2012-09-21 10:30:20 -07:00
Dan Morrill
466bd63681 Merge "New method returning user metadata." into jb-mr1-dev 2012-09-21 09:53:57 -07:00
John Spurlock
d5c582c494 Additions to Dream public api.
- lightsOut() -> setLightsOut(boolean)
   (deprecated lightsOut, will remove once all baked-in dreams are updated)
 - Added ability to keep the screen bright (default = false).
 - Lights out is now true by default.
 - Consistent setters(setXxx) + getters(isXxx) for
   interactive, lightsOut, fullscreen, and screenBright dream attributes.
   Can set attributes at any time (even before window is created).
 - Fleshed out javadocs for public api.
 - Reordered things a bit.
 - Added example of manifest dream declaration ready for copypasta.
 - Removed unused action constant, added category constant.

Bug:7172816
Bug:7111868
Change-Id: I721db7a1a5e5ad047a3723b4d5141ef53b0970af
2012-09-21 12:37:11 -04:00
Daniel Sandler
0887711d0f Merge "Add Notification.Builder.setShowWhen(boolean)." into jb-mr1-dev 2012-09-21 07:30:43 -07:00
Florian Uunk
b1ac72b54b Add intents to open text and video from search.
We're adding support for searching for text (books, magazines) and video
(tv, movies).

Bug: 7208141
Change-Id: I19dd2f745518a96b22b02a29c1ab9a89d53cc0cc
2012-09-21 15:15:04 +01:00
Wu-cheng Li
edc1a2bbc5 Unhide android.provider.MediaStore.ACTION_IMAGE_CAPTURE_SECURE
bug:7141738
Change-Id: If0109671a072e978501e238fe3d7554693a92157
2012-09-21 19:04:24 +08:00
Jim Miller
8d9c1acb75 am 15fccd19: am 3e87eafc: Merge "Fix the build." into jb-mr1-dev
* commit '15fccd19a04cfa763ceb6d0b5e4781ac5d77cecc':
  Fix the build.
2012-09-20 22:36:54 -07:00
Jim Miller
e5de9919b4 Fix the build.
Change-Id: I80e2c915ba4c10dcb53b6a21152dc787e16d9e8f
2012-09-20 21:57:46 -07:00
John Reck
6a05111556 am 45e84330: am e6ff4784: Merge "Use less static synchronized" into jb-mr1-dev
* commit '45e843304f6f60e45d4371ce637e2fa442f4f28a':
  Use less static synchronized
2012-09-20 20:27:53 -07:00
Dan Morrill
e4ab16ad98 New method returning user metadata.
Change-Id: Ic1a42cf54152fe2e6bcd01b1bd9f1edb77d1710e
2012-09-20 20:25:55 -07:00
John Reck
e6ff47840f Merge "Use less static synchronized" into jb-mr1-dev 2012-09-20 16:55:40 -07:00
John Reck
9f9d34552f Use less static synchronized
Bug: 6482144

Change-Id: I86161e3298101c10a112add406615001561e649e
2012-09-20 15:25:16 -07:00
Alon Albert
0a9a219c96 Add columns to CalendarContract
isPrimary to Calendars
        /**
         * Is this the primary calendar for this account. If this column is not explicitly set, the
         * provider will return 1 if {@link Calendars#ACCOUNT_NAME} is equal to
         * {@link Calendars#OWNER_ACCOUNT}.
         */

isOrganizer to Events
        /**
         * Are we the organizer of this event. If this column is not explicitly set, the provider
         * will return 1 if {@link #ORGANIZER} is equal to {@link Calendars#OWNER_ACCOUNT}.
         * Column name.
         * <P>Type: STRING</P>
         */

Bug: 6888477
Change-Id: Ibc2b3903bc4a18fc1f0d52c1f8c897e2bac0c0d4
2012-09-20 15:21:11 -07:00
Glenn Kasten
1d824dfdda am 27001b52: am d86077c3: Merge "Expose android.media.AudioManager.getProperty()" into jb-mr1-dev
* commit '27001b528e14e6fbfa9de67d1224f4bd96af290a':
  Expose android.media.AudioManager.getProperty()
2012-09-20 13:01:12 -07:00
Eric Laurent
2bb7e677b6 am 13bd3ed4: am f9fac2c5: Merge "Add multi user volume management" into jb-mr1-dev
* commit '13bd3ed4796fae13f0daaa8ce062fdd8effec737':
  Add multi user volume management
2012-09-20 13:00:55 -07:00
Eric Laurent
c08870e946 am f9fac2c5: Merge "Add multi user volume management" into jb-mr1-dev
* commit 'f9fac2c5fe3f304ee866b1afc3191d36835e96bd':
  Add multi user volume management
2012-09-20 12:51:05 -07:00
Glenn Kasten
d86077c379 Merge "Expose android.media.AudioManager.getProperty()" into jb-mr1-dev 2012-09-20 12:45:45 -07:00
Glenn Kasten
62796aac59 Expose android.media.AudioManager.getProperty()
Also fix minor documentation errors.

Bug: 6635041
Change-Id: I6bbbf1b7c5ab705ac374436ea0c098cb3c27fd4a
2012-09-20 12:28:20 -07:00
Eric Laurent
f9fac2c5fe Merge "Add multi user volume management" into jb-mr1-dev 2012-09-20 11:18:17 -07:00
John Spurlock
5d514eb468 am e0de5bff: Merge "Fire "dreaming started" and "dreaming stopped" broadcasts." into jb-mr1-dev
* commit 'e0de5bfff2e74ee566ac2d053052de09aa25e54b':
  Fire "dreaming started" and "dreaming stopped" broadcasts.
2012-09-20 06:24:20 -07:00
John Spurlock
1b03ae850c am 03b80dc8: am e0de5bff: Merge "Fire "dreaming started" and "dreaming stopped" broadcasts." into jb-mr1-dev
* commit '03b80dc8e914f1651ea60f7b6172e8293ac765c5':
  Fire "dreaming started" and "dreaming stopped" broadcasts.
2012-09-20 06:18:10 -07:00
Chet Haase
971405797f Handle requestLayout() calls during layout
Calling requestLayout() during a layout pass is inadvisable, but
happens often enough in applications (especially when it occurs in
very indirect means that the application may not easily be able to
control) that we need to handle the situation without breaking. In particular,
applications that have run across this problem have had artifacts which are
difficult to debug (like things just not showing up on the screen) and
also difficult to fix. One of the side-effects of the problem is that it
leaves the view hiearchy in an unpredictable state where some views have
requested layout and are waiting to be layed out while the root view has
not received those requests, so it is never calling layout on those views.

The fix is to try to do the 'right' thing, while avoiding getting into
an inifinite loop (which could result from calling layout, which calls requestLayout(),
which causes another layout, which ...). The solution is two-tier: we handle
all requests that happen during layout by delaying them until after the current
layout is done. We then process those requests and call layout again.
If we receive more requests during that second layout, we post them to the
next frame, to allow us to finish the current one.

Issue #7155974 handle requestLayout() during layout more robustly

Change-Id: I9d13c405be28a19c86add22210e69817ddddaf8b
2012-09-20 06:05:05 -07:00
Jim Miller
48b9b0d068 Make DPM API for disabling keyguard widgets more generic
This change renames the widget-specific API to be more generic
to allow further disabling of keyguard-specific customizations
in the future.  Currently only allows disabling widgets and the
secure camera but can now easily be extended to disable other
features we add.

Fixes bug: 7021368

Change-Id: I3934cc2e7c64e0c6d511efb86980fc38a849708d
2012-09-19 23:44:45 -07:00
Narayan Kamath
ec0e97fe7a am 40c5a7a6: am 5d1a870a: Merge "Add APIs to enable SNI and session tickets on sockets." into jb-mr1-dev
* commit '40c5a7a6e14447bbe66e6daeca7e992bcf200012':
  Add APIs to enable SNI and session tickets on sockets.
2012-09-19 15:19:38 -07:00
Jason Sams
f5f8ee13ed am dd2f703d: am 2d95a33d: Merge "Fix build. Missed current.txt in previous checkin." into jb-mr1-dev
* commit 'dd2f703df5ecb27de07279f28bbfc7ca0dabc3a0':
  Fix build.  Missed current.txt in previous checkin.
2012-09-19 15:18:36 -07:00
John Spurlock
f4f6b4c8b0 Fire "dreaming started" and "dreaming stopped" broadcasts.
Dream manager now fires broadcast intents when entering + exiting
dreamland (except when testing).

Power manager can now listen for dreams ending, using polling only
as a backstop.

Also:
 - Bullet-proof dream-manager/dream against known failure modes
 - Add new read/write dream permissions
 - Refactor dream-manager to delegate work + state management into
   a new DreamController class, via a handler

Bug:6999949
Bug:7152024
Change-Id: I986bb7812209d8c95ae1d660a5eee5998a7b08b1
2012-09-19 17:36:50 -04:00
Eino-Ville Talvala
f7c6c5ad64 NEW_API: Add android.hardware.Camera.CameraInfo#canDisableShutterSound
Allow applications to check if the camera shutter sound can be
disabled.

Bug: 7172643
Change-Id: I3e9184325d3676b24830cc5418ebca8dcade8697
2012-09-19 14:31:26 -07:00
Eric Laurent
bc0fab1fc2 Add multi user volume management
Notification and Alarm volumes are per user: they are saved and restored
when the foreground user changes.
Media volume is global: it is still saved and restored per user for
implentation reasons but is copied from one user to the next to ensure
media playback volume continuity when switching users.

Ringer mode (silent, vibrate...) is now a global setting.

Bug 7128886.

Change-Id: I9f4f5a0a3985552bca61c2cc3bbe5a144db755a6
2012-09-19 14:16:08 -07:00
Narayan Kamath
7047ea7568 am 5d1a870a: Merge "Add APIs to enable SNI and session tickets on sockets." into jb-mr1-dev
* commit '5d1a870a25f7495755432a42cf8c81818dc369fa':
  Add APIs to enable SNI and session tickets on sockets.
2012-09-19 05:51:22 -07:00