Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
157,612 Commits 3 Branches 0 Tags
ec83bc514a7b8e944b1c7dfe604efbe1046bb668
Commit Graph

9077 Commits

Author SHA1 Message Date
Tyler Gunn
ec83bc514a am 170694a5: am a99279fe: am ba740d4f: Allowing enable/disable of phone accounts. (1/3) 
* commit '170694a5d8803e26b35bbeba63b0add9e6f2191a':
  Allowing enable/disable of phone accounts. (1/3)
 2014-09-12 19:18:45 +00:00
Nancy Chen
bf7bf467d9 am d048afca: am f05b8506: am 48bc7ea4: Merge "API changes in GatewayInfo, Response, and PropertyPresentation (1/4)" into lmp-dev 
* commit 'd048afca82398e694d1089fea7861d03843be815':
  API changes in GatewayInfo, Response, and PropertyPresentation (1/4)
 2014-09-12 19:18:39 +00:00
ztenghui
0421e5f947 am 85c9f80a: am 548b9294: am 8738c8db: Merge "Bring back the fillAlpha and strokeAlpha." into lmp-dev 
* commit '85c9f80a2ce712891fec9411562bd0cb48249586':
  Bring back the fillAlpha and strokeAlpha.
 2014-09-12 19:18:25 +00:00
Lajos Molnar
5a52457fab am 7fca7f55: am b9414beb: am 3b22910c: Merge "add android.util.SizeF.parseSizeF()" into lmp-dev 
* commit '7fca7f55f21cd34b94ace89167f6516228520bff':
  add android.util.SizeF.parseSizeF()
 2014-09-11 17:27:43 +00:00
Alan Viverette
cfd3deef7d am 28d22bd2: am 1c19026d: am 8b5ef83e: Merge "Make SearchView styles public, remove public Holo styles added in L" into lmp-dev 
* commit '28d22bd23b219fc65eb80da04945fc0b72100040':
  Make SearchView styles public, remove public Holo styles added in L
 2014-09-11 17:26:40 +00:00
Tao Bai
b1664bd741 am 42a3b372: am cdad4651: am 3350edac: Merge "Revise createIntent and parseResult API." into lmp-dev 
* commit '42a3b372b5c41f5fe9b3c4e8645a924e32dd0443':
  Revise createIntent and parseResult API.
 2014-09-11 17:24:48 +00:00
Tyler Gunn
a1ed7d1094 Allowing enable/disable of phone accounts. (1/3) 
- added "hasCapabilities" method on PhoneAccount.
- added CAPABILITY_PLACE_EMERGENCY_CALLS.
- added isEnabled method builder constructor to initialize from an
existing PhoneAccount.

Bug: 17306514
Bug: 17408536

Change-Id: I57de508b4adcf207f3b29cab449bfc634db80153
 2014-09-11 17:13:51 +00:00
Nancy Chen
4823aecef3 Merge "API changes in GatewayInfo, Response, and PropertyPresentation (1/4)" into lmp-dev 2014-09-11 17:06:28 +00:00
ztenghui
c96e392765 Merge "Bring back the fillAlpha and strokeAlpha." into lmp-dev 2014-09-11 16:32:37 +00:00
Jean-Michel Trivi
ce6ec6d256 am c60cf440: am 16c67b4d: am 6fa0947a: Merge "Virtualizer: replace device type by virtualization mode" into lmp-dev 
* commit 'c60cf440d6ef03f18cbcec8987da8fb5aa230fad':
  Virtualizer: replace device type by virtualization mode
 2014-09-11 14:15:28 +00:00
Eric Laurent
62462e4c1b am 31b26c08: am 728f1ba3: am c5db63b6: Merge "Hide AudioDevice class" into lmp-dev 
* commit '31b26c08f22b8fae6012460fa234792fbfaee473':
  Hide AudioDevice class
 2014-09-11 14:15:22 +00:00
Esteban Talavera
92f2cadf07 am bfb49179: am 52437ed7: am 55bffb50: Merge "Update string value for provisioning action and extra" into lmp-dev 
* commit 'bfb491793470f70cddcc7433a68f072a752aec41':
  Update string value for provisioning action and extra
 2014-09-11 14:14:34 +00:00
Christoph Studer
cbbfdd93ce am 7e972136: am 72d1509d: am 6e68dff3: Merge "NoLiService: Delete @removed meetsInterruptionFilter" into lmp-dev 
* commit '7e97213689ca26aad243f5a5009c39f616298619':
  NoLiService: Delete @removed meetsInterruptionFilter
 2014-09-11 14:12:41 +00:00
Adam Connors
de2f85e871 am 94705219: am 50c161df: am 5e1fe70f: Merge "Add feature flags for verified boot and securely remove users." into lmp-dev 
* commit '94705219a13a9d8909c4502eac493d3ef9459403':
  Add feature flags for verified boot and securely remove users.
 2014-09-11 14:12:28 +00:00
