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

7454 Commits

Author SHA1 Message Date
Adrian Roos
e74b853d9f resolved conflict for merge of 3ca33b70 to master 
Change-Id: I5226015ca7cef030586349cc698a46e458ac788e
 2014-06-11 15:02:55 +02:00
Sreeram Ramachandran
cc91c7b804 Add a new IpPrefix class and use it in RouteInfo. 
This change uses IpPrefix only in the public API and continues
to use LinkAddress for everything else. It does not change the
callers to use the new APIs, with the exception of changing
all current uses of getDestination to getDestinationLinkAddress
to make room for the new getDestination method that returns an
IpPrefix.

Based on Sreeram's earlier change:
https://googleplex-android-review.git.corp.google.com/#/c/477874/
but a bit simplified and with a bit more documentation.

Bug: 15142362
Bug: 13885501
Change-Id: Ib4cd96b22cbff4ea31bb26a7853989f50da8de4e
 2014-06-10 14:30:15 -07:00
Christopher Tate
e9ed3707b2 Merge "Out with the old; in with the new" into lmp-preview-dev 2014-06-10 21:27:54 +00:00
Jessica Hummel
542588e3ba Update documentation so it meets api requirements 
Change-Id: Ice52dc3d5ecca77f81d3df1b43179c94aece6fef
bug:15023443

Conflicts:
	api/current.txt
	core/java/android/app/admin/DeviceAdminReceiver.java
 2014-06-11 11:37:53 +01:00
Przemyslaw Szczepaniak
b181caa47c Merge "Hide new TTS API for the lmp-preview. DO NOT MERGE" into lmp-preview-dev 2014-06-10 21:18:16 +00:00
Przemyslaw Szczepaniak
20735c750b Hide new TTS API for the lmp-preview. DO NOT MERGE 
Bug: 15519251
Change-Id: I83294a1a890986df2d1fa8e81bb397c33fdd8fe9
 2014-06-11 13:28:01 +01:00
Christopher Tate
7060b04f6d Out with the old; in with the new 
Switch to the official "JobScheduler" etc naming.

Bug 14997851

Change-Id: I73a61aaa9af0740c114d08188bd97c52f3ac86b7
 2014-06-10 12:51:55 -07:00
Jean-Michel Trivi
8a21f5dd79 AudioManager: add ability to allocate a new session ID 
Expose method to allocate a new session ID.
Make the generic error code public.

Change-Id: Iec93548292845e3a1b1a97be9bbe54e9fcf06f2d
 2014-06-10 12:44:04 -07:00
Matthew Williams
7b5c2340ad am e389d1ea: Merge "Remove SyncRequest.setPriority from public API" into lmp-preview-dev 
* commit 'e389d1ea63b0a9caa6d069254ac661ca6420917f':
  Remove SyncRequest.setPriority from public API
 2014-06-10 18:05:41 +00:00
Alan Viverette
a4eab42fe4 Change ripple tint to color, remove tintMode 
Also fixes double ripple on list preferences, missing ripple on up
button, and adds the Toolbar style to public. Further improves
ripple performance.

BUG: 15523923
BUG: 15473856
Change-Id: I5e8bf417368b60fcc33c80852e12f27b8c580774
 2014-06-10 11:00:25 -07:00
Doug Zongker
40e53cdc94 Merge "hide RECOVERY permission from L preview -- DO NOT MERGE" into lmp-preview-dev 2014-06-10 17:38:20 +00:00
Jeff Brown
085a1e7933 am af0c2ebf: @hide ACCESS_INPUT_FLINGER permission. 
* commit 'af0c2ebfc71f6106656eb17345e122ea7ac8cf2a':
  @hide ACCESS_INPUT_FLINGER permission.
 2014-06-10 17:21:59 +00:00
Craig Mautner
7683baad6c am a7c5791a: Merge "Redefine FLAG_ACTIVITY_NEW_DOCUMENT without NEW_TASK" into lmp-preview-dev 
* commit 'a7c5791a95bf732c2381f698d78930ee61efd36b':
  Redefine FLAG_ACTIVITY_NEW_DOCUMENT without NEW_TASK
 2014-06-10 17:21:52 +00:00
John Reck
1a2f7a1e29 resolved conflicts for merge of 2d2aa0cc to master 
Change-Id: Ib7bb0e40569a8f6a7f856eef54980d70d9769cdc
 2014-06-10 07:53:03 -07:00
Jeff Sharkey
d734c698e3 am 99f4fe07: Merge "Refactor directory API to "opening document tree."" into lmp-preview-dev 
* commit '99f4fe0797adb8350f92c7d1ba11776d1947e768':
  Refactor directory API to "opening document tree."
 2014-06-10 11:18:54 +00:00
