138402 Commits

Author SHA1 Message Date
Jungshik Jang
3ee65720e9 Refactor HdmiCecLocalDevice and logical address allocation logic.
1. Factor out logical allocation logic to HdmiControlService.
2. Contains a reference to HdmiControlService rather than
  HdmiCecController so that it enables to access service's logic
  directly.
3. Move launch device discovery logic to HdmiCecLocalDeviceTv.

Change-Id: Ic97b4d51311a3c18f6d586c2245cac410cbd370e
2014-06-05 10:19:05 +09:00
Yorke Lee
1ca440b38f API changes per API review for contacts
* Improve documentation for REMOVE_DUPLICATE_ENTRIES
* Hide android.provider.ContactsContract.PinnedPositions, it will be
reworked and improved for L.
* Hide android.provider.ContactsContract.Preferences - we will rework
the various apps that are relying on this to use their own preferences
instead
* Remove inheritance of hidden interfaces in android.provider.Contacts

Bug: 15430304
Change-Id: I0f96e8a506083df21023f9b95655f0ce5244bdce
2014-06-04 18:16:26 -07:00
Deepanshu Gupta
d0ca7b623b am dfc3bc9b: Fix build.
* commit 'dfc3bc9b3cf27a72dfd133ce62f5e791ef74659d':
  Fix build.
2014-06-05 01:10:44 +00:00
Eino-Ville Talvala
b530848032 Merge "Camera2: Invoke onError callbacks for failure to open" into lmp-preview-dev 2014-06-05 01:08:54 +00:00
Eric Laurent
60b62bc5c1 add sound trigger JNI
Add JNI for sound trigger hardware native service.

Change-Id: Idd0ee42c7af5fe20e7d8295994211de3a517bd13
2014-06-04 17:59:12 -07:00
Eric Laurent
e48188ce35 Add SoundTrigger native service interface
Add JAVA framework interface for native sound trigger service.
The interface allows for:
- enumeration of sound trigger hardware modules and their properties
- load/unload sound models
- start, stop and receive recognition events on sound models.

Change-Id: I51542f38f5359ffbbf79d2cbd7c9ea1ee10c9c18
2014-06-04 17:58:56 -07:00
Craig Mautner
d94b47f3b6 Add callback when ActivityView activities complete
Users of ActivityViews can now be informed when there are no more
active activities in ActivityView by registering a callback.

Fixes bug 15330616.

Change-Id: I39d55bdb0db8b0a12ee751cdcb039b7fbb899c85
2014-06-04 17:25:49 -07:00
Amith Yamasani
80f576f5a8 Merge "Fix messed up current.txt" 2014-06-05 00:22:46 +00:00
Jean-Michel Trivi
b45c273033 AudioAttributes: parcelable, hide support for tags
Make the AudioAttributes class parcelable.

Hide support for adding and querying tags, there is no SDK-backed
  use case for this feature.

Bug 15306334

Change-Id: Idb67a735778e687d73020ed0120643f31fc230a6
2014-06-04 17:22:16 -07:00
Amith Yamasani
8927d4f590 Fix messed up current.txt
Change-Id: Id472fda6112593c1ba933100249bbd5c6ecb0ccb
2014-06-04 17:19:24 -07:00
Prashant Malani
6a5cacb868 Change display state modification during dozing
Check that the BrightnessRamp animation has completed before updating
the display state to STATE_DOZING.

Bug: 13472578
Change-Id: Ib9751f7a987463e4df98571e846d829ec8e73b5e
Signed-off-by: Prashant Malani <pmalani@google.com>
2014-06-04 17:14:31 -07:00
Deepanshu Gupta
c8e2d0a4f8 LayoutLib: Add capability to simulate old versions
Let the IDE know that we can simulate older versions of platform.

Change-Id: Idec6d24296dd0ae04a2d808c14604629e265d458
2014-06-04 17:08:48 -07:00
Deepanshu Gupta
33dff284df am 4c0d33f2: Merge "Add basic support for simulating older versions." into lmp-preview-dev
* commit '4c0d33f29f295e5ae27ba057fc8cb2270295865a':
  Add basic support for simulating older versions.
