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

150244 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Igor Murashkin
9423d558fd am 2cfef50a: am 77af33f8: Merge "camera2: Fix StreamConfigurationMap#getOutputSizes for ImageReader" into lmp-dev 
* commit '2cfef50a34cbffa77f15ee1e5fe962b8bc6659ed':
  camera2: Fix StreamConfigurationMap#getOutputSizes for ImageReader
 2014-08-19 18:54:48 +00:00
Igor Murashkin
fcfa4c9506 am 5e27ea67: am 3b690f25: Merge "camera2: (Legacy) Add control.sceneMode = DISABLED to templates" into lmp-dev 
* commit '5e27ea673ae91907f7b2316a6008db629356178c':
  camera2: (Legacy) Add control.sceneMode = DISABLED to templates
 2014-08-19 18:54:43 +00:00
Igor Murashkin
7940bde7eb am 77af33f8: Merge "camera2: Fix StreamConfigurationMap#getOutputSizes for ImageReader" into lmp-dev 
* commit '77af33f81d2cbef1580a103c4efda6829f20c7e1':
  camera2: Fix StreamConfigurationMap#getOutputSizes for ImageReader
 2014-08-19 18:42:38 +00:00
Igor Murashkin
32052c01ff am 3b690f25: Merge "camera2: (Legacy) Add control.sceneMode = DISABLED to templates" into lmp-dev 
* commit '3b690f25d97907486a4fcf9f8c05a89bf25f23fd':
  camera2: (Legacy) Add control.sceneMode = DISABLED to templates
 2014-08-19 18:42:35 +00:00
Lajos Molnar
d40c7bb5ed am 321d7e4f: am d127a4eb: media.MediaPlayer: don\'t check file-existence for URI-s with scheme 
* commit '321d7e4fa0a5d4ac377de7e3bb808b6eb424d4a7':
  media.MediaPlayer: don't check file-existence for URI-s with scheme
 2014-08-19 18:25:58 +00:00
Lajos Molnar
2f9aec66ee am d127a4eb: media.MediaPlayer: don\'t check file-existence for URI-s with scheme 
* commit 'd127a4ebe9cbd96dfe4879d969c4de0feedd4717':
  media.MediaPlayer: don't check file-existence for URI-s with scheme
 2014-08-19 18:14:43 +00:00
Lajos Molnar
d504ab14d2 media.MediaPlayer: don't check file-existence for URI-s with scheme 
setDataSource can be called with URI-s as well as with file paths.
Check file-existence only for file:// URI-s as well as URI-s
without scheme (which are assumed to be paths).

Bug: 17109022
Change-Id: I70f16a4f614dcef0b47fa264cf708473036cef4e
 2014-08-19 11:08:08 -07:00
RoboErik
23cba83ba8 am eb81b54a: am 368325e4: Update MediaSession APIs for council feedback 
* commit 'eb81b54aff12acaa0a77666c2f28dd3e7734902a':
  Update MediaSession APIs for council feedback
 2014-08-19 17:32:58 +00:00
RoboErik
c5daf4228d am 368325e4: Update MediaSession APIs for council feedback 
* commit '368325e4ea45f51b28a09c78a7f0f3c1f052443f':
  Update MediaSession APIs for council feedback
 2014-08-19 17:23:56 +00:00
RoboErik
a66c40bf6e Update MediaSession APIs for council feedback 
-Changes MediaSessionManager.SessionsListener to OnActiveSessionsChangedListener
and makes it an interface.
-Renames MediaController.VolumeInfo to MediaController.AudioInfo
-Renames MediaSession.Track to MediaSession.Item

bug:17059552
Change-Id: I3a0b4371700ad6657972c312a5ab89ddfac6df5b
 2014-08-19 17:12:42 +00:00
Chris Craik
2cfd9c90cf am 21b3486a: am fb52669c: Merge "Respect round rect clip when determining op opaqueness" into lmp-dev 
* commit '21b3486a5062cb398908a2e4ae2172c27d3efadf':
  Respect round rect clip when determining op opaqueness
 2014-08-19 17:10:57 +00:00
