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

5415 Commits

Author SHA1 Message Date
Paul Soulos
6b2dd6337e Adds getTypeLabel to ContactsContract Event 
Bug: 16550284
Change-Id: Ie95093a2c9bca2b9ba130dea470c8beef94cd659
 2014-07-25 18:17:35 +00:00
Jorim Jaggi
e411fdfa4c Remove WindowManager.LayoutParams.TYPE_KEYGUARD (1/2) 
Change-Id: I5d234dc4383bbf205bde1a0e7f1e8266fc37d13a
 2014-07-29 14:43:03 +02:00
Hector Dearman
d49d6bf0cd Merge "Update CookieManager API for Council review." into lmp-dev 2014-07-24 15:36:05 +00:00
Ruben Brunk
1b1f1b611c camera2: Move noise model to dynamic metadata. 
Bug: 16369384

Change-Id: I7a540705176c7be68431a977e2b7218ffa1bddd0
 2014-07-24 17:43:54 +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
Jorim Jaggi
8a9068573c Merge "Fix status icon reappearing for legacy activities" into lmp-dev 2014-07-24 15:35:58 +00:00
Jae Seo
fbf35c9289 am ad83af39: am c20b846a: am 04c5422e: TIF: Rename methods in TvInputService 
* commit 'ad83af3960d6eb00f17013a30198b7fd6842a817':
  TIF: Rename methods in TvInputService
 2014-07-28 12:14:55 +00:00
Jae Seo
91a801d42f TIF: Rename methods in TvInputService 
This change addresses the following council feedback.

TvInputService.Session:
-- Rename onRequestUnblockContent() --> onUnblockContent()
-- Change all dispatch* methods to be notify*

Bug: 16542165
Change-Id: Ib9c8dc825665fdf75ebd1d13b1e39c39514132f1
 2014-07-28 17:28:15 +09:00
Alan Viverette
b49f099611 am c5697654: am 2720d7ba: am 77b2010c: Merge "Add public attribute for window clipToOutline" into lmp-dev 
* commit 'c5697654cdaa433b3eddfa032cee4f2b6c77d97e':
  Add public attribute for window clipToOutline
 2014-07-26 01:11:04 +00:00
Zhijun He
79a53de48c am 996db1f2: am c877e92e: am b52d22ce: Merge "CamcorderProfiles: add high speed profile constants" into lmp-dev 
* commit '996db1f2f20c5375c1675c2d07249b7a83728fe5':
  CamcorderProfiles: add high speed profile constants
 2014-07-26 01:10:51 +00:00
ztenghui
29e2dd95fd am 5b942f14: am 6038139c: am ed2a502c: Merge "API REVIEW: VectorDrawable" into lmp-dev 
* commit '5b942f1430bc5bf6ee35455919b7985d8fdefdc2':
  API REVIEW: VectorDrawable
 2014-07-25 23:42:46 +00:00
Evan Charlton
8e6e3234d1 am 8e7488da: am eeb7ea86: am 2f22a0eb: Merge "Make creating the Connection synchronous" into lmp-dev 
* commit '8e7488dad21e6db08a8d9c15318f394aa04dfedd':
  Make creating the Connection synchronous
 2014-07-25 23:13:26 +00:00
Yorke Lee
acaf686488 am ff650115: am e120d1e5: am c8f3ac84: Merge "Update the value of PinnedPositions.UNPINNED to 0" into lmp-dev 
* commit 'ff65011576f13cd28cafe6a83098b18bf66344db':
  Update the value of PinnedPositions.UNPINNED to 0
 2014-07-25 21:57:43 +00:00
Alan Viverette
d0e9449963 Merge "Add public attribute for window clipToOutline" into lmp-dev 2014-07-25 21:16:23 +00:00
Alan Viverette
40982d46f9 Add public attribute for window clipToOutline 
Also ensures clipToOutline is false is the background is null.

BUG: 16549166
BUG: 16566746
Change-Id: Iacb08b64464cb93cbd8f34f2ec0308a77d40aab5
 2014-07-25 17:48:55 -07:00
ztenghui
a95c8abb36 API REVIEW: VectorDrawable 
- Merge <size> and <viewport> attributes all in to top-level <vector> tag
- Indent attributes under <group> in java doc.
- Updata android:stroke to be android:strokeColor, likewise android:fill
- Instead of android:clipToPath, make this a different clip-path tag.
- Document units of the various attributes
- Add example code for defining a VectorDrawable resource

More than that:
= Refactor the code to better support clipPath as a sub-class.
= Update all the xml files to use the new attributes and clip-path tag.

TODO:
-- Remove clipToPath, since that should happen on build break Friday.

bug:16488254

Change-Id: I6db5680ef83cb26c8f064a60fc7d6e7142974b0f
 2014-07-25 23:26:41 +00:00
Alan Viverette
0ef12ae0a5 am aa7deddf: am 86706558: am e1af5ff0: Merge "Remove duplicate Toolbar method for setting content description" into lmp-dev 
* commit 'aa7deddf21ca2bf3b0f5175dc302f8c50dab31f9':
  Remove duplicate Toolbar method for setting content description
 2014-07-25 20:21:19 +00:00
Jeff Sharkey
b64fd1957f am 891d3aa9: am a475ef57: am 4d700a9c: Merge "PackageInstaller changes based on feedback." into lmp-dev 
* commit '891d3aa977653fb79f544f69fab2d214e58cd2b3':
  PackageInstaller changes based on feedback.
 2014-07-25 19:25:10 +00:00
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