2014-06-05 00:02:55 +00:00
Eino-Ville Talvala
7fcb357811 Camera2: Invoke onError callbacks for failure to open
When the initial attempt to connect to the remote camera device fails,
fire the onError callback as documented, instead of throwing an
exception from open().

Also ensure the correct exception is sent when methods are called
while in the error state, and make sure onClosed() is called correctly
if closing the device after an initial startup error.

Bug: 14413756
Bug: 14413363
Change-Id: I0822261dad52bcd428a0c4556202f00032499990
2014-06-04 16:52:00 -07:00
Dave Holmes
b6f3264066 am b3b6f148: am b766edce: am 4e99af34: am aabfcb78: Merge "Adding links to the Gradle docs. Both of these files ask you to change the contents of your gradle file, but neither links to reference information on gradle. Because this is still pretty new information, I\'d
* commit 'b3b6f1481e710a4f528dba962a8d860cc9d391a4':
  Adding links to the Gradle docs. Both of these files ask you to change the contents of your gradle file, but neither links to reference information on gradle. Because this is still pretty new information, I'd like to include a link to the Building with Gradle documentation.
2014-06-04 23:50:38 +00:00
Deepanshu Gupta
58ff7de971 Fix build.
Change-Id: I877532b5056a035dbd4b0c6c55b5969d6292846a
2014-06-04 16:50:07 -07:00
Dave Holmes
b3b6f1481e am b766edce: am 4e99af34: am aabfcb78: Merge "Adding links to the Gradle docs. Both of these files ask you to change the contents of your gradle file, but neither links to reference information on gradle. Because this is still pretty new information, I\'d like to incl
* commit 'b766edcea3dfdc6513218649b9ad2030bc195c23':
  Adding links to the Gradle docs. Both of these files ask you to change the contents of your gradle file, but neither links to reference information on gradle. Because this is still pretty new information, I'd like to include a link to the Building with Gradle documentation.
2014-06-04 23:45:42 +00:00
Amith Yamasani
f12d4afb85 Merge "Change preference category text color for quantum" 2014-06-04 23:44:30 +00:00
Igor Murashkin
2ac6c43312 am 97b2bc9a: Merge "camera2: Change CaptureListener callbacks to include the session (api)" into lmp-preview-dev
* commit '97b2bc9a05a56dad609360f8fec1e5a51059e656':
  camera2: Change CaptureListener callbacks to include the session (api)
2014-06-04 23:42:58 +00:00
Raph Levien
47b24f9c93 am 424f369a: Merge "Turn off elegantTextHeight in quantum theme" into lmp-preview-dev
* commit '424f369a38371294fdf3fc8d769ae9ca1e790807':
  Turn off elegantTextHeight in quantum theme
2014-06-04 23:42:57 +00:00
Dave Holmes
b766edcea3 am 4e99af34: am aabfcb78: Merge "Adding links to the Gradle docs. Both of these files ask you to change the contents of your gradle file, but neither links to reference information on gradle. Because this is still pretty new information, I\'d like to include a link to
* commit '4e99af342b340bebcd635137966d21c59c294532':
  Adding links to the Gradle docs. Both of these files ask you to change the contents of your gradle file, but neither links to reference information on gradle. Because this is still pretty new information, I'd like to include a link to the Building with Gradle documentation.
2014-06-04 23:41:49 +00:00
Dave Holmes
4e99af342b am aabfcb78: Merge "Adding links to the Gradle docs. Both of these files ask you to change the contents of your gradle file, but neither links to reference information on gradle. Because this is still pretty new information, I\'d like to include a link to the Building
* commit 'aabfcb78cf29e3d670831c770b9d757eb79487e4':
  Adding links to the Gradle docs. Both of these files ask you to change the contents of your gradle file, but neither links to reference information on gradle. Because this is still pretty new information, I'd like to include a link to the Building with Gradle documentation.