Xiaolei Wang
b71f764c28 am c686a0d4: Merge "Add constants to Android TV On Device Search. Change-Id: I7b5780f8c4c0367d198607ad2780cf6ec6a96d3a" into lmp-preview-dev 
* commit 'c686a0d4b116654d6bec3ff7d5443f8da3ffb20a':
  Add constants to Android TV On Device Search. Change-Id: I7b5780f8c4c0367d198607ad2780cf6ec6a96d3a
 2014-06-10 11:18:48 +00:00
Yohei Yukawa
c46b5f04aa Rename CursorAnchorInfoBuilder with Builder 
Inner Builder class should not inherit full class name of outer
class.

BUG: 15516230
Change-Id: I2d56edebb0c85639db57ca5b2aadb22c67fc5926
 2014-06-10 14:19:28 +09:00
Matthew Williams
2368014073 Remove SyncRequest.setPriority from public API 
Bug: 15517262
Change-Id: If62b6f3bf339011dd504889aa24c71a22cb08ed8
 2014-06-09 20:18:25 -07:00
Jeff Brown
465c5de4ee @hide ACCESS_INPUT_FLINGER permission. 
Bug: 15516225
Change-Id: Ief70650d956a7161153e283c24f553fcfa7996b1
 2014-06-10 01:43:14 +00:00
Craig Mautner
df8e542a8a Merge "Redefine FLAG_ACTIVITY_NEW_DOCUMENT without NEW_TASK" into lmp-preview-dev 2014-06-10 01:29:43 +00:00
Craig Mautner
f357c0ca51 Redefine FLAG_ACTIVITY_NEW_DOCUMENT without NEW_TASK 
Change definition of FLAG_ACTIVITY_NEW_DOCUMENT from
FLAG_ACTIVITY_NEW_TASK | FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET to
FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET alone.

Also add new documentLaunchMode of "never" to allow activity
writers to keep their activity from being launched in document mode.

Fixes bug 15468528.

Change-Id: Ied11adf97e85c5d3f99f4c0bbbb4a2905dcfb24e
 2014-06-09 18:09:33 -07:00
Jinsuk Kim
e44e754166 Merge "Tag HdmiControlService API classes with @hide/@SystemApi" into lmp-preview-dev 2014-06-10 00:11:20 +00:00
Jeff Sharkey
f8f69b899f Merge "Refactor directory API to "opening document tree."" into lmp-preview-dev 2014-06-10 00:10:28 +00:00
Xiaolei Wang
2641ab276c Merge "Add constants to Android TV On Device Search. Change-Id: I7b5780f8c4c0367d198607ad2780cf6ec6a96d3a" into lmp-preview-dev 2014-06-10 00:09:38 +00:00
Jeff Sharkey
b9fbb7290b Refactor directory API to "opening document tree." 
Cleans up API so it consistently refers to opening or working with a
subtree of documents.  Also separates isChildDocument() support from
the concept of directory tree selection.

Bug: 15429194
Change-Id: Ice66a751ff4bd0cc4d34c44c5da13a0dc4186dc9
 2014-06-09 17:07:58 -07:00
Aravind Akella
27900358f2 Add java APIs for Sensor reportingMode. 
Change-Id: Iba6bb11f990d9966b86bf02d70ced7312f3e64a8
 2014-06-09 16:56:29 -07:00
Jinsuk Kim
66d1eb285b Tag HdmiControlService API classes with @hide/@SystemApi 
Bug: 15516329, Bug: 15516710
Change-Id: Ie814513a642660b6c5fdc9e891ad1eec1b2d689b
 2014-06-09 23:49:21 +00:00
Xiaolei Wang
b2b2ac1287 Add constants to Android TV On Device Search. 
Change-Id: I7b5780f8c4c0367d198607ad2780cf6ec6a96d3a
 2014-06-09 15:07:17 -07:00
Doug Zongker
c302e4d32f hide RECOVERY permission from L preview -- DO NOT MERGE 
Bug: 15516323
Change-Id: I16a6355f631523919607bd111e5ebfe16fa4506e
 2014-06-09 15:04:38 -07:00
Jae Seo
8799179638 am a6b44fe7: Merge "Fix a typo in TvContract" into lmp-preview-dev 
* commit 'a6b44fe7d3ab727de2b82d73209efdc9bdb57b41':
  Fix a typo in TvContract
 2014-06-09 19:29:28 +00:00
