Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
137,209 Commits 3 Branches 0 Tags
8692fc68a413c7aca75f094bb02bcbabcc277c73
Commit Graph

37096 Commits

Author SHA1 Message Date
Jinsuk Kim
8692fc68a4 Stop publishing HdmiCecService, start publishing HdmiControlService 
HdmiCecService will soon be deprecated and replaced with HdmiControlService.
Stopped publishing the service, and turned the corresponding manager to
stub so that it will do nothing but print out a warning msg instead.

Will help the app transition to the new service in the meantime. Once
the migration is finished, will gut out all the HdmiCecService/
HdmiCecManager stuff.

Change-Id: Ic34a69c4fb99f4e5a2c8323538195204ab16a545
 2014-05-29 21:09:43 +00:00
Dongwon Kang
4792881e6f am 3dc91b99: Merge "Fix a typo on TvContract." into lmp-preview-dev 
* commit '3dc91b99281d53f414bb4db4bd2e5a61bbb86483':
  Fix a typo on TvContract.
 2014-05-29 20:27:17 +00:00
Dongwon Kang
ec80df818f Merge "Fix a typo on TvContract." into lmp-preview-dev 2014-05-29 20:23:53 +00:00
Adam Powell
7d330757d9 am ee1a3f16: Merge "Fix for setting Toolbar content descriptions" into lmp-preview-dev 
* commit 'ee1a3f1612cb69fe5567bf7cde2496a4774ab8ed':
  Fix for setting Toolbar content descriptions
 2014-05-29 19:27:17 +00:00
Adam Powell
2fd1d454b8 Merge "Fix for setting Toolbar content descriptions" into lmp-preview-dev 2014-05-29 19:23:48 +00:00
Adam Powell
8e5372fe93 Fix for setting Toolbar content descriptions 
Allow resid 0 as a null content description.

Change-Id: I0663feac229a77d5efffece2bd686de4ee99d840
 2014-05-29 12:16:09 -07:00
Paul Jensen
2d6f265d00 Implement bind-to-network functionality of android.net.Network. 
This is implemented by calling through to netd_client.
Included are functions to bind-to-network-for-process strictly for DNS to
facilitate startUsingNetworkFeature() reimplementation.

bug: 13885501

Change-Id: Ib22c7d02ea81d251bdfeeb0f64a47ce32eefcb1b
(cherry picked from commit dbf76f898f1f57eb74722358087c926d2f529bda)
 2014-05-29 18:53:57 +00:00
George Mount
fffa58ef3e am 225f5d1c: Merge "Moved shared element motion to be in called Activity." into lmp-preview-dev 
* commit '225f5d1c69395301f9782cc38714e5ca5db5e3d5':
  Moved shared element motion to be in called Activity.
 2014-05-29 18:20:22 +00:00
George Mount
eb61eb786a Merge "Moved shared element motion to be in called Activity." into lmp-preview-dev 2014-05-29 18:14:48 +00:00
Craig Mautner
7a18498559 am b5b37c2b: Merge "Add methods to coordinate unlock animation." into lmp-preview-dev 
* commit 'b5b37c2babe744acb002ed9b8556a9d9cd2202fc':
  Add methods to coordinate unlock animation.
 2014-05-29 16:52:13 +00:00
Craig Mautner
71ac80c46a Merge "Revert "Modify task navigation to return to recent tasks." DO NOT MERGE" into lmp-preview-dev 2014-05-29 16:51:24 +00:00
Craig Mautner
b9a6c8ad99 Revert "Modify task navigation to return to recent tasks." DO NOT MERGE 
This reverts commit 1a4e211e03f1f795d935058e27356a0e8bc5df7c.

Change-Id: Ia691b93347c7eb2395933e5a5ba385ea94e08d6f
 2014-05-29 16:50:59 +00:00
Craig Mautner
fdaaf91f35 Merge "Revert "Modify task navigation to return to recent tasks."" 2014-05-29 16:50:11 +00:00
Craig Mautner
719e621186 Revert "Modify task navigation to return to recent tasks." 
This reverts commit 19174878e25ebfd8806595f83df7bdea1d239c07.

Change-Id: I98db2c9aa975495c5828b3d16b8b45f515e6a5fa
 2014-05-29 16:49:41 +00:00
Craig Mautner
219d7a50fb Merge "Add methods to coordinate unlock animation." into lmp-preview-dev 2014-05-29 16:45:36 +00:00
Dongwon Kang
f95b1d8d53 Fix a typo on TvContract. 
Change-Id: I2558f4d463653c7e35de7dccb60189ee9eb0a307
 2014-05-29 09:40:11 -07:00