2014-06-04 23:38:34 +00:00
Deepanshu Gupta
648a309d9b Merge "Add basic support for simulating older versions." into lmp-preview-dev 2014-06-04 23:37:37 +00:00
Dave Holmes
aabfcb78cf Merge "Adding links to the Gradle docs. Both of these files ask you to change the contents of your gradle file, but neither links to reference information on gradle. Because this is still pretty new information, I'd like to include a link to the Building with Gradle documentation." into klp-docs 2014-06-04 23:35:50 +00:00
Igor Murashkin
6e9c5cc617 Merge "camera2: Change CaptureListener callbacks to include the session (api)" into lmp-preview-dev 2014-06-04 23:31:54 +00:00
Raph Levien
cbc9a679d8 Merge "Turn off elegantTextHeight in quantum theme" into lmp-preview-dev 2014-06-04 23:28:47 +00:00
Alan Viverette
c740ffa3c6 am c1462be8: Merge "Update ripple spec, fix ripple mask, rotate progress drawable" into lmp-preview-dev
* commit 'c1462be80a2581ddd522bf24d91ba183f166de80':
  Update ripple spec, fix ripple mask, rotate progress drawable
2014-06-04 23:26:57 +00:00
Adam Powell
eab8f9d330 am f0e4ca1b: Merge "Fix list navigation callbacks for ActionBarView" into lmp-preview-dev
* commit 'f0e4ca1b0398a9709d1516434e6d926f477acd70':
  Fix list navigation callbacks for ActionBarView
2014-06-04 23:26:56 +00:00
Ihab Awad
fc91b7d448 DO NOT MERGE. Implement connection error dialogs (1/4)
Implement reporting of connection errors from ConnectionServices through
Telecomm to the InCallUI.

Bug: 15195720
Bug: 15117141
Change-Id: I0e1443f75a175a212fb19afde5a7eadef15d239d
2014-06-04 23:25:04 +00:00
Matthew Williams
cc148b819d am 7e36b718: (-s ours) DO NOT MERGE Redact SyncService stuff from master
* commit '7e36b7183afc47c81581efad648e7930771e5f9a':
  DO NOT MERGE Redact SyncService stuff from master
2014-06-04 23:14:44 +00:00
Alan Viverette
1c121e124a Merge "Update ripple spec, fix ripple mask, rotate progress drawable" into lmp-preview-dev 2014-06-04 23:13:55 +00:00
Raph Levien
c499e97667 Turn off elegantTextHeight in quantum theme
Setting elegantTextHeight to true was a great experiment, but it led to
too much difficulty getting text to fit in space-constrained spaces
(action bar, list items). A long term solution is optical bounds, but
for the time being, just turn it off.

This patch fixes bug 14227056: "Language name displaying under Personal
dictionary are truncated in landscape mode"

Change-Id: I2b0e1ca2e7a06cd0fd9a4d84c1c07fdea2ddbf03
2014-06-04 16:09:11 -07:00
Adam Powell
2a7b35e80b Merge "Fix list navigation callbacks for ActionBarView" into lmp-preview-dev 2014-06-04 23:04:56 +00:00
Igor Murashkin
21547d66a9 camera2: Change CaptureListener callbacks to include the session (api)
* Also makes CameraDevice an abstract class (API)

Bug: 15428219
Bug: 14964443
Change-Id: I0e8c8309186aad59570aac7e0f998bb615405f0a
2014-06-04 16:03:32 -07:00
Ruben Brunk
fcab516cd4 am 37532379: Merge "DNG: Hide unimplemented methods." into lmp-preview-dev
* commit '37532379e7c770555b140332112a34fe716fed22':
  DNG: Hide unimplemented methods.
2014-06-04 22:58:48 +00:00
Amith Yamasani
e1b74ec318 Change preference category text color for quantum
Use the colorAccent theme attribute.

