4171 Commits

Author SHA1 Message Date
Dianne Hackborn
d913cf1859 Merge "New API level 17 for JB MR1." into jb-mr1-dev 2012-07-30 18:34:36 -07:00
Dianne Hackborn
435cdb4604 New API level 17 for JB MR1.
Change-Id: If71ce3b521fe17578feb5c2a2f7fd65696720554
2012-07-30 17:37:04 -07:00
James Dong
7267babae3 Merge "Enabled application using VideoView to get information events from MediaPlayer" into jb-mr1-dev 2012-07-30 13:37:08 -07:00
Jeff Brown
155fc70252 Flatten power manager wake lock constants.
We only support a few basic kinds of wake locks.  Rather than
pretend that we could support other weird combinations of features,
just get rid of the feature bits.

Deprecated other wake lock types.  We really want to encourage
developers to use FLAG_KEEP_SCREEN_ON instead of managing
their own wake locks, even though its behavior is not
exactly equivalent.

Change-Id: Idfeb0bc6efff0ef2736e47f72a06e69e5a16996e
2012-07-27 18:14:54 -07:00
James Dong
a0ba79473b Enabled application using VideoView to get information events from MediaPlayer
o related-to-bug: 6851811

Change-Id: I78a73a33b6ddfaea76f2ba13b6990c153fb696c6
2012-07-27 18:05:11 -07:00
Fabrice Di Meglio
f2c278551c Fix the build
- update current.txt

Change-Id: I98d6cfbe71564dcded8d8d757dd183ba678d4184
2012-07-27 14:45:44 -07:00
Fabrice Di Meglio
a4c1030870 Add removeRule() to RelativeLayout LayoutParams
- add this helper API as there are already several example of
developers doing it "by hand"

Change-Id: Icd15edfd75eb47de1f90f847b263b4d513c13810
2012-07-27 13:16:42 -07:00
Wink Saville
3caf66d2ea Unhide the new location API's
Change-Id: I41cc89998b8bd1e6686ea30475ab8905a133e312
2012-07-26 11:48:12 -07:00
Jeff Brown
fa25bf5382 Add display manager skeleton.
The purpose of this change is to remove direct reliance on
SurfaceFlinger for describing the size and characteristics of
displays.

This patch also starts to make a distinction between logical displays
and physical display devices.  Currently, the window manager owns
the concept of a logical display whereas the new display
manager owns the concept of a physical display device.

Change-Id: I7e0761f83f033be6c06fd1041280c21500bcabc0
2012-07-25 18:56:16 -07:00
Fabrice Di Meglio
b8a3942527 Merge "Introduce listPreferredItemPaddingStart/listPreferredItemPaddingEnd" 2012-07-24 17:21:56 -07:00
Fabrice Di Meglio
f966ed949c Introduce listPreferredItemPaddingStart/listPreferredItemPaddingEnd
- see bug #5429822 UI should be mirrored for RTL locales (Arabic, Hebrew, farsi)

Change-Id: I7376b3c350ae9ce5034f3aac7105f61963c30c2d
2012-07-24 15:56:24 -07:00
James Dong
f80afd795e Merge "Added MEDIA_INFO_VIDEO_RENDERING_START as an informational event" 2012-07-24 12:29:13 -07:00
Fabrice Di Meglio
b6a45cb928 Merge "Make RelativeLayout aware of layout direction" 2012-07-24 11:05:48 -07:00
Fabrice Di Meglio
f443f98e7f Make RelativeLayout aware of layout direction
- see bug #5429822 UI should be mirrored for RTL locales (Arabic, Hebrew, farsi)

Change-Id: Ica92841fa0c13c25fcf89c4700b0771eec4fd6d7
2012-07-23 16:36:41 -07:00
Mathias Agopian
16a4003b11 Merge "updated gles20 bindings, fixes broken methods" 2012-07-23 16:25:33 -07:00
James Dong
15a89e6b48 Added MEDIA_INFO_VIDEO_RENDERING_START as an informational event
o MEDIA_INFO_VIDEO_RENDERING_START indicates that the player just pushed the very first video frame
  of a video source for rendering.

