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

150577 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Winson Chung
60c1b9e4ed am 217a7134: am e6c940f7: Small tweaks to the stack curve and header transition. (Bug 16656169) 
* commit '217a71345650439f6f5b0407fae797f8f9618131':
  Small tweaks to the stack curve and header transition. (Bug 16656169)
 2014-08-19 21:08:06 +00:00
Adam Lesinski
7c97b74a05 am 1f5eb661: am 960ab6de: Merge "Add Shell command to set AppOps permissions" into lmp-dev 
* commit '1f5eb661b38dee97c65ddfb7a7dc720afbcca3bb':
  Add Shell command to set AppOps permissions
 2014-08-19 21:08:01 +00:00
Amith Yamasani
6450f683fd am bb93703d: am 1e8ba427: Merge "Rephrase the Exit guest action and dialog text" into lmp-dev 
* commit 'bb93703df5374205ddb2b09d138d571b5ed117d3':
  Rephrase the Exit guest action and dialog text
 2014-08-19 21:07:56 +00:00
Tim Murray
053e36dfa3 am c9c78206: am 9ba9298e: Merge "Stop sign-extending RS IDs." into lmp-dev 
* commit 'c9c7820604158bc6c6ba0e413cc48c8e1c0a6366':
  Stop sign-extending RS IDs.
 2014-08-19 21:07:47 +00:00
Tim Murray
d0080ee004 am 7fa25bc1: am 3c02b020: Merge "Fix IO_INPUT with 64-bit." into lmp-dev 
* commit '7fa25bc1269d3ba2db79f32acb17d80194cbadce':
  Fix IO_INPUT with 64-bit.
 2014-08-19 21:07:42 +00:00
Winson Chung
74c86ebd64 am a4f6df0f: Merge "Adding shadows to the focus state and fab button. (Bug 16950262)" into lmp-dev 
* commit 'a4f6df0f51adc0ae69fa845ceb7d0a20713cc1b2':
  Adding shadows to the focus state and fab button. (Bug 16950262)
 2014-08-19 20:55:14 +00:00
Winson Chung
0fc0748e38 am e6c940f7: Small tweaks to the stack curve and header transition. (Bug 16656169) 
* commit 'e6c940f7a6a831e1e0a1bf18f9e57b0408dc72ef':
  Small tweaks to the stack curve and header transition. (Bug 16656169)
 2014-08-19 20:55:09 +00:00
Adam Lesinski
6e6bc85c1c am 960ab6de: Merge "Add Shell command to set AppOps permissions" into lmp-dev 
* commit '960ab6de31ddd1a92e7a2e1829a2f2cd9b209c13':
  Add Shell command to set AppOps permissions
 2014-08-19 20:55:05 +00:00
Amith Yamasani
3dbbd63410 am 1e8ba427: Merge "Rephrase the Exit guest action and dialog text" into lmp-dev 
* commit '1e8ba427abacc928f018ceaf21a9278de886b43d':
  Rephrase the Exit guest action and dialog text
 2014-08-19 20:47:10 +00:00
Winson Chung
abedcab44c Small tweaks to the stack curve and header transition. (Bug 16656169) 
Change-Id: I96120063a66f267ad0b6a39b3dd020bc030083b8
 2014-08-19 20:45:36 +00:00
Tim Murray
b616aa78a1 am 9ba9298e: Merge "Stop sign-extending RS IDs." into lmp-dev 
* commit '9ba9298e028e32eb6b1058dfb47eeae5fda164c4':
  Stop sign-extending RS IDs.
 2014-08-19 20:39:05 +00:00
Tim Murray
5e8e9c336f am 3c02b020: Merge "Fix IO_INPUT with 64-bit." into lmp-dev 
* commit '3c02b0201c4e57bb493a926ee79aaf80fbd1ff7b':
  Fix IO_INPUT with 64-bit.
 2014-08-19 20:39:01 +00:00
Alan Viverette
997aa40645 Draw accessibility focus in View rather than ViewRootImpl 
This ensures that the focus rect position is correct when running in
render thread accelerated mode. Also adds a missing call to draw the
overlay.

BUG: 16796647
BUG: 17063342
Change-Id: I377e5eaea89d3f20c8c7e82c264a0f106021d58b
 2014-08-19 20:36:07 +00:00
John Spurlock
07caa64de7 am 2e6222fe: am cb877145: Merge "Zen: Remove "allow disable" filter from noman." into lmp-dev 
* commit '2e6222fed9bacc16832240ac63223f913f61055a':
  Zen: Remove "allow disable" filter from noman.
 2014-08-19 20:34:23 +00:00
John Spurlock
3f5b887cba am cb877145: Merge "Zen: Remove "allow disable" filter from noman." into lmp-dev 
* commit 'cb8771459629d1801cbecb1bad1754351e24f083':
  Zen: Remove "allow disable" filter from noman.
 2014-08-19 20:26:46 +00:00