George Mount
c93ca16173 Moved shared element motion to be in called Activity. 
Bug 15198605

Change-Id: I07ce4f3366dbdc6957d789f724e49d260fe34faf
 2014-05-29 09:36:03 -07:00
Paul Lawrence
575510c48f Merge "DO NOT MERGE: Hide crypto consts from docs" into lmp-preview-dev 2014-05-29 16:07:27 +00:00
Paul Lawrence
fab7cbc9ce DO NOT MERGE: Hide crypto consts from docs 
@bug 15192967

Change-Id: I134b2cb2d2841bc101e63a8a4dbd86f7b7bdca14
(cherry picked from commit 81ab14fb19a2669aa54c1a333c807c22d5c41a8e)
 2014-05-29 16:03:43 +00:00
Paul Lawrence
b6102427ae Merge "Hide crypto consts from docs" 2014-05-29 14:43:09 +00:00
Yorke Lee
547d9b9b55 Merge "Unhide ContactsCount API" 2014-05-29 14:35:53 +00:00
Christopher Tate
12eefc9f00 am 45ebf5d1: Merge "Widget restore documentation tweaks" into lmp-preview-dev 
* commit '45ebf5d19b6fc410eaafe1804f265503f585f682':
  Widget restore documentation tweaks
 2014-05-29 09:43:13 +00:00
Dianne Hackborn
d3a5b916b1 am c2091a1f: Merge "Add system layer for voice interaction services." into lmp-preview-dev 
* commit 'c2091a1fbc463941b3e42db36e369124ac3c1013':
  Add system layer for voice interaction services.
 2014-05-29 09:42:56 +00:00
Griff Hazen
6b5f93e92b am cc212d35: am 339f437d: Additional doc fixes for WearableExtender 
* commit 'cc212d35aa611324e98aa2092c1ab588a0efe794':
  Additional doc fixes for WearableExtender
 2014-05-29 07:24:18 +00:00
Griff Hazen
cc212d35aa am 339f437d: Additional doc fixes for WearableExtender 
* commit '339f437dc3f7c474d9cf1f963819bab2596e6ad3':
  Additional doc fixes for WearableExtender
 2014-05-29 06:34:01 +00:00
Griff Hazen
ca48d35423 DO NOT MERGE Cherry-pick: Additional doc fixes for WearableExtender 
Change-Id: I3764e4d97c0007b905ff0f3eb553234668fd50e1
 2014-05-28 22:37:13 -07:00
Christopher Tate
2ddbbe7b94 Merge "Widget restore documentation tweaks" into lmp-preview-dev 2014-05-29 01:27:51 +00:00
Chris Craik
09daefbb9a am ec67c4b0: Merge "Make ViewPropertyAnimator correctly damage shadow receivers" into lmp-preview-dev 
* commit 'ec67c4b0ac8095c94c424a9fc37d7b11fa098ee9':
  Make ViewPropertyAnimator correctly damage shadow receivers
 2014-05-29 01:08:31 +00:00
Chris Craik
80d55ba8e2 am 9ecf9b12: Merge "Respect Z ordering in touch dispatch, software drawing" into lmp-preview-dev 
* commit '9ecf9b1292d547aebe4588f1051b22f9683e2149':
  Respect Z ordering in touch dispatch, software drawing
 2014-05-29 01:08:26 +00:00
Christopher Tate
c04e9aa916 Widget restore documentation tweaks 
- Fix broken Javadoc @see directives
- Linkify AppWidgetProvider in the documentation for the new
  ACTION_APPWIDGET_RESTORED broadcast
- Minor content edits

Bug 15022842

Change-Id: Ia7d4ad5be476c260492e1be5d83e21f6943a6847
 2014-05-28 17:56:53 -07:00
Zhijun He
d5a8d65b43 am 239ac054: Merge "Camera2: Update spec for thumbnail cropping behavior" into lmp-preview-dev 
* commit '239ac0541bf7e0fc8b301d077b40e3e52cf32161':
  Camera2: Update spec for thumbnail cropping behavior
 2014-05-29 00:42:32 +00:00
Dianne Hackborn
a923758d80 Merge "Add system layer for voice interaction services." into lmp-preview-dev 2014-05-29 00:18:25 +00:00
Dianne Hackborn
e30e02f5d9 Add system layer for voice interaction services. 
New window layer that voice interaction service windows
go in to.  Includes a new voice-specific content rectangle
that voice activities are placed in to.

Add specific animations for this layer, sliding down from
the top (though this can be customized by the voice interaction
service).