Change-Id: I32dad93990f5d48b70fc79d841ca3ce3b1af4027
related-to-bug: 6851811
2012-07-23 15:47:27 -07:00
Philip Milne
bb877ad4e5 Merge "Simple MVC based binding mechanism for android controls." 2012-07-20 15:19:24 -07:00
Philip Milne
989709a973 Simple MVC based binding mechanism for android controls.
Change-Id: I80fe18e0e15f8a840d558de9863650505bd5fb00
2012-07-20 15:14:45 -07:00
Teng-Hui Zhu
0e5b160418 add a webview API to support media play without user gesture
bug:6806306

webkit change: https://android-git.corp.google.com/g/#/c/208568/
Change-Id: Ic70e5d3f152a7e8d8fdfa1d6f89f96c8cd3c7075
2012-07-20 13:33:52 -07:00
Nick Pelly
2eeeec248a Improve Location object.
Add getElapsedRealtimeNano():

Currently Location just has getTime() and setTime() based on UTC time.
This is entirely unreliable since it is not guaranteed monotonic.
There is a lot of code that compares fix age based on deltas -
and it is all broken in the case of a system clock change. System
clock can change when switching cellular networks (and in some
cases when switching towers).

Document the meaning of getAccuracy():
It is the horizontal, 95% confidence radius.

Make some fields mandatory if they are reported by a LocationProvider:

All Locations returned by a LocationProvider must include at the
minimum a lat, long, timestamps, and accuracy. This is necessary
to perform fused location. There are no public API's for applications
to feed locations into a location provider so this should not cause
any breakage.

If a LocationProvider does not fill in enough fields on a Location
object then it is dropped, and logged.

Bug: 4305998
Change-Id: I7df77125d8a64e174d7bc8c2708661b4f33461ea
2012-07-20 10:07:07 -07:00
Nick Pelly
95f1158908 Introduce SystemClock#elapsedRealtimeNano.
Change-Id: I47e1b14d45c5321f959d46e1805f86aafd72f5d4
2012-07-20 09:51:09 -07:00
Thomas Tafertshofer
dd06946252 updated gles20 bindings, fixes broken methods
this adds correct versions of the broken GLES20 methods
glGetShaderSource, glGetActiveAttrib and glGetActiveUniform.
the old functions are still there and need to be @hide later.

Bug: 6006380
Change-Id: I8127a77c4b89aa8a9a54bea88774077535e2139d
2012-07-19 17:04:47 -07:00
Mathias Agopian
73664e500a Merge "EGL 1.4 API without @hide" 2012-07-18 18:30:04 -07:00
Adam Powell
a9108a217e Add View#generateViewId; make RadioGroup use it
Bug 6448164

generateViewId provides a way for applications to generate opaque ID
values suitable for use with View#setId that will not collide with
values generated by aapt for R.id.

Fix a bug where RadioGroup assumes object hash codes will always be
positive.

Change-Id: I3e2870cd672d6061bb465128f428c81aeef0c44b
2012-07-18 14:27:00 -07:00
fredc
0f42037eb7 Non persistent adapter service
Change-Id: Ib13d5c77416e58161df0e04d7a15ec0dddbde8b5

Conflicts:

	core/java/android/bluetooth/BluetoothInputDevice.java

Conflicts:

	core/java/com/android/internal/app/ShutdownThread.java
	services/java/com/android/server/SystemServer.java

Conflicts:

	services/java/com/android/server/SystemServer.java
	services/java/com/android/server/pm/ShutdownThread.java
2012-07-16 21:20:54 -07:00
Jeff Brown
3cc321ecf5 Remove dithering support.
The dithering flag is no longer implemented in Surface Flinger
so this is all dead code.