Lajos Molnar
5b54c9fb2a Merge "add android.util.SizeF.parseSizeF()" into lmp-dev 2014-09-11 00:55:06 +00:00
Alan Viverette
7ff0270e7d Merge "Make SearchView styles public, remove public Holo styles added in L" into lmp-dev 2014-09-10 23:29:13 +00:00
ztenghui
2e17d2b232 Bring back the fillAlpha and strokeAlpha. 
At the same time, remove the group alpha since we did not follow the convention
that group's alpha should apply together, not separately to each elements.

b/17393626

Change-Id: Idfc071414213583924961dc8ea760d6fb317873c
 2014-09-10 16:26:48 -07:00
Alan Viverette
362f984df3 Make SearchView styles public, remove public Holo styles added in L 
We shouldn't adding styles for a deprecated theme. Also this cleans up
the removed public resources for easier deletion later.

BUG: 17455273
Change-Id: I2c5caf354aab91463702f25c38f0dd29c153ba44
 2014-09-10 16:05:35 -07:00
Tao Bai
bebc56209d Merge "Revise createIntent and parseResult API." into lmp-dev 2014-09-10 21:43:04 +00:00
Jean-Michel Trivi
f35423bb4e Merge "Virtualizer: replace device type by virtualization mode" into lmp-dev 2014-09-10 17:29:20 +00:00
Eric Laurent
b94b5d33b2 Merge "Hide AudioDevice class" into lmp-dev 2014-09-10 17:28:56 +00:00
Esteban Talavera
df980618a3 Merge "Update string value for provisioning action and extra" into lmp-dev 2014-09-10 16:26:50 +00:00
Christoph Studer
c8e1d78af9 Merge "NoLiService: Delete @removed meetsInterruptionFilter" into lmp-dev 2014-09-10 11:14:33 +00:00
Adam Connors
c90f95c79d Merge "Add feature flags for verified boot and securely remove users." into lmp-dev 2014-09-10 10:07:15 +00:00
Jessica Hummel
285890c52d am fa2d0222: am 9a21c2a3: am 1e4efc91: Merge "Remove unused DEFAULT_MANAGED_PROFILE_NAME extra from DevicePolicyManager." into lmp-dev 
* commit 'fa2d0222de3f4c627e52647793a037cdd8bd110a':
  Remove unused DEFAULT_MANAGED_PROFILE_NAME extra from DevicePolicyManager.
 2014-09-10 09:41:21 +00:00
Jessica Hummel
ec19d621b3 Merge "Remove unused DEFAULT_MANAGED_PROFILE_NAME extra from DevicePolicyManager." into lmp-dev 2014-09-10 08:08:48 +00:00
Jessica Hummel
e3da790f8c Remove unused DEFAULT_MANAGED_PROFILE_NAME extra from DevicePolicyManager. 
Change-Id: I6fe96df66a4a78cf2e2455d58bba13051d108fdf
bug:17152955
 2014-09-10 08:08:02 +00:00
Zhijun He
01b4bc1054 am d7332411: am 490f790b: am 5ef21e48: Merge "CamcorderProfile: Add QUALITY_HIGH_SPEED_2160P" into lmp-dev 
* commit 'd73324116a59b5ad9fcfcc8721db613e7d76f4c1':
  CamcorderProfile: Add QUALITY_HIGH_SPEED_2160P
 2014-09-10 07:23:09 +00:00
Lajos Molnar
39e977834d am f152b6e5: am 482a07d7: am 4f276471: Merge "MediaCodec/Drm: move from getErrorCode to getDiagnosticInfo" into lmp-dev 
* commit 'f152b6e557a785eeca19041001167b1dba34f08d':
  MediaCodec/Drm: move from getErrorCode to getDiagnosticInfo
 2014-09-10 07:22:57 +00:00
Wink Saville
c8496fef5a Update current.txt 
As getSmsManagerUsingSubId was renamed to getSmsManagerForSubscriber.

Bug: 17255752
Change-Id: I4c3999d194bd0972f1e274b02228489d6a850da9
 2014-09-09 23:57:48 -07:00
Zhijun He
350f2552e4 Merge "CamcorderProfile: Add QUALITY_HIGH_SPEED_2160P" into lmp-dev 2014-09-10 05:12:28 +00:00
Lajos Molnar
0f491d7513 add android.util.SizeF.parseSizeF() 
Bug: 17190665
Change-Id: Ic1b0087dfd40b86aaeb4687a1a3024c1ab54018f
 2014-09-09 21:16:03 -07:00
Lajos Molnar
2c5afa320e Merge "MediaCodec/Drm: move from getErrorCode to getDiagnosticInfo" into lmp-dev 2014-09-10 02:38:50 +00:00
Junda Liu
9d0081ee79 am 9df90035: am 6b78c2e5: am bdf9cf90: Add ForSubscriber suffix to APIs w/ subId argument. 
* commit '9df900354b8979dbbcfa8b321bb29ed373bcd501':
  Add ForSubscriber suffix to APIs w/ subId argument.
 2014-09-10 01:58:14 +00:00