Also add the concept of activities running for voice interaction
services for purposes of adjusting the animation used for them,
again sliding from the top, but not (yet?) customizable by the
voice interaction service.

Change-Id: Ic9e0e8c843c2e2972d6abb4087dce0019326155d
 2014-05-28 17:16:51 -07:00
Jinsuk Kim
d618555e45 Merge "Fix a bug calling a wrong HDMI-CEC Binder API" 2014-05-28 23:17:22 +00:00
Chris Craik
c1073c3376 Merge "Make ViewPropertyAnimator correctly damage shadow receivers" into lmp-preview-dev 2014-05-28 23:16:14 +00:00
Chris Craik
b8a0913471 Merge "Respect Z ordering in touch dispatch, software drawing" into lmp-preview-dev 2014-05-28 23:12:57 +00:00
Yin-Chia Yeh
56c8711bc0 am b17e5f3d: Merge "Camera2: Fix wrong index in ColorSpaceTransform" into lmp-preview-dev 
* commit 'b17e5f3d9deeb3c80f4b45657897c138ff060bab':
  Camera2: Fix wrong index in ColorSpaceTransform
 2014-05-28 23:07:31 +00:00
Adam Powell
88e719fd3e am 49a4961e: Merge "Toolbar factoring and ActionBar functionality integration" into lmp-preview-dev 
* commit '49a4961efde042f4921393f59cff86c2b7889c71':
  Toolbar factoring and ActionBar functionality integration
 2014-05-28 23:07:25 +00:00
Zhijun He
f5fe63c35c Merge "Camera2: Update spec for thumbnail cropping behavior" into lmp-preview-dev 2014-05-28 22:49:31 +00:00
Jinsuk Kim
5ac6225ea3 Fix a bug calling a wrong HDMI-CEC Binder API 
Change-Id: I75e5de3ab820288f0fe6bebdc63d6dd680e18f8a
 2014-05-29 07:47:51 +09:00
Zhijun He
50f7243ca0 Camera2: Update spec for thumbnail cropping behavior 
Also update FULL capability spec (remove ZSL from the requirement list).

Bug: 15168075
Change-Id: I864baf35ffab9047b52facb29011682e724bbc9b
 2014-05-28 15:23:21 -07:00
Elliott Hughes
9149c7abb2 am a487fb77: am df0e9ed5: am 862be912: Merge "Updated Trace.h to recognize ATRACE_TAG_BIONIC." 
* commit 'a487fb77dff1a86fbd160694de41e32b74f10cb1':
  Updated Trace.h to recognize ATRACE_TAG_BIONIC.
 2014-05-28 22:18:03 +00:00
Yin-Chia Yeh
751cd0cb1d Merge "Camera2: Fix wrong index in ColorSpaceTransform" into lmp-preview-dev 2014-05-28 21:54:41 +00:00
Mike Lockwood
3378717241 Merge "Add Audio Manager support for Bluetooth A2DP Sink profile" 2014-05-28 21:54:11 +00:00
Elliott Hughes
a487fb77df am df0e9ed5: am 862be912: Merge "Updated Trace.h to recognize ATRACE_TAG_BIONIC." 
* commit 'df0e9ed5536e2cab860f3ecf9dab0030a471766e':
  Updated Trace.h to recognize ATRACE_TAG_BIONIC.
 2014-05-28 21:48:46 +00:00
Adam Powell
6addcea6ae Merge "Toolbar factoring and ActionBar functionality integration" into lmp-preview-dev 2014-05-28 21:44:01 +00:00
Elliott Hughes
df0e9ed553 am 862be912: Merge "Updated Trace.h to recognize ATRACE_TAG_BIONIC." 
* commit '862be91276ec9532b3ed00d43fc7a750f1e6adb0':
  Updated Trace.h to recognize ATRACE_TAG_BIONIC.
 2014-05-28 21:41:30 +00:00
Lorenzo Colitti
c039803160 Merge "DO NOT MERGE - Support disconnecting while trying to connect." into lmp-preview-dev 2014-05-28 21:38:03 +00:00
Brigid Smith
461ac24b8c Updated Trace.h to recognize ATRACE_TAG_BIONIC. 
Bug: 15116468
Change-Id: I6aef941c6b6bd59347855f7265e701a3aaa08edc
 2014-05-28 14:21:06 -07:00
Yin-Chia Yeh
884cddcdf4 Camera2: Fix wrong index in ColorSpaceTransform 
Bug: 15309870
Change-Id: I89a043a005435695ac8649e20d4e0e58d0f62bc7
 2014-05-28 20:54:24 +00:00