Chris Craik
84044a3ecf am fb52669c: Merge "Respect round rect clip when determining op opaqueness" into lmp-dev 
* commit 'fb52669c01cb31164801e2320f9d3fc954b3f16b':
  Respect round rect clip when determining op opaqueness
 2014-08-19 16:59:09 +00:00
George Mount
e36b9aef0e am 5bc2737b: am 2d0cb7d1: Add a way to get Transitions from a TransitionSet. 
* commit '5bc2737b2a98da670e7e8786c43df916a45f7eb2':
  Add a way to get Transitions from a TransitionSet.
 2014-08-19 16:58:32 +00:00
John Spurlock
a993674ac9 am 575e927a: am a21bd779: Merge "Revert workaround for network limit dialog." into lmp-dev 
* commit '575e927a4e25aad9e40959b153664dbf2d5df574':
  Revert workaround for network limit dialog.
 2014-08-19 16:58:27 +00:00
George Mount
c3a0b0a998 am 2d0cb7d1: Add a way to get Transitions from a TransitionSet. 
* commit '2d0cb7d16f3c280c1c4b317cbfc96a5bb9f3bc94':
  Add a way to get Transitions from a TransitionSet.
 2014-08-19 16:51:15 +00:00
John Spurlock
abd87a1e2e am a21bd779: Merge "Revert workaround for network limit dialog." into lmp-dev 
* commit 'a21bd779ae24cbb08ae95361f13006b09e7e273a':
  Revert workaround for network limit dialog.
 2014-08-19 16:51:11 +00:00
Tyler Gunn
36a7bba1ae am 084c98b4: am d324e32f: Merge "Exposing in-call API to other implementing classes. (1/4)" into lmp-dev 
* commit '084c98b407e30b044df1be08693c92c9284db31d':
  Exposing in-call API to other implementing classes. (1/4)
 2014-08-19 16:44:00 +00:00
Nicolas Prevot
880ac4a37e am 07e5e66c: am 0587c834: When notify uri changes, changing the way we retrieve the userId. 
* commit '07e5e66cccfe6c442d7476525ea6a73669ca84d2':
  When notify uri changes, changing the way we retrieve the userId.
 2014-08-19 16:43:56 +00:00
George Mount
7f15164ecb Add a way to get Transitions from a TransitionSet. 
Bug 17113732

Change-Id: I0a157a59448e66560ba2252709971131c5dea401
 2014-08-19 16:43:06 +00:00
Tyler Gunn
f7252e1a97 am d324e32f: Merge "Exposing in-call API to other implementing classes. (1/4)" into lmp-dev 
* commit 'd324e32f6643f9630fdc2dc6d88b6bf6e771886e':
  Exposing in-call API to other implementing classes. (1/4)
 2014-08-19 16:35:16 +00:00
Nicolas Prevot
7d01ea71d9 am 0587c834: When notify uri changes, changing the way we retrieve the userId. 
* commit '0587c834eeb980687e46b13b9cdeae54e5cb06cd':
  When notify uri changes, changing the way we retrieve the userId.
 2014-08-19 16:35:12 +00:00
Nicolas Prevot
ec4bb45a8c When notify uri changes, changing the way we retrieve the userId. 
Changing from UserHandle.getCallingUserId() to UserHandle.myUserId().
This makes the DocumentProvider work across users.

BUG: 16126891

Change-Id: I8ede64f2087894bb85eff5286803cdebd57e7137
 2014-08-19 17:09:09 +01:00
Selim Cinek
94e05d254c am c7fafbe5: am 29b3fee4: Merge "Removed bugreport tile code from Quick settings" into lmp-dev 
* commit 'c7fafbe5004b2c6d3fe47449823a81196d94e864':
  Removed bugreport tile code from Quick settings
 2014-08-19 15:59:03 +00:00
Selim Cinek
7e0ced5a31 am 29b3fee4: Merge "Removed bugreport tile code from Quick settings" into lmp-dev 
* commit '29b3fee4e4f04ca023ee1302be47507e5635e921':
  Removed bugreport tile code from Quick settings
 2014-08-19 15:51:17 +00:00
