drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
127,807 Commits 1 Branch 0 Tags
Commit Graph

6279 Commits

Author SHA1 Message Date
Chris Craik
0de8d23214 am 1a1ec625: Merge "Remove castsShadow and globalCamera APIs" 
* commit '1a1ec625570e79f0f172472776f16a81a03eaa42':
  Remove castsShadow and globalCamera APIs
 2014-03-17 12:10:04 -07:00
Chris Craik
0334c314a5 Remove castsShadow and globalCamera APIs 
Change-Id: I4d81a7849eba60a1a9debce74eedd55d6331842d
 2014-03-17 18:13:31 +00:00
Jessica Hummel
96cd3e690c am f1c90440: Merge "Standardize the provisioning intent action." 
* commit 'f1c9044057bdffbedbe3c2cae1a7b378d593ef2b':
  Standardize the provisioning intent action.
 2014-03-17 11:04:44 -07:00
Jessica Hummel
03dd22079c Standardize the provisioning intent action. 
Change-Id: Iea7f8827cf4b52e2e97e8675687412108dd917e4
 2014-03-17 16:53:27 +00:00
Ruben Brunk
94fb752026 am 38900b15: Merge "hal3: Add availableHotPixelModes, update modes." 
* commit '38900b15544e03aa8252022dc4b939748772ed6b':
  hal3: Add availableHotPixelModes, update modes.
 2014-03-14 17:16:55 -07:00
Ruben Brunk
38900b1554 Merge "hal3: Add availableHotPixelModes, update modes." 2014-03-15 00:14:56 +00:00
Yorke Lee
d885b5c9b3 Merge "Add hold support to frameworks/base/telecomm" into master-nova 2014-03-14 21:53:55 +00:00
Yorke Lee
81ccaaa25c Add hold support to frameworks/base/telecomm 
Bug: 13169202

Change-Id: Ib01990c1f8654f95a4cfcca4a91f0ab143722d8e
 2014-03-14 14:53:25 -07:00
Craig Mautner
4309121311 am 421a1dd1: Merge "Launch new tasks with Doc Centric flag." 
* commit '421a1dd197a78b014cb9a899a75c0fa43510a59a':
  Launch new tasks with Doc Centric flag.
 2014-03-14 14:45:05 -07:00
Craig Mautner
421a1dd197 Merge "Launch new tasks with Doc Centric flag." 2014-03-14 21:43:28 +00:00
Craig Mautner
d00f47402c Launch new tasks with Doc Centric flag. 
Introduction of new Intent flag FLAG_ACTIVITY_NEW_DOCUMENT. When
this flag is set the target activity will be launched in its own
task. This is the start of the new Doc Centric mode of working.

Change-Id: I719168532134ab2c5ea3300df676c2b2a0e81795
 2014-03-14 14:42:23 -07:00
Tim Kilbourn
3f11526c77 am 9b18001a: am ec033943: am 9873e099: am 55740325: Merge "Add leanback device features." into klp-modular-dev 
* commit '9b18001ab53c8c78aee0647983adf3ad8a1ee97c':
  Add leanback device features.
 2014-03-14 13:54:37 -07:00
Tim Kilbourn
9b18001ab5 am ec033943: am 9873e099: am 55740325: Merge "Add leanback device features." into klp-modular-dev 
* commit 'ec0339437869ebb42a67a2811dc6de31239d5d62':
  Add leanback device features.
 2014-03-14 20:50:40 +00:00
Tim Kilbourn
9873e099c3 am 55740325: Merge "Add leanback device features." into klp-modular-dev 
* commit '557403250b9accf4f17ab87f636f1722949960a3':
  Add leanback device features.
 2014-03-14 20:42:18 +00:00
Ruben Brunk
9d454fd609 hal3: Add availableHotPixelModes, update modes. 
Bug: 12957573
Change-Id: I2fd6ef60bf98c53288c2bc343d82a06602474916
 2014-03-14 13:35:57 -07:00
Jose Lima
a5b61d39ce am 92703e62: resolved conflicts for merge of 4882ddfa to master 
* commit '92703e62c1dc88a410a32b05c2d44f391c193140':
  Add banner attribute to app manifest
 2014-03-13 21:30:03 -07:00
