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

149309 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ztenghui
f0d5c7bc5a am c04a21f8: am bbbe3d7b: am 6ab0f21f: Merge "Update attrs / public.xml for VectorDrawable opacity removal" into lmp-dev 
* commit 'c04a21f84b466ea54d46f4fd3bb26fb0b7c6f90c':
  Update attrs / public.xml for VectorDrawable opacity removal
 2014-08-08 21:16:51 +00:00
ztenghui
475a8d8496 am bbbe3d7b: am 6ab0f21f: Merge "Update attrs / public.xml for VectorDrawable opacity removal" into lmp-dev 
* commit 'bbbe3d7b575ba1275c4f92c7b0d72c3430cc20a2':
  Update attrs / public.xml for VectorDrawable opacity removal
 2014-08-08 21:12:37 +00:00
ztenghui
1b41552385 am 6ab0f21f: Merge "Update attrs / public.xml for VectorDrawable opacity removal" into lmp-dev 
* commit '6ab0f21f2c838da710659e9cc5e2d5813d16ca49':
  Update attrs / public.xml for VectorDrawable opacity removal
 2014-08-08 21:08:29 +00:00
Winson Chung
265b6fc548 am 8aa64bdf: am 0ecbe9d6: am 14176afa: Merge "Exposing taskDescription for apps to read from their own AppTasks. (Bug 16826622)" into lmp-dev 
* commit '8aa64bdf9fb4d37fda6590b709f63204693bde17':
  Exposing taskDescription for apps to read from their own AppTasks. (Bug 16826622)
 2014-08-08 21:06:14 +00:00
Amith Yamasani
186be6de26 am 794fca97: am a7d2f72f: am c35d3ebb: Merge "No need to send PRE_BOOT_COMPLETED for new users" into lmp-dev 
* commit '794fca977de17415e06946c23b71e8bd19d24b78':
  No need to send PRE_BOOT_COMPLETED for new users
 2014-08-08 21:06:09 +00:00
Winson Chung
64d58eb9e1 am 0ecbe9d6: am 14176afa: Merge "Exposing taskDescription for apps to read from their own AppTasks. (Bug 16826622)" into lmp-dev 
* commit '0ecbe9d6882d1d4138d4b9ca390c96c7014b692c':
  Exposing taskDescription for apps to read from their own AppTasks. (Bug 16826622)
 2014-08-08 21:00:30 +00:00
Amith Yamasani
6ac9592eee am a7d2f72f: am c35d3ebb: Merge "No need to send PRE_BOOT_COMPLETED for new users" into lmp-dev 
* commit 'a7d2f72ffcdcd15ed4a22f57c1a5cff8d1756587':
  No need to send PRE_BOOT_COMPLETED for new users
 2014-08-08 21:00:26 +00:00
Winson Chung
f62ff50168 am 14176afa: Merge "Exposing taskDescription for apps to read from their own AppTasks. (Bug 16826622)" into lmp-dev 
* commit '14176afa349fb17ba6327e12882e503fd84f41a0':
  Exposing taskDescription for apps to read from their own AppTasks. (Bug 16826622)
 2014-08-08 20:56:09 +00:00
Amith Yamasani
377d926096 am c35d3ebb: Merge "No need to send PRE_BOOT_COMPLETED for new users" into lmp-dev 
* commit 'c35d3ebb1381e52db1929206524a72d258ba6aea':
  No need to send PRE_BOOT_COMPLETED for new users
 2014-08-08 20:56:04 +00:00
John Reck
a4f68ee546 am dda54735: am 3a7d5fa9: am 4f215996: Fix damage for layers for projection receivers 
* commit 'dda547354b5c7bcf631735311165ce1c63459c20':
  Fix damage for layers for projection receivers
 2014-08-08 20:51:16 +00:00
John Reck
9883ac77f6 am 3a7d5fa9: am 4f215996: Fix damage for layers for projection receivers 
* commit '3a7d5fa9d07d4638470ae466b8e392c392650da8':
  Fix damage for layers for projection receivers
 2014-08-08 20:48:01 +00:00
John Reck
972466f7e9 am 4f215996: Fix damage for layers for projection receivers 
* commit '4f2159960c7a8921834677f748d7018774685a21':
  Fix damage for layers for projection receivers
 2014-08-08 20:43:52 +00:00
