136205 Commits

Author SHA1 Message Date
Yohann Roussel
7d66d76fbb Merge "Fix ANR in multidexlegacytestservices." 2014-05-22 14:52:03 +00:00
Christoph Studer
36a9acb7eb Merge "SysUI: Use SBN keys instead of IBinder keys" 2014-05-22 14:19:55 +00:00
George Mount
b284e30b40 Merge "fixed mIsReturning initialized too late." 2014-05-22 14:04:33 +00:00
Christoph Studer
540b01e024 SysUI: Use SBN keys instead of IBinder keys
In preparation of migrating to NotificationListenerService,
remove dependence on IBinder keys for notifications and switch
to SBN.getKey() instead.

Bug: 15131411
Change-Id: Ic272e4a05fde6481c734144c5b34c49b2f021649
2014-05-22 15:48:30 +02:00
Ruben Brunk
13ace57274 Merge "Javadoc fix." 2014-05-22 13:31:09 +00:00
Ruben Brunk
3e7fe434d0 Javadoc fix.
Change-Id: I4644ec782e636104fc06a27716f2fd224003e8d2
2014-05-22 06:30:16 -07:00
Robert Greenwalt
07fb5a884f Merge "Move dis/enable of mobile data to Telephony" 2014-05-22 13:22:35 +00:00
Adrian Roos
4d5bf5ee5e Merge "Only send notification activity intents after dismissing Keyguard" 2014-05-22 13:03:51 +00:00
Adrian Roos
995757e330 Merge "Remove dead TrustListeners" 2014-05-22 13:03:42 +00:00
Jorim Jaggi
aa7707ddc4 Merge "Fix weird state with QS expansion." 2014-05-22 12:27:51 +00:00
Jorim Jaggi
9cd731a013 Fix weird state with QS expansion.
Bug: 15147023
Change-Id: Ief32ee756e22b330e0fb63b0dab64aa83ffb9124
2014-05-22 14:26:06 +02:00
Christoph Studer
08a7b76441 Move more packages to framework2
Change-Id: Ib8e3c915479eb5bc029256934d522f3714071bc2
2014-05-22 14:22:26 +02:00
Yohei Yukawa
4fae8e165b Merge "Remove unnecessary internal lock" 2014-05-22 11:07:14 +00:00
Yohei Yukawa
5a647b69be Remove unnecessary internal lock
Previously, InputMethodSubtypeSwitchingController has relied on
its own internal lock for #getNextInputMethod and
class has to be invalidated whenever
InputMethodManagerService#mMethodMap is updated, any method of
InputMethodSubtypeSwitchingController should be called under
the global lock of InputMethodManagerService#mMethodMap.

As a consequence, we can conclude that
InputMethodSubtypeSwitchingController does not need its own
internal lock.

This CL also adds additional synchronization blocks into
the constructor of InputMethodManagerService to address the
existing inconsistency that methods with *Locked suffix are
called without the lock actually.

BUG: 7043015
Change-Id: I9d4d3d7232c984432185c10c13fb726a6158cac8
2014-05-22 18:18:02 +09:00
Yohei Yukawa
350c73fb40 Merge "Overrides ImeSubtypeListItem#toString" 2014-05-22 08:21:21 +00:00
Yohei Yukawa
1c63079b55 Overrides ImeSubtypeListItem#toString
This makes it easy to debug.

BUG: 7043015
Change-Id: Ic389fc20d417c01196e06046f5259ad56a7aca6c
2014-05-22 16:15:35 +09:00
Alan Viverette
840ff4ae5b Merge "End-align alert dialog buttons to avoid layout bug on tablet" 2014-05-22 06:51:27 +00:00
Alan Viverette
db2ed8fdd1 Merge "Move setTint into Drawable, unhide getDirtyBounds on Drawable" 2014-05-22 06:51:10 +00:00
Alan Viverette
e7772d313b Move setTint into Drawable, unhide getDirtyBounds on Drawable
BUG: 15089957
Change-Id: Ib622ba24b3f4bcf430e1d524895ac5cb104a232e
2014-05-21 23:50:03 -07:00
Ruben Brunk
94520c7460 Merge "camera2: Add HAL1 compatibility shim skeleton." 2014-05-22 06:08:56 +00:00
Lorenzo Colitti
521d8cdae0 Merge "Make the EthernetManager available." 2014-05-22 05:55:56 +00:00
Lorenzo Colitti
e2c7a76464 Merge "Add an EthernetManager." 2014-05-22 05:54:57 +00:00
Todd Poynor
d0045026b6 BatteryProperty: Fix ENERGY_COUNTER property id
Change-Id: I0490c0d589c637744c3db73596d34c1c4772074b
2014-05-22 05:53:09 +00:00
Jeff Sharkey
9f561c367b Merge "Support for renaming documents." 2014-05-22 05:45:29 +00:00
Dan Sandler
842dd77bb9 Introducing Notification.MediaStyle.
Allows you to create a nice music player with all the
trimmings, including:

  * up to 5 actions in the bigContentView, styled as
    transport control buttons
  * up to 2 of those actions in the 1U (!)
  * a nice custom progress bar
  * a tinted background (taken from your Notification.color)
  * a special place to put your MediaSessionToken

Bug: 15147533
Change-Id: Ic20a2b369eb6c5fe4853987a44ffd9bace720c7f
2014-05-22 01:36:46 -04:00
Jeff Sharkey
b7e1255d5c Support for renaming documents.
DocumentsProviders can mark documents as supporting rename, and they
have the opportunity to change the DOCUMENT_ID as a side effect of
the rename.  This supports providers that embed the display name
into DOCUMENT_ID.  Issues a URI permission grant to the new document,
if any.