Jae Seo
9aea9c93c5 am 73fe04a4: Merge "TIF: Address the feedback from the API review - 3/3" into lmp-preview-dev 
* commit '73fe04a41f88eb9e4a9da8e229351ce8458d0e0d':
  TIF: Address the feedback from the API review - 3/3
 2014-06-09 19:29:17 +00:00
Daniel Sandler
d343aff26d am e7078cf9: Move CATEGORY_NOTIFICATION_PREFERENCES to Notification. 
* commit 'e7078cf9c41f5e3581a80b2129ae77719b0f69a4':
  Move CATEGORY_NOTIFICATION_PREFERENCES to Notification.
 2014-06-09 19:28:56 +00:00
Jae Seo
085eefd184 Merge "Fix a typo in TvContract" into lmp-preview-dev 2014-06-09 18:43:27 +00:00
Jae Seo
182dc33e9e Merge "TIF: Address the feedback from the API review - 3/3" into lmp-preview-dev 2014-06-09 18:38:43 +00:00
Julia Reynolds
dc920984f2 Merge "Allow profile and device owners to change and get the master volume mute state." 2014-06-09 18:25:06 +00:00
Julia Reynolds
4a21b25fad Allow profile and device owners to change and get the master volume mute state. 
Also protect muting master volume with op code OP_AUDIO_MASTER_VOLUME.
Bug: 13585918
Change-Id: I91fe7ee60cd291cca15966b3127c0bb8a4828f6a
 2014-06-09 14:18:01 -04:00
Ed Heyl
f914a89073 fix conflict markers 
Change-Id: I0b95da6a8cb461dfaf7db026b6d190e2dcbe6935
 2014-06-09 10:59:22 -07:00
Jae Seo
f30ea53306 Fix a typo in TvContract 
Assigned a new value to TYPE_ATSC_M_H so that it differs from TYPE_ATSC_C.

Change-Id: I65494fdf625a3b4840c9e8cfa4b728214d63e6df
 2014-06-09 17:50:07 +00:00
Wonsik Kim
32c67ee119 am 8be96a6f: Merge "Make TvInputs aware of whether it\'s hardware-based or not" into lmp-preview-dev 
* commit '8be96a6ffa5ce1783310fe490f615ff323d1d5ed':
  Make TvInputs aware of whether it's hardware-based or not
 2014-06-09 17:44:37 +00:00
Ed Heyl
5adb67d4ce merge 4ce22057, regen api/current.txt 
Change-Id: I39186b5c4d41753c729c5d1ee7ee96b03a45c514
 2014-06-09 10:41:21 -07:00
Julia Reynolds
03f5ff482e Merge "Unhide UserManager.hasUserRestriction()." 2014-06-09 17:21:37 +00:00
Daniel Sandler
01df1c680a Move CATEGORY_NOTIFICATION_PREFERENCES to Notification. 
It sprouts an additional INTENT_ prefix to distinguish it
from the Notification.category constants in the same file.

Bug: 15022240
Change-Id: Icbc09bfc5ce78964272def66934fe4a7c848e12b
 2014-06-09 16:53:51 +00:00
Jessica Hummel
f89fa83374 Merge "Update documentation so it meets api requirements" 2014-06-09 13:55:19 +00:00
Jason Monk
1e7bdd7174 Merge "Add an API to clear the device owner." 2014-06-09 12:48:35 +00:00
Jessica Hummel
9da603973b Update documentation so it meets api requirements 
Change-Id: Ice52dc3d5ecca77f81d3df1b43179c94aece6fef
bug:15023443
 2014-06-09 13:01:03 +01:00
Adam Connors
89b3b4a0b2 API Review: rename FEATURE_MANAGEDPROFILES 
To be FEATURE_MANAGED_PROFILES

Bug: 15025371
Change-Id: I2f818b4d8488fe7943fe5ff6051d6b1f84ca9e8c
(cherry picked from commit 687efd6f5c05dc1e4a9c284bf3edae901af45942)
 2014-06-09 10:58:22 +01:00
Wonsik Kim
55f933f715 Merge "Make TvInputs aware of whether it's hardware-based or not" into lmp-preview-dev 2014-06-09 06:07:21 +00:00
Jinsuk Kim
f43cea0094 Merge "Remove HdmiCecService" into lmp-preview-dev 2014-06-09 01:13:29 +00:00
Robert Greenwalt
cc62d9ad6b Merge "Apply API review to android.net.Network:" 2014-06-08 23:41:27 +00:00
Jinsuk Kim
3f48068d78 Remove HdmiCecService 
The service is replaced with HdmiControlService. Removing all the related
classes and the initialization of the service.

Change-Id: Ic7baaddffb9873613ddd1096e874f226da983939
 2014-06-09 07:55:47 +09:00