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

8376 Commits

Author SHA1 Message Date
Yao Chen
c7e4229bda am 2efbbf29: am 8048a9f8: am 040ad25d: fix build 
* commit '2efbbf29dae2e509b466162b732d8a8c95086833':
  fix build
 2014-07-25 19:24:46 +00:00
Paul Soulos
bda303319b am d6e7338f: am 22a78a16: am 50655afc: Adds getTypeLabel to ContactsContract Event 
* commit 'd6e7338f2ae25670e4b4ef4b7f9cda5ac9117449':
  Adds getTypeLabel to ContactsContract Event
 2014-07-25 19:24:41 +00:00
Zhijun He
f7badff8bb CamcorderProfiles: add high speed profile constants 
Change-Id: I8f783466f8c2560820db14488acc1a309d27ab0f
 2014-07-25 23:59:06 +00:00
Jay Civelli
cdd5fe98b6 Revert "Add new intent to prompt user for their device credential. DO NOT MERGE" 
Breaks the JavaDoc generation.

This reverts commit c82a11573810ed4d1f40568d19afc27f726829af.

Change-Id: I9e38a0d6ba0935d4967b50023030c99727bfc839
 2014-07-25 23:42:07 +00:00
Andrew Lee
c7eb7d5557 am cc9c8d2a: am 933807c1: am 430f25e4: Merge "Add VideoCall and VideoCall.Listener as an inner classes of Call." into lmp-dev 
* commit 'cc9c8d2a184b2051af80e8187dd50e818b360ba1':
  Add VideoCall and VideoCall.Listener as an inner classes of Call.
 2014-07-25 16:19:01 +00:00
Kenny Guy
b7aa6b22b2 am 5984703a: am 2afedc82: am 0f151df6: Add method to launch settings app details page. 
* commit '5984703aed48789a7aaa6dd0d1dd55a288f7529a':
  Add method to launch settings app details page.
 2014-07-25 16:11:16 +00:00
Kenny Guy
7800c40177 am b4836b12: am fae68ecc: am 8717bd4e: Change getBadgedLabelForUser to use CharSequence 
* commit 'b4836b1259c924dfdebd82cc4c2275b5d3a88bf0':
  Change getBadgedLabelForUser to use CharSequence
 2014-07-25 12:38:23 +00:00
Santos Cordon
0be31502e7 am 9baefe99: am 85b795f3: am 91c55878: Add more disconnect causes 1/4 
* commit '9baefe99ba004a2e52f8ebe367e259a599123c02':
  Add more disconnect causes 1/4
 2014-07-25 03:30:34 +00:00
Craig Mautner
0f1f8c9a77 am 97886c4c: am 068d3b14: am 89539ae5: Create end of animation callback for Activity 
* commit '97886c4c435881590069911bcfbfc38e037841b2':
  Create end of animation callback for Activity
 2014-07-25 02:37:18 +00:00
Dongwon Kang
a4cb1d9c8a am c6f63593: am 3e697d71: am 734c3632: Merge "Remove COLUMN_CONDITIONAL_ACCESS from TvContract." into lmp-dev 
* commit 'c6f635935536805a6f2ae4f81d96e8f44ebd97f1':
  Remove COLUMN_CONDITIONAL_ACCESS from TvContract.
 2014-07-25 02:37:14 +00:00
Zhijun He
7166133f8f am 4bca50f3: am a17d4c68: am 1ecdeb58: Merge "MediaFormat: add capture rate key" into lmp-dev 
* commit '4bca50f38a26b5ef752d793c7b75f9ab90ce474f':
  MediaFormat: add capture rate key
 2014-07-25 02:36:43 +00:00
Selim Gurun
d4ed875df7 am 2bb2cf49: am bc19d47a: am 773433af: Merge "Address API review" into lmp-dev 
* commit '2bb2cf49ea199816a51bbfb92880b8d16d01ff19':
  Address API review
 2014-07-24 23:51:17 +00:00