John Spurlock
df6a28475b am ba5c934c: am fa8faa9b: am 508dc373: Merge "New api to sync zen mode state from listeners." into lmp-dev 
* commit 'ba5c934c7e3562df7492b77ecb7904847011eedf':
  New api to sync zen mode state from listeners.
 2014-08-08 20:25:07 +00:00
John Reck
a7c2ea20c4 Fix damage for layers for projection receivers 
Bug: 16880228

Change-Id: I59ab760a21f49cc2cac0d8936b173cff292e6114
 2014-08-08 20:24:34 +00:00
John Spurlock
fd99d03430 am fa8faa9b: am 508dc373: Merge "New api to sync zen mode state from listeners." into lmp-dev 
* commit 'fa8faa9b47b091be53da695b950c9d803699f1a4':
  New api to sync zen mode state from listeners.
 2014-08-08 20:21:24 +00:00
John Spurlock
f36a999bf4 am 508dc373: Merge "New api to sync zen mode state from listeners." into lmp-dev 
* commit '508dc373dd3eda0da7ff104fd60acbd1338ae718':
  New api to sync zen mode state from listeners.
 2014-08-08 20:16:53 +00:00
Dake Gu
cc11a1106f am dc0781b5: am ffbf66b6: am afb539e6: Merge "Transition: remap if views in calling activity became invalid" into lmp-dev 
* commit 'dc0781b5518be0bcfce6a5e8f63a819b59ef1b0e':
  Transition: remap if views in calling activity became invalid
 2014-08-08 19:56:51 +00:00
Alan Viverette
1ed8e75a72 am 1bdf2c19: am 68bb1bfc: am 4f048817: Merge "Don\'t make ripples respond to selection state" into lmp-dev 
* commit '1bdf2c192c55fc9bb195417df53327e08c61d726':
  Don't make ripples respond to selection state
 2014-08-08 19:56:47 +00:00
Andrew Lee
a8a7498a7e am 8f74ec09: am 295e0c8a: am 9ce25877: Aidl changes related to VideoCallProvider in Ims. 
* commit '8f74ec097106258e077ae6e14bfbd09006fa4bcb':
  Aidl changes related to VideoCallProvider in Ims.
 2014-08-08 19:56:42 +00:00
Dake Gu
24ef06f9d3 am ffbf66b6: am afb539e6: Merge "Transition: remap if views in calling activity became invalid" into lmp-dev 
* commit 'ffbf66b6e4e0c7de293156e32aff73f61127db2a':
  Transition: remap if views in calling activity became invalid
 2014-08-08 19:51:10 +00:00
Alan Viverette
1bc83bd2f4 am 68bb1bfc: am 4f048817: Merge "Don\'t make ripples respond to selection state" into lmp-dev 
* commit '68bb1bfcd9ae87db421d50d66f6125ca8e1d199d':
  Don't make ripples respond to selection state
 2014-08-08 19:51:06 +00:00
Andrew Lee
8afa54206e am 295e0c8a: am 9ce25877: Aidl changes related to VideoCallProvider in Ims. 
* commit '295e0c8a7a4ee8757630a7a21a8459a4e67aaa5b':
  Aidl changes related to VideoCallProvider in Ims.
 2014-08-08 19:50:57 +00:00
Dake Gu
68a9804301 am afb539e6: Merge "Transition: remap if views in calling activity became invalid" into lmp-dev 
* commit 'afb539e6746f19498dced6758cf59b5074e7c76b':
  Transition: remap if views in calling activity became invalid
 2014-08-08 19:36:01 +00:00
Alan Viverette
ad43b0450d am 4f048817: Merge "Don\'t make ripples respond to selection state" into lmp-dev 
* commit '4f048817789e7d7a4f6c84ebd7d1624b87470f5f':
  Don't make ripples respond to selection state
 2014-08-08 19:35:57 +00:00
Andrew Lee
27273215a8 am 9ce25877: Aidl changes related to VideoCallProvider in Ims. 
* commit '9ce25877dcaf82d799a9bffac6180bb56d10e66c':
  Aidl changes related to VideoCallProvider in Ims.
 2014-08-08 19:31:38 +00:00