Change-Id: I74c0e452923207e5b7cfe0eeca9457e5cb990947
2012-07-16 16:17:25 -07:00
Thomas Tafertshofer
9b18b51590 EGL 1.4 API without @hide
Change-Id: If03d23082b011aaba41594712601495dcbd70f6a
2012-07-13 17:44:00 -07:00
Romain Guy
3849f93b3c Add Bitmap.isPremultiplied()
This change also adds extra information in the documentation about
premultiplied values.

Change-Id: I51aacb8696340d23354ebf6d7284605d1a790b69
2012-07-09 13:52:40 -07:00
Romain Guy
da7ba8ff45 Fix the build
Change-Id: Iee3be26dd0167ddd80dd11c4bcbf21f6684d2a68
2012-07-03 18:36:01 -07:00
Dianne Hackborn
e6c2d62efb am 9906e784: am 17990395: Merge "Fix issue #6717667: expanded notification actions don\'t work on the lock screen" into jb-dev
* commit '9906e784faca2cc8388a04fdc544722ea93d51be':
  Fix issue #6717667: expanded notification actions don't work on the lock screen
2012-06-25 18:17:15 -07:00
Dianne Hackborn
9906e784fa am 17990395: Merge "Fix issue #6717667: expanded notification actions don\'t work on the lock screen" into jb-dev
* commit '17990395bc62f8ce1bae4f1880899f231a8e613b':
  Fix issue #6717667: expanded notification actions don't work on the lock screen
2012-06-25 17:37:15 -07:00
Dianne Hackborn
1927ae8a56 Fix issue #6717667: expanded notification actions don't work on the lock screen
FLAG_ACTIVITY_CLOSE_SYSTEM_DIALOGS was a mistake.

Instead, and the infrastructure for the status bar to take care
of closing and hiding things itself when you press these buttons,
just like it does for the main Intent of the notification.

Bug: 6717667
Change-Id: I1b22186e0cedc05f46a1a3ec78053a72afaf61b1
2012-06-25 14:28:48 -07:00
Jean-Baptiste Queru
41e6e0c49f am c34188a9: resolved conflicts for merge of f8f76d52 to jb-dev-plus-aosp
* commit 'c34188a95405526416325604386af4f48ba20918':
  Add the possibility to modify the View focus rect
2012-06-23 07:13:25 -07:00
Jean-Baptiste Queru
c34188a954 resolved conflicts for merge of f8f76d52 to jb-dev-plus-aosp
Change-Id: I83beeb45320de2c3fc3a00c2f5cd86a17ac1dc9f
2012-06-23 07:08:59 -07:00
Jean-Baptiste Queru
f8f76d52a7 Merge "Add the possibility to modify the View focus rect" 2012-06-23 05:52:53 -07:00
Jeff Brown
dc6f8b2b8c Merge "Deprecate DatabaseUtils.InsertHelper." 2012-06-22 15:34:33 -07:00
Jeff Brown
b33eb4e32a Deprecate DatabaseUtils.InsertHelper.
This class does not offer any advantages over SQLiteStatement
and just makes code more complex and error-prone.

Documented that the class is not thread-safe.

Removed a potential deadlock in insert() and replace() caused
by the insertInternal() method being synchronized in the case
where the class was being used concurrently (woe to you!).

Thread A would start a transaction.
Thread B would call insertInternal() and acquire the object monitor,
but block because it could not obtain the db connection because
thread A is holding onto it.
Thread A would call insertInternal() and block because Thread B
was holding the object monitor.
Deadlock.

Changed this code to use a transaction instead of a lock,
which provides the necessary mutual exclusion guarantee without
the potential for a deadlock.  Even so, the class really isn't
thread safe.