Hector Dearman
28f4c20363 am 017d651c: am fb8f0643: am aa2a5911: Merge "Update CookieManager API for Council review." into lmp-dev 
* commit '017d651cdd6509676ee88d960adc3415d69bba3c':
  Update CookieManager API for Council review.
 2014-07-24 23:49:21 +00:00
Ruben Brunk
b86878210c am 546a393f: am e5b7dc07: am 70279653: camera2: Move noise model to dynamic metadata. 
* commit '546a393fbe307f4e3244e9e37f36e3be2cd1d9ad':
  camera2: Move noise model to dynamic metadata.
 2014-07-24 23:49:13 +00:00
Yorke Lee
77e56a1152 am a8f55d15: am 5a9a76b5: am 9abe5673: Merge "Add Calls.TRANSCRIPTION to CallLog (2/2)" into lmp-dev 
* commit 'a8f55d158c9926afbf5ab2f8f4434d8db5447e0e':
  Add Calls.TRANSCRIPTION to CallLog (2/2)
 2014-07-24 23:49:06 +00:00
Sander Alewijnse
af9f8aed7d Merge "Add http cookie header key as a provisioning extra." into lmp-dev 2014-07-24 15:36:04 +00:00
Sander Alewijnse
681bce94df Add http cookie header key as a provisioning extra. 
Change-Id: Id07ab52f265536b9790f4eb6ae314875e81a61d7
 2014-07-24 16:46:26 +01:00
Nicolas Prevot
b593e79436 am 498694c6: am 1b4a211d: am 4fe8fe2b: Merge "Making the clipboard work across users." into lmp-dev 
* commit '498694c67112923f85f3572c4b7ad093283d1f68':
  Making the clipboard work across users.
 2014-07-24 19:59:48 +00:00
Sandeep Siddhartha
10c9d3756d am 6fad8655: am 2eafe5a1: am e99f48c3: Merge "searchKeyphrase* should not be in the SDK" into lmp-dev 
* commit '6fad865540f31961c150526e3bc6bf84a3e907b3':
  searchKeyphrase* should not be in the SDK
 2014-07-24 19:59:15 +00:00
Nick Kralevich
fba7e25eae am 4a64c8e7: am c98d973c: am c91b2735: OsConstants: add PR_GET_DUMPABLE / PR_SET_DUMPABLE 
* commit '4a64c8e74aad4fce39a4ec5bc6235b24c12ebda6':
  OsConstants: add PR_GET_DUMPABLE / PR_SET_DUMPABLE
 2014-07-24 19:58:57 +00:00
Alan Viverette
ddd69e8283 am 57696778: am 0531babd: am 380b9a5e: Merge "Revert "Make lighting style and attribute public"" into lmp-dev 
* commit '57696778bc6ee94283e9d6c68c81940c7665187a':
  Revert "Make lighting style and attribute public"
 2014-07-24 19:58:34 +00:00
Joe Onorato
6ec5780a69 am 66428a4d: am cb3e87ea: am 3392ede6: Allow apps to be slow at loading children and thumbnails by making those functions allowed to be asynchronous. 
* commit '66428a4dd09482fbf20cc45f51eac111d251e770':
  Allow apps to be slow at loading children and thumbnails by making those functions allowed to be asynchronous.
 2014-07-24 19:58:06 +00:00
Alan Viverette
b2eaf63f83 am ef5244b3: am c83d49bb: am 69c11987: Merge "Make lighting style and attribute public" into lmp-dev 
* commit 'ef5244b3a5ae62e116385bf3323bc2445b0b2ece':
  Make lighting style and attribute public
 2014-07-24 19:57:49 +00:00
Nancy Chen
e4998d93fd am 07351459: am 26218798: am ef60a1ff: Merge "Hide multiple-account information if there is only a single account" into lmp-dev 
* commit '07351459af5d90b6adebc6c7ebab53f2eff33c96':
  Hide multiple-account information if there is only a single account
 2014-07-24 19:57:39 +00:00