John Reck
e758fa1d0e am 53eb8f73: am d78521f7: am 30f8cc8d: Merge "Don\'t use ViewPropertyAnimatorRT yet" into lmp-dev 
* commit '53eb8f738fcf31f827b826af170ce653d4a7e1c4':
  Don't use ViewPropertyAnimatorRT yet
 2014-08-08 19:20:52 +00:00
John Reck
0f5e6b8b36 am d78521f7: am 30f8cc8d: Merge "Don\'t use ViewPropertyAnimatorRT yet" into lmp-dev 
* commit 'd78521f7d69630be3f32907de7b5da4358805485':
  Don't use ViewPropertyAnimatorRT yet
 2014-08-08 19:13:22 +00:00
Andrew Lee
752217bfc6 Aidl changes related to VideoCallProvider in Ims. 
+ Added a getVideoCallProvider function in IImsCallSession
+ Added IImsVideoCallProvider aidl. This is used for communication
between Telephony and the ImsService. It is redundant with
IVideoCallProvider on some level, but see associated bug and comments
in the class for more detail.
+ Added IImsVideoCallCallback. This is used for communicationing
callback invocations from ImsService to Telephony. It is redundant
with IVideoCallCallback for same reason in bugs/comments.
+ Some minor formatting changes.

Bug: 16886403
Change-Id: I03de12d4432f837e0930bc077307509b645493e0
 2014-08-08 12:09:54 -07:00
John Reck
8406a9ea09 am 30f8cc8d: Merge "Don\'t use ViewPropertyAnimatorRT yet" into lmp-dev 
* commit '30f8cc8db6286ad4e2508bce3a48ee7ae0eb9b4c':
  Don't use ViewPropertyAnimatorRT yet
 2014-08-08 19:08:58 +00:00
Guang Zhu
72f6564e92 am 3c4c0848: am a61a2b3a: am 011caab6: Merge "freeze screen rotation during memory and app launch test" into lmp-dev 
* commit '3c4c0848a39311ad5320c0f2482fc1355f956961':
  freeze screen rotation during memory and app launch test
 2014-08-08 18:51:00 +00:00
Guang Zhu
a117d7b28e am a61a2b3a: am 011caab6: Merge "freeze screen rotation during memory and app launch test" into lmp-dev 
* commit 'a61a2b3a3c437fa41e3916eb4aa423cf70604532':
  freeze screen rotation during memory and app launch test
 2014-08-08 18:46:46 +00:00
Guang Zhu
4d98b3a3d9 am 011caab6: Merge "freeze screen rotation during memory and app launch test" into lmp-dev 
* commit '011caab6fd12db45d314868f113bbc2ec38626d3':
  freeze screen rotation during memory and app launch test
 2014-08-08 18:38:59 +00:00
John Spurlock
5c8ea2c369 Merge "New api to sync zen mode state from listeners." into lmp-dev 2014-08-08 18:15:47 +00:00
Calin Juravle
e1909c3fc0 am 351ef8e6: am e998bb17: (-s ours) am 94f3e47d: Merge "Fix the instruction set for dex file during (re)moving ops." 
* commit '351ef8e6a34d75daf282983885a7ad727538932a':
  Fix the instruction set for dex file during (re)moving ops.
 2014-08-08 18:12:23 +00:00
Calin Juravle
9bb0988760 am a5c7194a: am 6db95fc3: am 3d274434: Merge "Pass the name of the native bridge library to the runtime" 
* commit 'a5c7194a476c948ce25beda278804b4100a8a85f':
  Pass the name of the native bridge library to the runtime
 2014-08-08 18:07:30 +00:00
Calin Juravle
f7256837f1 am e998bb17: (-s ours) am 94f3e47d: Merge "Fix the instruction set for dex file during (re)moving ops." 
* commit 'e998bb173657b1c1adb88e1a5df6375158a2936a':
  Fix the instruction set for dex file during (re)moving ops.
 2014-08-08 18:06:38 +00:00
Nicolas Prevot
110b156fd1 am f29ede65: am 528e27a3: am 836bfd4f: Merge "Validate that the authority of incoming uris matches." into lmp-dev 
* commit 'f29ede65fe242b681b0bad6ff4e1cc9e9fc52189':
  Validate that the authority of incoming uris matches.
 2014-08-08 17:59:36 +00:00