Bug: 6625094
Change-Id: I51d9a15567a6f2bad6f25e550b48f8f6ffcab2a7
2012-06-22 15:24:26 -07:00
Chris Wren
bae2fe870a resolved conflicts for merge of 0a43f67e to master
Change-Id: I072b756bc501c7669593eff012b120905a2fd962
2012-06-21 16:46:14 -04:00
Daniel Sandler
0a43f67ef3 am 790024bf: Merge "Unhide new methods on RemoteViews and Notification." into jb-dev
* commit '790024bfe6dd2765dd5e552053797459aab72da1':
  Unhide new methods on RemoteViews and Notification.
2012-06-21 11:52:34 -07:00
Daniel Sandler
790024bfe6 Merge "Unhide new methods on RemoteViews and Notification." into jb-dev 2012-06-21 06:04:43 -07:00
Adam Powell
a08e6881c5 am ed044cda: am 09829b71: Merge "Expand volume APIs for MediaRouter" into jb-dev
* commit 'ed044cda8f6a7600923eecdec682c449f86e0429':
  Expand volume APIs for MediaRouter
2012-06-20 22:45:09 -07:00
Adam Powell
ed044cda8f am 09829b71: Merge "Expand volume APIs for MediaRouter" into jb-dev
* commit '09829b71de3a84cb9d1bc0d8aad78dd16daadddf':
  Expand volume APIs for MediaRouter
2012-06-20 22:35:44 -07:00
Adam Powell
8e37a85bf3 Expand volume APIs for MediaRouter
Allow applications to set a requested volume level on RouteInfo
objects. If requested for a user route, the app-supplied callback will
be invoked to perform actual volume adjustment.

Change-Id: I856990a0da7292492aa15e6562dbc3d055b848a0
2012-06-20 22:19:29 -07:00
Daniel Sandler
064f9907c9 Unhide new methods on RemoteViews and Notification.
Change-Id: I0cbc270d9d7e9e728482c3b10650a32589636c9d
2012-06-21 00:15:01 -04:00
Jean-Michel Trivi
ecab2aab19 am e44440f4: am bd6b1820: Merge "Unhide new API in android.media.MediaRouter for remote playback" into jb-dev
* commit 'e44440f40c6b005dce2eba1b37b3cabe97133152':
  Unhide new API in android.media.MediaRouter for remote playback
2012-06-20 16:46:55 -07:00
Jean-Michel Trivi
e44440f40c am bd6b1820: Merge "Unhide new API in android.media.MediaRouter for remote playback" into jb-dev
* commit 'bd6b1820d931ef11fc7fc5b8571a8265c1ed4994':
  Unhide new API in android.media.MediaRouter for remote playback
2012-06-20 16:43:55 -07:00
Jean-Michel Trivi
2cd5d25378 Unhide new API in android.media.MediaRouter for remote playback
Expose new functionality for handling remote volume in:
 android.media.MediaRouter.RouteInfo
 android.media.MediaRouter.UserRouteInfo
 android.media.MediaRouter.VolumeCallback

Change-Id: I8fd9c92be606364599e65939f318e11c2860bab9
2012-06-20 14:36:23 -07:00
Adam Powell
00130f13f0 Fix build; un-pin attribute destined for API 17 or later to prevent
further automerge antics.

Change-Id: I547dc0abd8db09e8aefc89123e4fb7f73eea712b
2012-06-19 20:06:53 -07:00
Adam Powell
b10345898c am da828803: am 2dde147b: Merge "Add an XML attribute for controlling which route types a MediaRouteButton in a layout will alter." into jb-dev
* commit 'da8288037cff76367c3088adaa174ddb27bf55c2':
  Add an XML attribute for controlling which route types a MediaRouteButton in a layout will alter.
2012-06-19 19:22:44 -07:00
Adam Powell
da8288037c am 2dde147b: Merge "Add an XML attribute for controlling which route types a MediaRouteButton in a layout will alter." into jb-dev
* commit '2dde147b28684fc32f03ad748af8eb87d5408c7c':
  Add an XML attribute for controlling which route types a MediaRouteButton in a layout will alter.
2012-06-19 19:20:05 -07:00