Yorke Lee
7a5e5726ab Add Calls.TRANSCRIPTION to CallLog (2/2) 
Dialer needs access to the TRANSCRIPTION column via the CallLog to
show voicemail transcriptions inline.

Change-Id: Id1807923a07af9e9e34783e6be2e39485eee7795
 2014-07-24 08:30:33 -07:00
Nick Kralevich
cdc7448b29 OsConstants: add PR_GET_DUMPABLE / PR_SET_DUMPABLE 
Expose PR_GET_DUMPABLE and PR_SET_DUMPABLE via java.

Change-Id: Ibb60ed1d00c3a84fa77a34d0acc56cb995d14e1c
 2014-07-24 03:41:34 +00:00
Bo Liu
9f3ed850b6 Add WebView.enableSlowWholeDocumentDraw 
BUG: 16300353
Change-Id: Id4475f04f32bb176a6a59ee9d5a09e3f65b94ef0
 2014-07-23 19:39:46 -07:00
Joe Onorato
69b078599b Allow apps to be slow at loading children and thumbnails by making those functions allowed to be asynchronous. 
Change-Id: Ibcaee3f0f8d9ba14f1b002df9c6d4594c6278045
 2014-07-23 17:56:57 -07:00
Yao Chen
7e9ad82d90 am 3f243a41: am b0bc2aad: am 9ea412ab: Merge "various fixes in MediaBrowserItem and MediaBrowserService" into lmp-dev 
* commit '3f243a411e1d2f4b2500995d3a32560c0fc79222':
  various fixes in MediaBrowserItem and MediaBrowserService
 2014-07-23 20:38:10 +00:00
Gabriel Peal
2e23f3b184 am 7062d88d: am 6aac8cf7: am f2b4f70b: Merge changes I925c8738,I1a8ad5c2 into lmp-dev 
* commit '7062d88de40de8e6dd160bc9a10922aa0a9ff7d7':
  Added Action to PlaybackState
  Added QueueState, playUri, and playFromSearch.
 2014-07-23 20:17:04 +00:00
Nicolas Prevot
f1939901d2 Making the clipboard work across users. 
When copying from the parent: the ClipData can be pasted in the managed profile.
When copying from a managed profile: it can be pasted in the parent,
unless the policies says it's disabled. In which case, the clipboard of the parent becomes empty.
Supporting content uris.

BUG: 15186236

Change-Id: I522564a7c07ff21df137adcda980bb52e5739964
 2014-07-24 10:25:57 +00:00
Tao Bai
d673c47491 am f56d307b: am d5874836: am 9ba09c25: Merge "WebView permission change" into lmp-dev 
* commit 'f56d307b4b082c15a17898bf00fc2ee60a100386':
  WebView permission change
 2014-07-23 19:32:00 +00:00
Sandeep Siddhartha
9d9ef2e791 Merge "searchKeyphrase* should not be in the SDK" into lmp-dev 2014-07-23 18:56:15 +00:00
Sandeep Siddhartha
392981e172 searchKeyphrase* should not be in the SDK 
Bug: 16400889
Change-Id: Idedaefe378e330910301a8f0a88527376398d743
 2014-07-23 15:16:10 -07:00
Alan Viverette
35efc633d0 Merge "Revert "Make lighting style and attribute public"" into lmp-dev 2014-07-23 18:56:15 +00:00
Alan Viverette
4c31decf17 Revert "Make lighting style and attribute public" 
We're moving some things around. Stay tuned!

This reverts commit fe16224456b72966515190e19f8f85793a39d1c9.

Change-Id: I13a2013854cba64540dfee5c3e4ecb4929c336b5
 2014-07-24 01:43:51 +00:00
Alan Viverette
ad7e715f8b Make lighting style and attribute public 
BUG: 15859361
Change-Id: I8a12b820687c546d7441a06161da5928b2ac52fb
 2014-07-23 17:31:00 -07:00