Chris Craik
f1381debec Merge "Respect round rect clip when determining op opaqueness" into lmp-dev 2014-08-19 15:47:37 +00:00
John Spurlock
08dc05641d am 10cae0ff: am 633c8237: Data usage limit strings + icon changes. 
* commit '10cae0ff8ce116960470dc3d35bc84be4121d7be':
  Data usage limit strings + icon changes.
 2014-08-19 14:46:19 +00:00
John Spurlock
5c2ba23348 am 633c8237: Data usage limit strings + icon changes. 
* commit '633c82379f655f834b71edb8abfec4f113424ada':
  Data usage limit strings + icon changes.
 2014-08-19 14:36:29 +00:00
John Spurlock
3eccbc270d Data usage limit strings + icon changes. 
- Change notification icon + text.
- Change QS detail overlimit title.

Bug:17042440
Change-Id: I45ebd82c3e676ec265f29b778605444ae4a1c4f1
 2014-08-19 10:25:47 -04:00
John Spurlock
b8222c725e am 86e86554: am 725ea467: Merge "QS: Enhance color inversion tile usage detection." into lmp-dev 
* commit '86e86554065e29573130ec3019b284ff109749bc':
  QS: Enhance color inversion tile usage detection.
 2014-08-19 13:33:35 +00:00
John Spurlock
a499545290 am 725ea467: Merge "QS: Enhance color inversion tile usage detection." into lmp-dev 
* commit '725ea467ecd30ea5391805cf628b7bf1a86e63e4':
  QS: Enhance color inversion tile usage detection.
 2014-08-19 12:37:24 +00:00
Kenny Guy
7efc392b37 am 74c1c9db: am 181fc408: Merge "First part of renaming methods in LauncherApps." into lmp-dev 
* commit '74c1c9db0c20706a3eb571309bb7888a16495808':
  First part of renaming methods in LauncherApps.
 2014-08-19 11:23:06 +00:00
Kenny Guy
ae673b7a1d am 181fc408: Merge "First part of renaming methods in LauncherApps." into lmp-dev 
* commit '181fc408746b5a6a1990670ce006984774d0c1a5':
  First part of renaming methods in LauncherApps.
 2014-08-19 11:15:00 +00:00
Selim Cinek
1d0de79990 am ce6a604d: am a5b81bec: Properly announcing the shade state for accessibility 
* commit 'ce6a604d7dfa28cc2a222e4c1de9b41c55119e64':
  Properly announcing the shade state for accessibility
 2014-08-19 11:01:03 +00:00
Selim Cinek
bb12355e29 am df75f2f2: am 279ce37b: Merge "Fixed accessibility issues with quick settings" into lmp-dev 
* commit 'df75f2f2e12621017cff7b23e0245ffc95107b04':
  Fixed accessibility issues with quick settings
 2014-08-19 11:00:49 +00:00
Selim Cinek
0a5d87d650 am a5b81bec: Properly announcing the shade state for accessibility 
* commit 'a5b81bec0e80ebfa231db1fc59f268a1f628a2b6':
  Properly announcing the shade state for accessibility
 2014-08-19 10:53:16 +00:00
Selim Cinek
6db08d1d11 am 279ce37b: Merge "Fixed accessibility issues with quick settings" into lmp-dev 
* commit '279ce37b8294a653af0f6c635aff97fcd6a9a06a':
  Fixed accessibility issues with quick settings
 2014-08-19 10:53:11 +00:00
Selim Cinek
90c946583d Properly announcing the shade state for accessibility 
When we are entering / leaving quicksettings, accessible
users are now informed about the state change.
Also fixed a bug where the lockscreen was called notification
shade.

Bug: 15696654
Change-Id: I39d8ad3367c424ec5f9a3795be46d4785a19bbee
 2014-08-19 10:48:56 +00:00
Esteban Talavera
545c5d5c50 am c3f863aa: am 5cf90bd9: Merge "Add cross profile intent in order after intent filter resolution" into lmp-dev 
* commit 'c3f863aa4158868ae493aeea20578b9539b9c148':
  Add cross profile intent in order after intent filter resolution
 2014-08-19 10:04:01 +00:00
