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

8232 Commits

Author SHA1 Message Date
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
466d203c4f Add method to launch settings app details page. 
Add a method to LauncherApps to allow launchers to
show application details for an app in a managed profile.

Bug: 16371359
Change-Id: I23acb4365c09e4a7b9fa742ae6fc7e04434f45aa
 2014-07-25 15:59:51 +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
Kenny Guy
237aecd18d Change getBadgedLabelForUser to use CharSequence 
Bug: 16401636
Change-Id: I45410a6293007dd789d6770d63397824559b756e
 2014-07-25 10:12:11 +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
Santos Cordon
9d0f7c4fbc Add more disconnect causes 1/4 
Bug: 15692074
Change-Id: Ib94c33fac8450b70e53dbe12d71f41777e9e140c
 2014-07-25 03:16:00 +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
Craig Mautner
8746a478ab Create end of animation callback for Activity 
Activities cannot draw while their entering animations are active.
This change introduces a callback, onEnterAnimationComplete() so
that activities can know when their draws will be effective.

Fixes bug 13658460.

Change-Id: Ic48540cd4c7e37538f10cb2dc0852aa3f55d11e1
 2014-07-25 01:35:02 +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
Andrew Lee
63e44bd999 Merge "Add VideoCall and VideoCall.Listener as an inner classes of Call." into lmp-dev 2014-07-24 22:43:15 +00:00
Andrew Lee
50aca23bd7 Add VideoCall and VideoCall.Listener as an inner classes of Call. 
Bug: 16494880
Bug: 16495203
Change-Id: Ife3b6723374ea5fbbff4927c4f9168d075be21e1
 2014-07-25 08:58:10 -07:00
Zhijun He
86c545ea8c MediaFormat: add capture rate key 
Change-Id: I2f7dd244d41d52aab6a172ae5df3e1fce3edd694
 2014-07-25 00:52:42 +00:00
Selim Gurun
c5a1e2c872 Merge "Address API review" into lmp-dev 2014-07-24 22:06:48 +00:00
Selim Gurun
48f6c45069 Address API review 
Bug: 16403458

Address API review. This change updates the FileChooser api. The
largest change is, as requested by API council, providing a helper
to reduce the code app developers need to implement. This
change does not include the CookieManager changes that was requested.

Change-Id: I30d75f36df6bc96d9842b63fdd25c4ff62aee5bb
 2014-07-24 15:18:57 -07:00
Ruben Brunk
1b1f1b611c camera2: Move noise model to dynamic metadata. 
Bug: 16369384

Change-Id: I7a540705176c7be68431a977e2b7218ffa1bddd0
 2014-07-24 17:43:54 +00:00
Dongwon Kang
94a509b123 Remove COLUMN_CONDITIONAL_ACCESS from TvContract. 
It turned out that having this flag in Channels table does not
make sense for some European countries because they scremble the signal
per program basis. Also, the current flag does not fit to the use-case
like 'pay per view'. Decided to remove this in L release because it's not
clear how we will handle the cases raised at this moment.

Change-Id: Ibbf829f331a307ac89a553e00ece18d5958e72b5
 2014-07-25 10:19:12 +09:00
Hector Dearman
d49d6bf0cd Merge "Update CookieManager API for Council review." into lmp-dev 2014-07-24 15:36:05 +00:00
Hector Dearman
ffae672881 Update CookieManager API for Council review. 
Remove synchronized from setAcceptThirdPartyCookies

Bug: 16403458
Change-Id: I6073da2c03fd0952bc447f7cfe0d959148af6877
 2014-07-24 18:10:25 +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
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