Adds renaming support to platform ExternalStorageProvider.  Also
adds directory deletion support.

Bug: 12350110
Change-Id: Ica4b1ae6769ee994f70f6b6b2402213eebd064e0
2014-05-21 22:24:45 -07:00
Alan Viverette
6c60c0fa85 End-align alert dialog buttons to avoid layout bug on tablet
Also removes default button elevation since we don't support
inset outlines yet.

BUG: 14316038
Change-Id: Iba3afa8febb0ac081dd0c62e0a0224e52b306705
2014-05-21 22:00:31 -07:00
Jesse Hall
7de53d693e Merge changes Iad983802,Icda236ee
* changes:
  opengl: Fix #include style in generated JNI code
  opengl: Un-hide GLES31 and GLES31Ext classes
2014-05-22 04:41:19 +00:00
Jesse Hall
d754583d1d Merge "opengl: Add GLES31 and GLES31Ext classes" 2014-05-22 04:39:48 +00:00
Jinsuk Kim
9302a733b0 Fix broken build
Change-Id: Icff98663842482149d8c5c5371327121a1adff3d
2014-05-22 04:35:08 +00:00
Robert Greenwalt
47eecf0330 Move dis/enable of mobile data to Telephony
ConnectivityService doesn't do this anymore.

bug:15077247
Change-Id: I3208c91b2c0369b594987f39ca29da7478435513
2014-05-21 21:34:05 -07:00
Jose Lima
14e8a79c95 Merge "Added Notification.EXTRA_BACKGROUND_IMAGE_URI" 2014-05-22 04:30:37 +00:00
vandwalle
66518679f4 Merge "remember last supplicant failure" 2014-05-22 04:29:06 +00:00
vandwalle
3a74e2ef16 remember last supplicant failure
Change-Id: I644d32d08491ea0c32cb36820d2720da027a49d0
2014-05-21 21:21:00 -07:00
Jesse Hall
9626f8203a opengl: Fix #include style in generated JNI code
Bug: 15028495
Change-Id: Iad98380264c349fddf3b88df0c3a997d94c84fc8
2014-05-21 21:04:20 -07:00
Jesse Hall
7ab63acdd0 opengl: Add GLES31 and GLES31Ext classes
Bug: 15028495
Change-Id: Ie967c1938060edb42864dd48efa668ae7bf5cd76
2014-05-21 21:04:20 -07:00
Jesse Hall
61b2dfe224 opengl: Un-hide GLES31 and GLES31Ext classes
Bug: 15028495
Change-Id: Icda236ee12a06ef2eb9902253d272dee2b61f6ef
2014-05-21 21:04:20 -07:00
John Spurlock
fc95f678b8 Merge "Fix header clipping bug on rotate to landscape." 2014-05-22 04:03:21 +00:00
John Spurlock
d9792b7d31 Fix header clipping bug on rotate to landscape.
Since the header view's manual clipping is a function
of its width, we need to update it whenever the width
changes.

onConfigurationChanged is too early, so wait until the width
actually changes before updating the clip.

Change-Id: I017448f7e1c2d4bbcf7c93a6a47ad3073c43f5d5
2014-05-21 23:54:27 -04:00
Jose Lima
e9e3b3b919 Added Notification.EXTRA_BACKGROUND_IMAGE_URI
Added new EXTRA field to notification to be used to specify
an image that can be displayed to the user when the notification
is selected.

Change-Id: I3f79cf363d885fe2742e74a7d29d7e22ea1e6f60
2014-05-21 20:52:57 -07:00
vandwalle
aaddbe20e3 Merge "make verbose logging a wifimanager hidden API" 2014-05-22 03:37:01 +00:00
Jeff Brown
f26d4abecd Merge "Switch to using int stream instead of AudioAttributes" 2014-05-22 03:24:48 +00:00
vandwalle
5fb7bf5fdb make verbose logging a wifimanager hidden API
Change-Id: I325f6ea9f1a6c16dbee9aca641cad7ed3bcd7d2c
2014-05-21 20:24:35 -07:00
Jinsuk Kim
dbbceffd9b Merge "Add feature actions for HDMI-CEC playback device" 2014-05-22 03:19:23 +00:00
Baligh Uddin
0c88b340ac am 15685632: (-s ours) am adb0a906: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '15685632e0e62651ccfb6bfa2013afe715768126':
  Import translations. DO NOT MERGE
2014-05-22 03:17:17 +00:00
Baligh Uddin
2c2bbfb9c3 am 48137740: (-s ours) am b9c1e5a8: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '48137740b8f0af0efad73c052256af14e1825944':
  Import translations. DO NOT MERGE
2014-05-22 03:17:12 +00:00
Baligh Uddin
edf10cc26d am 25fe41b8: (-s ours) am 74e7e2d8: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '25fe41b8e0a0e7e80bcc533b5087d63767faa689':
  Import translations. DO NOT MERGE
2014-05-22 03:17:07 +00:00
Baligh Uddin
aa587a922f am a83b42cb: (-s ours) am 5938757f: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit 'a83b42cb402cb5856e7490f5190c982a9f0575d8':
  Import translations. DO NOT MERGE
2014-05-22 03:17:02 +00:00
Baligh Uddin
3df799a048 am b8cc0ed8: (-s ours) am 675b4871: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit 'b8cc0ed838c8cf303f1e8063db865651627093da':
  Import translations. DO NOT MERGE
2014-05-22 03:16:57 +00:00
Baligh Uddin
15685632e0 am adb0a906: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit 'adb0a906dc71a0133b9345031dd88682e49a519a':
  Import translations. DO NOT MERGE
2014-05-22 03:11:14 +00:00