Jose Lima
92703e62c1 resolved conflicts for merge of 4882ddfa to master 
Change-Id: I179899697c148ac34a67b195e2dbd3df2f9138de
 2014-03-13 21:26:48 -07:00
Hui Shu
cdf01b1325 am 57ad97fb: Merge "Add removeApi commandline option for doclava and an empty removed.txt" 
* commit '57ad97fb701876ecb87b76f29592a41731aeb487':
  Add removeApi commandline option for doclava and an empty removed.txt
 2014-03-13 15:16:28 -07:00
Hui Shu
57ad97fb70 Merge "Add removeApi commandline option for doclava and an empty removed.txt" 2014-03-13 22:11:41 +00:00
Tim Kilbourn
f94b6a93a4 Add leanback device features. 
android.software.leanback - the device supports leanback UIs.
android.software.leanback_only - the device ONLY supports leanback UIs.

leanback_only is a hidden feature for now.

Change-Id: I497bd96464125ad81212c804e150f210f3e95af2
 2014-03-13 15:02:54 -07:00
Sailesh Nepal
592bbf0475 Merge "Add constant for Call Id extra" into master-nova 2014-03-13 18:57:47 +00:00
Jose Lima
53ac5ef214 am 91726f4e: Merge "Add banner attribute to app manifest" into klp-modular-dev 
* commit '91726f4ea7b60025490209ccb2637d712e8d75fd':
  Add banner attribute to app manifest
 2014-03-13 18:02:50 +00:00
Jose Lima
f78e312db2 Add banner attribute to app manifest 
Change-Id: I28b0dc6dee9623ec7534bb0e741b88f439b48c9f
 2014-03-12 18:07:38 -07:00
RoboErik
5ab3fc01f4 am 4224e836: Merge "Adds a TransportController and TransportPerformer to session" 
* commit '4224e836428391f77adaa14180ad558d12851208':
  Adds a TransportController and TransportPerformer to session
 2014-03-12 15:17:27 -07:00
RoboErik
4224e83642 Merge "Adds a TransportController and TransportPerformer to session" 2014-03-12 22:14:50 +00:00
RoboErik
8ae0f34db9 Adds a TransportController and TransportPerformer to session 
This makes transport controls a primitive interface on sessions with
a way to create the performer, register callbacks, and send commands
and updates between controllers and performers. This still needs some
cleanup but has been tested with OneMedia.

Change-Id: I373d35f7ccc383b8421bd14044457467d80425f3
 2014-03-12 15:09:42 -07:00
Evan Charlton
715a4e8f39 Merge "Fix the build (again)" into master-nova 2014-03-12 16:22:56 +00:00
Evan Charlton
0ca17060a5 Fix the build (again) 
Need a make clean first to get rid of deleted classes.

Change-Id: I92ae86d40a5e20296bbbf594850ea2d6a2dd3b3e
 2014-03-12 09:21:40 -07:00
Jose Lima
d4b720aa0c am 9d50ea90: am c770e064: am dd0db799: am 5f0c0498: Merge "Added LEANBACK_LAUNCHER Intent category" into klp-modular-dev 
* commit '9d50ea90f7072a7fa87d022663f2d25b906ed2ad':
  Added LEANBACK_LAUNCHER Intent category
 2014-03-12 08:22:52 -07:00
Jose Lima
9d50ea90f7 am c770e064: am dd0db799: am 5f0c0498: Merge "Added LEANBACK_LAUNCHER Intent category" into klp-modular-dev 
* commit 'c770e064effb79c33472f54652bd95aa14a8d6ec':
  Added LEANBACK_LAUNCHER Intent category
 2014-03-12 15:19:37 +00:00
Evan Charlton
f556086b5b Fix the build (update API) 
There was a last-minute renaming of some constants and update-api was
not re-run.

Change-Id: I3278cc204ea9e03ab3d5400cd308abedbf3b6da8
 2014-03-12 07:29:58 -07:00
Neil Fuller
8367866b28 am ad895779: Merge "Add APIs for better interoperability with Java 1.7" 
* commit 'ad895779f8b8d63832a4195e4e895641985f97ad':
  Add APIs for better interoperability with Java 1.7
 2014-03-12 05:23:42 -07:00