Calin Juravle
773c268874 am 6db95fc3: am 3d274434: Merge "Pass the name of the native bridge library to the runtime" 
* commit '6db95fc33969b303cc4d1aecb07c593f22dd4d18':
  Pass the name of the native bridge library to the runtime
 2014-08-08 17:59:35 +00:00
Torne (Richard Coles)
8042822de2 am 534bfb23: am 0a6c1bd5: am 91eb4fc1: Merge "Make WebViewFactory more robust." into lmp-dev 
* commit '534bfb23957030bb6315584ac28dce15d8e0ba9c':
  Make WebViewFactory more robust.
 2014-08-08 17:59:32 +00:00
Narayan Kamath
27c2e62c12 am d641b764: am b6926548: am e00c3d37: Merge "Reduce the frequency of calls to isDexOptNeededInternal." into lmp-dev 
* commit 'd641b7648ee3103ed525eb116a46c2242a3b09a9':
  Reduce the frequency of calls to isDexOptNeededInternal.
 2014-08-08 17:59:28 +00:00
Nicolas Prevot
d8f114bbef am a7842a29: am fbd2b316: am f943eff8: Merge "Making getProviderMimeType work across users." into lmp-dev 
* commit 'a7842a29acb742084d6e973e4c16e4f57473ed4d':
  Making getProviderMimeType work across users.
 2014-08-08 17:59:24 +00:00
Calin Juravle
e998bb1736 am 94f3e47d: Merge "Fix the instruction set for dex file during (re)moving ops." 
* commit '94f3e47da5acc48b1003b64acdc539cdf6cbe30c':
  Fix the instruction set for dex file during (re)moving ops.
 2014-08-08 17:53:50 +00:00
Calin Juravle
6db95fc339 am 3d274434: Merge "Pass the name of the native bridge library to the runtime" 
* commit '3d274434c78856388484a722da2887ca846907ee':
  Pass the name of the native bridge library to the runtime
 2014-08-08 17:53:46 +00:00
Nicolas Prevot
2ff92cbe22 am 528e27a3: am 836bfd4f: Merge "Validate that the authority of incoming uris matches." into lmp-dev 
* commit '528e27a3b64d6ba9cbeb52bea3d7884c39de126c':
  Validate that the authority of incoming uris matches.
 2014-08-08 17:53:35 +00:00
Torne (Richard Coles)
55ed12ea79 am 0a6c1bd5: am 91eb4fc1: Merge "Make WebViewFactory more robust." into lmp-dev 
* commit '0a6c1bd5118b6845185d96c70b16a62c19863f2e':
  Make WebViewFactory more robust.
 2014-08-08 17:53:31 +00:00
Narayan Kamath
b0be3d296a am b6926548: am e00c3d37: Merge "Reduce the frequency of calls to isDexOptNeededInternal." into lmp-dev 
* commit 'b6926548e3515f528b8e951ccebc18748b382d0a':
  Reduce the frequency of calls to isDexOptNeededInternal.
 2014-08-08 17:53:26 +00:00
Nicolas Prevot
5960d3b633 am fbd2b316: am f943eff8: Merge "Making getProviderMimeType work across users." into lmp-dev 
* commit 'fbd2b316aa5c49a73d95ee0fc858ebf2e07fcbaf':
  Making getProviderMimeType work across users.
 2014-08-08 17:53:22 +00:00
RoboErik
c660d0266c am 7e63287b: am 7a312929: am 6ac104ce: Merge "Combine MediaSession Callback and TransportControlsCallback" into lmp-dev 
* commit '7e63287b7d1732df3015d102b508fff9eb3a3afd':
  Combine MediaSession Callback and TransportControlsCallback
 2014-08-08 17:52:46 +00:00
RoboErik
c1500bacf7 am 38d14489: am dfa64e7e: am 027ffc1f: Merge "Change URI type metadata back to text" into lmp-dev 
* commit '38d14489b16a9d389ca35f6c0f1e1d4112f80216':
  Change URI type metadata back to text
 2014-08-08 17:52:41 +00:00
RoboErik
8d285f6438 am 7a312929: am 6ac104ce: Merge "Combine MediaSession Callback and TransportControlsCallback" into lmp-dev 
* commit '7a3129298716b022009fd3ce8c1d167204fd3f42':
  Combine MediaSession Callback and TransportControlsCallback
 2014-08-08 17:47:58 +00:00