George Mount
ed526817bc am cc3e585f: am 793b08cd: Merge "Set start transform before animator starts." into lmp-dev 
* commit 'cc3e585f57ff509531f19e3dc361e9c89177ff60':
  Set start transform before animator starts.
 2014-08-19 20:05:52 +00:00
George Mount
3485d63b07 am 793b08cd: Merge "Set start transform before animator starts." into lmp-dev 
* commit '793b08cd65f98edb48fd6e3dae440b0d71405567':
  Set start transform before animator starts.
 2014-08-19 19:58:10 +00:00
Lorenzo Colitti
56d4c18e2f am 45b565ff: am 14152c79: Merge "Stop using LinkProperties for static configuration." into lmp-dev 
* commit '45b565ffdbd2962c336f385d80d6516cd1cc489a':
  Stop using LinkProperties for static configuration.
 2014-08-19 19:37:53 +00:00
Chris Craik
8380cedda2 am 8a55b117: am fc1bf228: Merge "Don\'t cast shadows from gradients with transparent parts" into lmp-dev 
* commit '8a55b117f8f787c7946bc9ac98dfe3e2e01e4f52':
  Don't cast shadows from gradients with transparent parts
 2014-08-19 19:37:48 +00:00
Lorenzo Colitti
f049f56b70 am 14152c79: Merge "Stop using LinkProperties for static configuration." into lmp-dev 
* commit '14152c7994d690a5ee0a0aad19701557407a4d70':
  Stop using LinkProperties for static configuration.
 2014-08-19 19:29:11 +00:00
Chris Craik
b38934179c am fc1bf228: Merge "Don\'t cast shadows from gradients with transparent parts" into lmp-dev 
* commit 'fc1bf228ec27ca3a1fd2d570650a003f0045a64b':
  Don't cast shadows from gradients with transparent parts
 2014-08-19 19:29:07 +00:00
Jesse Hall
9d4fd82c83 am 7deebad3: am d30eb64f: am 87978406: (-s ours) am df7af46a: VirtualDisplayAdapter: Set the transaction surface even if NULL 
* commit '7deebad390b42b8f6e24723120d31147c3e23701':
  VirtualDisplayAdapter: Set the transaction surface even if NULL
 2014-08-19 19:25:34 +00:00
Shishir Agrawal
f055a1124e am 8fa2b622: am 0ec424c1: Merge "Add public qualifier to TelephonyManager.TeleiccExchangeSimIO." into lmp-dev 
* commit '8fa2b622dc6c367d56cacefd0fb4821235e7d24d':
  Add public qualifier to TelephonyManager.TeleiccExchangeSimIO.
 2014-08-19 19:25:28 +00:00
Jesse Hall
bebaa8c470 am d30eb64f: am 87978406: (-s ours) am df7af46a: VirtualDisplayAdapter: Set the transaction surface even if NULL 
* commit 'd30eb64f61f1cacb1bfca1be512bc1d208206f08':
  VirtualDisplayAdapter: Set the transaction surface even if NULL
 2014-08-19 19:16:50 +00:00
Shishir Agrawal
426fb16355 am 0ec424c1: Merge "Add public qualifier to TelephonyManager.TeleiccExchangeSimIO." into lmp-dev 
* commit '0ec424c13d07bc59632bc85985ab0b5fd8ae0dec':
  Add public qualifier to TelephonyManager.TeleiccExchangeSimIO.
 2014-08-19 19:16:45 +00:00
Jesse Hall
efa5a01dc6 am 87978406: (-s ours) am df7af46a: VirtualDisplayAdapter: Set the transaction surface even if NULL 
* commit '87978406b405cafc773703b7c849e372339527b8':
  VirtualDisplayAdapter: Set the transaction surface even if NULL
 2014-08-19 19:12:08 +00:00
Jae Seo
47b9e4afc9 TIF: Add the video frame rate information to TvTrackInfo 
Bug: 16187997
Change-Id: I25d5489e42502fa8f2537aadc205bb4203980fb2
 2014-08-19 12:02:16 -07:00
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
Jesse Hall
87978406b4 am df7af46a: VirtualDisplayAdapter: Set the transaction surface even if NULL 
* commit 'df7af46a4c034410dd1544415c3dcf19edef82e3':
  VirtualDisplayAdapter: Set the transaction surface even if NULL
 2014-08-19 16:31:17 +00:00
Jesse Hall
df7af46a4c VirtualDisplayAdapter: Set the transaction surface even if NULL 
Bug: 17116728
Change-Id: I55e4a2e575cfd3788fbdb90b050dac486976c1b6
 2014-08-19 09:18:40 -07:00