Jeff Tinker
02fe289de9 am 52b59f6c: am 6a884aad: am 50bb6215: Merge "Add support for max-res decode" into lmp-dev 
* commit '52b59f6cb7155bf21abff70d25f0751a3f101830':
  Add support for max-res decode
 2014-09-10 01:10:08 +00:00
Eino-Ville Talvala
b0fbabb77b am 75b0c316: am f9e64824: am 28312293: Merge "Camera2: Add frameNumber to CaptureCallback#onCaptureStarted" into lmp-dev 
* commit '75b0c316390daeddbfcc897bcd4a763fed557fef':
  Camera2: Add frameNumber to CaptureCallback#onCaptureStarted
 2014-09-10 01:08:16 +00:00
Junda Liu
13e28bb938 Add ForSubscriber suffix to APIs w/ subId argument. 
Bug: b/17255752
Change-Id: I142d8961aa4c1fa074833f70c404c955caea0870
 2014-09-09 17:50:09 -07:00
Lajos Molnar
d7e5f680fa MediaCodec/Drm: move from getErrorCode to getDiagnosticInfo 
Bug: 17059255
Change-Id: I9f5f0be61e94795d90ad29e94b3a1a6e6aedfb1d
 2014-09-09 17:27:26 -07:00
Jeff Tinker
b00ab012bf Merge "Add support for max-res decode" into lmp-dev 2014-09-09 23:56:11 +00:00
Zhijun He
b67c3102c9 CamcorderProfile: Add QUALITY_HIGH_SPEED_2160P 
Bug: 17059255
Change-Id: Ic6b272e4ceec8fc852c9eb787370f4d366dad0ac
 2014-09-09 16:19:10 -07:00
Eino-Ville Talvala
31913c334a Merge "Camera2: Add frameNumber to CaptureCallback#onCaptureStarted" into lmp-dev 2014-09-09 22:20:58 +00:00
Amith Yamasani
95674712b0 am af81aa33: am d94df395: am 7a9f541e: Merge "User restriction to disallow outgoing NFC beam" into lmp-dev 
* commit 'af81aa331fce43f80b018a38a0f042b73e38c349':
  User restriction to disallow outgoing NFC beam
 2014-09-09 22:07:55 +00:00
Amith Yamasani
da6e6c888f Merge "User restriction to disallow outgoing NFC beam" into lmp-dev 2014-09-09 20:29:57 +00:00
Eino-Ville Talvala
e8df3093f5 Camera2: Add frameNumber to CaptureCallback#onCaptureStarted 
Otherwise, cannot reliably match up capture progressed and failure callbacks
with the start callback.

Bug: 17421092
Change-Id: I91d92be70a15536b215bac330370ce37e426ec26
 2014-09-09 12:38:11 -07:00
Amith Yamasani
26af829fd7 User restriction to disallow outgoing NFC beam 
This can be controlled by MDMs via DPM.

Also fixes:
 - javadoc for restrictions
 - persisting of cross profile copy/paste restriction

Bug: 17387303
Change-Id: Ie148f56189181d2a4c6345c0823d417ab13a94a3
 2014-09-09 12:09:47 -07:00
Tao Bai
e8df27aec8 Revise createIntent and parseResult API. 
- Both are move to FileChooserParams, remove UploadHelper class.
- createIntent only handls non-capture intents
- parseResult is the static member of FileChooseParams and should
  be used with createIntent.

BUG:17253647,16624450

Change-Id: I81cac7c1b739880db4e4c1f2b4612ed2ee87cb1b
 2014-09-09 11:21:22 -07:00
Craig Mautner
cb9bbc7f77 am 37af2b51: am 2297d88d: am 77e1dc74: Merge "Remove deprecated (and now unused) API method." into lmp-dev 
* commit '37af2b51c5f3198392de94acbf2ec13ed9563be4':
  Remove deprecated (and now unused) API method.
 2014-09-09 18:08:20 +00:00
Craig Mautner
345d4f4f14 Merge "Remove deprecated (and now unused) API method." into lmp-dev 2014-09-09 17:05:04 +00:00
Dianne Hackborn
0b95125d99 am 1420cfbf: am 2146dc79: am 0ad9e247: Merge "Add new wallpaper features for insets and offsets." into lmp-dev 
* commit '1420cfbf788fa9272f43231c15be29f7febdcde3':
  Add new wallpaper features for insets and offsets.
 2014-09-09 17:00:07 +00:00
Dianne Hackborn
bb8c483461 Merge "Add new wallpaper features for insets and offsets." into lmp-dev 2014-09-09 16:41:44 +00:00