Neil Fuller
ad895779f8 Merge "Add APIs for better interoperability with Java 1.7" 2014-03-12 11:46:11 +00:00
Sailesh Nepal
40441101b2 Merge "Add wrappers around telecomm interfaces" into master-nova 2014-03-12 01:59:32 +00:00
Sailesh Nepal
ab5d282dd6 Add wrappers around telecomm interfaces 
This CL adds wrappers for:
  CallServiceLookupResponse
  CallServiceAdapter
  IInCallAdapter
  IInCallService

This CL also moves all the aidl files into
com.android.internal.telecomm.

Change-Id: I840f023bc545643e8bb719825e7bc78344ee46ee
 2014-03-11 16:38:50 -07:00
Winson Chung
9c2392f9e7 am 303e1ff1: Initial changes for recents. 
* commit '303e1ff1fec8b240b587bb18b981247a99833aa8':
  Initial changes for recents.
 2014-03-11 16:17:13 -07:00
Jessica Hummel
fbb96f0381 am 4cfde32f: Merge "Move the provisioning intents to DevicePolicyManager." 
* commit '4cfde32ff0105d7c8a4743e084f1c9775f4c6b5c':
  Move the provisioning intents to DevicePolicyManager.
 2014-03-11 12:21:05 -07:00
Jose Lima
dd0db799ee am 5f0c0498: Merge "Added LEANBACK_LAUNCHER Intent category" into klp-modular-dev 
* commit '5f0c0498a1382ef955cccca95920ec878fe2a64c':
  Added LEANBACK_LAUNCHER Intent category
 2014-03-11 19:19:11 +00:00
Winson Chung
303e1ff1fe Initial changes for recents. 
Change-Id: Ide2c202b4a5b25410f0f32bd0a81ccf817ede38f
 2014-03-11 12:03:08 -07:00
Jessica Hummel
f72078bdc5 Move the provisioning intents to DevicePolicyManager. 
Change-Id: Ibde867b193e64c1fda8d9c84b0d1be36a1592035
 2014-03-11 18:05:29 +00:00
Jose Lima
38b75b6126 Added LEANBACK_LAUNCHER Intent category 
Change-Id: I4f5ccfa9725106f558972c73abbe3f9435267c75
 2014-03-11 10:43:31 -07:00
Alan Viverette
4f7afc4aad am 9b3c038c: Merge "Unify touch feedback drawable and reveal drawable" 
* commit '9b3c038c92b1903026448b6469231774d1f1d358':
  Unify touch feedback drawable and reveal drawable
 2014-03-10 19:12:54 -07:00
Sailesh Nepal
e9d85a07aa Add constant for Call Id extra 
The extra will be used to include the call ID on phone
state changes.

Change-Id: I9edd0b6e017f8414fa3e148fd4d57958e2072184
 2014-03-10 19:12:37 -07:00
Alan Viverette
ba346f9d8d Unify touch feedback drawable and reveal drawable 
BUG: 13030730
Change-Id: I65a50a00bd76b80bb242b1573b89e443e2e143fe
 2014-03-10 19:09:28 -07:00
Robert Shih
8f21e477c9 am f0768d71: Merge "MediaMuxer: added WebM filetype; open output file RW." 
* commit 'f0768d71bdba1db5bf70fbe9aa587ae7e652df21':
  MediaMuxer: added WebM filetype; open output file RW.
 2014-03-10 12:05:08 -07:00
Robert Shih
f0768d71bd Merge "MediaMuxer: added WebM filetype; open output file RW." 2014-03-10 19:02:34 +00:00
Paul Lawrence
c3e05be93f am 2bc68575: Merge "Clean up a few minor issues" 
* commit '2bc68575325ab7bf082de24f5f095f20ea63f877':
  Clean up a few minor issues
 2014-03-10 09:43:35 -07:00
Paul Lawrence
2bc6857532 Merge "Clean up a few minor issues" 2014-03-10 16:41:22 +00:00
Jessica Hummel
3692f24667 am 863d691e: Merge "Fix build" 
* commit '863d691efaa92257246598a73af2f581fc991e0a':
  Fix build
 2014-03-10 04:06:03 -07:00
Jessica Hummel
409a688fc6 Fix build 
Change-Id: Ie0741d34044f4b1ba92de8d9d91502f37b223507
 2014-03-10 10:57:01 +00:00