Bug: 15384941
Change-Id: I9f98868313caf30a9658eadede23687f2eca5c9c
2014-06-04 15:51:41 -07:00
Adam Powell
c9102d743f Fix list navigation callbacks for ActionBarView
Fix a regression from a previous refactoring where the call ordering
between setNavigationMode and setListNavigationCallbacks could result
in the item selection listener being ignored.

Bug 15395053

Change-Id: I5330f2c684a21448c64c6b62eec10b96405758f7
2014-06-04 15:49:04 -07:00
Matthew Williams
64939ae385 DO NOT MERGE Redact SyncService stuff from master
Cherry-pick over from master.
This changes the API surface area, deleting things we aren't releasing.
I'll do the internal clean-up at the same time I do the SyncManager
refactor to sit on top of the TaskManager.
Bug: 14997851

Change-Id: Ieebbbcd3324827098e88b36e45e6e82315a51e65
2014-06-04 22:46:25 +00:00
Matthew Williams
4b8bb98d63 Merge "Redact SyncService stuff from master" 2014-06-04 22:45:24 +00:00
Ruben Brunk
35677d1762 Merge "DNG: Hide unimplemented methods." into lmp-preview-dev 2014-06-04 22:25:18 +00:00
Deepanshu Gupta
c442d5d9db am 9580af6d: Merge "Distinguish between menus in ActionBar and popup." into lmp-preview-dev
* commit '9580af6dbcb59427ca03efb8f5744101dd6efa32':
  Distinguish between menus in ActionBar and popup.
2014-06-04 22:20:04 +00:00
Raph Levien
8608bbb207 am 626b82f6: Merge "Query style from asset-created font (Minikin)" into lmp-preview-dev
* commit '626b82f63e4d7ea97187bec313b5cb687bb501b7':
  Query style from asset-created font (Minikin)
2014-06-04 22:19:56 +00:00
Deepanshu Gupta
e43dcc1d64 Merge "Distinguish between menus in ActionBar and popup." into lmp-preview-dev 2014-06-04 22:11:37 +00:00
Zhijun He
dcb65c3125 am b4f18bf1: Merge "Camera2: Update availableStreamConfigurations for JPEG sizes" into lmp-preview-dev
* commit 'b4f18bf11d7f0ca574ed9477486fd50e7c923023':
  Camera2: Update availableStreamConfigurations for JPEG sizes
2014-06-04 22:11:31 +00:00
Selim Cinek
2a3606ba4a am 2b81c8ef: Merge "Simplified maxPanelHeight logic." into lmp-preview-dev
* commit '2b81c8ef66cb046d96a950c5cf93cfb9015f4e40':
  Simplified maxPanelHeight logic.
2014-06-04 22:11:30 +00:00
Evan Charlton
6dea4aceba Expose post-dial APIs
Add APIs to expose post-dial DTMF functionality.

Bug: 13734588
Change-Id: I5cc06268590c3c424ea6daf216cb205b9c470dac
2014-06-04 15:10:57 -07:00
Elliott Hughes
a2d1454133 am ef3aeeca: am 38a5a257: am 759a8978: Merge "Minor javadoc improvements for PackageManager."
* commit 'ef3aeecacd4c47f6baeb96d06d69aad1ca4bcb1a':
  Minor javadoc improvements for PackageManager.
2014-06-04 22:06:28 +00:00
Raph Levien
8224ad4f70 Merge "Query style from asset-created font (Minikin)" into lmp-preview-dev 2014-06-04 22:05:41 +00:00
Craig Mautner
a0c808bb75 am d842513c: Merge "Launch document sharing into unique activities" into lmp-preview-dev
* commit 'd842513c3df5fd3e46a70ab6798b4d3d20c4ef0b':
  Launch document sharing into unique activities
2014-06-04 22:03:12 +00:00
Elliott Hughes
ef3aeecacd am 38a5a257: am 759a8978: Merge "Minor javadoc improvements for PackageManager."
* commit '38a5a257a9aaf85606eb7117d943a877dc7d3c93':
  Minor javadoc improvements for PackageManager.
2014-06-04 22:02:34 +00:00