Esteban Talavera
3d16ad8aba am 5cf90bd9: Merge "Add cross profile intent in order after intent filter resolution" into lmp-dev 
* commit '5cf90bd9d15ac27b0fc26007d8f50abed0913d4a':
  Add cross profile intent in order after intent filter resolution
 2014-08-19 09:56:21 +00:00
Ji-Hwan Lee
9363c6765f am 2c315fef: am 1becc968: TIF: Call setMain(false) when session is released. 
* commit '2c315fefd86f05f98180890aaa041c25b0fe5715':
  TIF: Call setMain(false) when session is released.
 2014-08-19 06:31:13 +00:00
Ji-Hwan Lee
69645b10cd am 1becc968: TIF: Call setMain(false) when session is released. 
* commit '1becc968b47b82d2bea2ee83f2fb91dcda07e54e':
  TIF: Call setMain(false) when session is released.
 2014-08-19 06:23:19 +00:00
Jinsuk Kim
c98889df16 am 41869802: am 53130b88: Merge "CEC: Invoke events listener upon MHL device state change" into lmp-dev 
* commit '418698026e0a5303dc588c99efa64e3a9e401d47':
  CEC: Invoke events listener upon MHL device state change
 2014-08-19 06:15:40 +00:00
Andrew Solovay
36bf2079ba am 4d2a4062: am 338c46a1: am eb60d0f1: am 94174ff7: am 8319455a: Merge "docs: Documented new fields returned by getSkuDetails()." into klp-modular-docs 
* commit '4d2a4062191b27845058e456dfe6ebb27ac66ace':
  docs: Documented new fields returned by getSkuDetails().
 2014-08-19 06:11:16 +00:00
Ji-Hwan Lee
15c56aac98 TIF: Call setMain(false) when session is released. 
Also, rename setMainTvView() and setMainSession() to setMain(), except
ITvInputManager.

Change-Id: I586e3fd42720f07a75d6f31b1ee955ce5c29dd68
 2014-08-19 06:11:04 +00:00
Jinsuk Kim
b79ad0a3d7 am 53130b88: Merge "CEC: Invoke events listener upon MHL device state change" into lmp-dev 
* commit '53130b886f8baf2e7e75fdae8f71d90cc2b51929':
  CEC: Invoke events listener upon MHL device state change
 2014-08-19 06:07:54 +00:00
Andrew Solovay
7cb2570a0a am 338c46a1: am eb60d0f1: am 94174ff7: am 8319455a: Merge "docs: Documented new fields returned by getSkuDetails()." into klp-modular-docs 
* commit '338c46a18d5d7f2715248b4d512c9de559843864':
  docs: Documented new fields returned by getSkuDetails().
 2014-08-19 05:59:55 +00:00
Andrew Solovay
fc6b01f463 am eb60d0f1: am 94174ff7: am 8319455a: Merge "docs: Documented new fields returned by getSkuDetails()." into klp-modular-docs 
* commit 'eb60d0f1937392351ef81f10b651749bd47f7898':
  docs: Documented new fields returned by getSkuDetails().
 2014-08-19 05:52:57 +00:00
Jaewan Kim
99eb59cbe1 am 8e04501a: am ecd7d762: Merge "Fix NPE when passing null TvContentRating" into lmp-dev 
* commit '8e04501a425dc4cf34833d4cd87655af30efe923':
  Fix NPE when passing null TvContentRating
 2014-08-19 05:12:14 +00:00
Jaewan Kim
8b1b8a302c am ecd7d762: Merge "Fix NPE when passing null TvContentRating" into lmp-dev 
* commit 'ecd7d762a47ad1a387db26c2b9ddc59ab310f00f':
  Fix NPE when passing null TvContentRating
 2014-08-19 05:03:07 +00:00
Dongwon Kang
54557f34d9 am ad741c97: am 7c2ae217: Merge "TIF: verify the hardware input ID from getHardwareInputId()." into lmp-dev 
* commit 'ad741c9789f351ce2d05af4d4c0b85ebf2f2d7e0':
  TIF: verify the hardware input ID from getHardwareInputId().
 2014-08-19 04:25:05 +00:00