Alan Viverette
1bc61376f5 Merge "Make lighting style and attribute public" into lmp-dev 2014-07-23 18:56:15 +00:00
Yao Chen
7e21fe8be9 various fixes in MediaBrowserItem and MediaBrowserService 
Change-Id: I57f2a6728eea14ff6243fd68d21886599a5a12f4
 2014-07-23 13:15:23 -07:00
Gabriel Peal
b8cb6518d8 Merge changes I925c8738,I1a8ad5c2 into lmp-dev 
* changes:
  Added Action to PlaybackState
  Added QueueState, playUri, and playFromSearch.
 2014-07-23 18:56:15 +00:00
Tao Bai
2871febb19 WebView permission change 
As requested by API council, the following were changed
- Changed the PermissionRequest to abstract.
- Used String for resources instead of long.
- Also remove the WebView.preauthorizePermission() which we didn't think

BUG: 15432556
Change-Id: I900a98b4e0288d2bcd8faf0bbcd84970600548a5
 2014-07-23 12:16:55 -07:00
Gabriel Peal
f364f94496 Added Action to PlaybackState 
Added the ability to discover MediaBrowsers

Change-Id: I925c8738ac73afd0bee3dada2ee7ff2d5047e63f
 2014-07-23 11:45:03 -07:00
Gabriel Peal
f0593bc17b Added QueueState, playUri, and playFromSearch. 
Added QueueState to MediaSession/MediaController
Added play(Uri) and playFromSearch(String) to MediaController.TransportControls

Change-Id: I1a8ad5c22d05015ab6ff5700dc8a758455f1d89b
 2014-07-23 11:45:03 -07:00
Nancy Chen
2e02b9ea5c Merge "Hide multiple-account information if there is only a single account" into lmp-dev 2014-07-23 18:38:23 +00:00
Nancy Chen
6080118beb Hide multiple-account information if there is only a single account 
Adding an API method to telecomm to determine whether there is a single
account.

Bug: 16483795
Change-Id: If30d3a53458b4c784995f3f9e471c8163a8175a4
 2014-07-23 16:41:10 -07:00
RoboErik
627ec760b0 am 1edef222: am 67430c74: am 80380f82: Switch Session APIs over to AudioAttributes 
* commit '1edef22273242f5f08a45a064e8d197a6bd08892':
  Switch Session APIs over to AudioAttributes
 2014-07-23 17:26:47 +00:00
Sander Alewijnse
549d39e549 am f3c523e0: am ce1088a6: am fcb490a2: Merge "Add Device Policy API to disable screen capture." into lmp-dev 
* commit 'f3c523e06217b19ae8389f9ca8be71ed2cd9fe7b':
  Add Device Policy API to disable screen capture.
 2014-07-23 17:18:27 +00:00
RoboErik
9db9bf7034 Switch Session APIs over to AudioAttributes 
The session apis were using audioStream in several places. This
updates them to use AudioAttributes instead.

bug:16403289
Change-Id: Ic4da9ca5fbea2536e80c71503bd9a9bf7f346997
 2014-07-23 17:08:32 +00:00
Chris Wren
73cc43da36 am f03ef334: am 43387c0c: am eb6f138b: Honor the sort and group keys for notification ranking. 
* commit 'f03ef334c4e91643ba834d136b489f28cfbaf117':
  Honor the sort and group keys for notification ranking.
 2014-07-23 14:32:35 +00:00
Chris Wren
1031c97485 Honor the sort and group keys for notification ranking. 
Sort notifications naturally, then move group childen to be next their proxy.
The group proxy is the summary, or if no summary exists, the lowest-ranked
member of the group is chosen as the proxy.

Notifications with a sortKey but no group and placed into a synthetic
group that consists of all notifications from that package and user in
the same priority bucket that also have sortKeys.

Expose a new API for listeners to get the group key for the notificaiton.

Bug: 15190903
Change-Id: I324ba0c394affdabb3588ca2ebafa7cf0acad2af
 2014-07-23 09:45:25 -04:00