Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
173,585 Commits 3 Branches 0 Tags
e3435feed48ecd1f37904f48ebb7e39dc9456d03
Commit Graph

43865 Commits

Author SHA1 Message Date
Abhijith Shastry
e3435feed4 am 0f064207: am 530f25d6: am fb8db1c8: Merge "new sms/mms carrier app API" into lmp-mr1-dev 
* commit '0f0642075e42f415d7f5244c5d94fe726756afa0':
  new sms/mms carrier app API
 2014-11-14 19:16:33 +00:00
Simranjit Singh Kohli
c4d583cd24 am adc62efb: am 91b5550e: am fdcdb742: Merge "[RemoveAccount API]: Adding support for intent." into lmp-mr1-dev 
* commit 'adc62efba6ec60ad216de16875e0ac3b42c41f93':
  [RemoveAccount API]: Adding support for intent.
 2014-11-14 00:50:15 +00:00
Wale Ogunwale
1166443a48 am 44217507: am 21f16a47: am 28d3c245: Merge "Cancel or drop key events if activity is stopped." into lmp-mr1-dev 
* commit '442175076fbd969ee1cda7e64f0d03b4a820262f':
  Cancel or drop key events if activity is stopped.
 2014-11-14 00:47:35 +00:00
Adam Powell
4aa1ca3c5d am 31de5dbe: am e2820ed9: am 87bc2acf: Merge "Optimize setting padding and backgrounds for views" into lmp-mr1-dev 
* commit '31de5dbe1ed32a611a8ba0e132570359cd7956c9':
  Optimize setting padding and backgrounds for views
 2014-11-14 00:45:40 +00:00
Ignacio Solla
7617704dfa am b993a4c7: am f3bd15cf: am bf79cbab: Merge "[WebView] Allow the WebView to be compiled against the system SDK." into lmp-mr1-dev 
* commit 'b993a4c70b55344d35b0435cd3cdbb29c3a50809':
  [WebView] Allow the WebView to be compiled against the system SDK.
 2014-11-14 00:43:27 +00:00
Alexandra Gherghina
0735d09ada am a3b4ab20: am fca2575b: am 6e33f0fb: Merge "Add extra for account migration in the DevicePolicyMamager" into lmp-mr1-dev 
* commit 'a3b4ab20156a06ffecb76e82852f904db3a39473':
  Add extra for account migration in the DevicePolicyMamager
 2014-11-14 00:43:17 +00:00
Narayan Kamath
6266d743b8 am cb313d1a: am 856a0d06: am eed1fba6: Merge "Add detailed javadoc for AssetManager.getLocales." into lmp-mr1-dev 
* commit 'cb313d1a61ab6fa7ad4cb8e264348cfb2b8a3270':
  Add detailed javadoc for AssetManager.getLocales.
 2014-11-14 00:43:09 +00:00
Jeff Brown
0624d611c0 am 36ed36a2: am 4d9bd151: am fef1e0e7: Merge "Make Message.setAsynchronous() public." into lmp-mr1-dev 
* commit '36ed36a2ea263439257b3978f6e8c787a3544952':
  Make Message.setAsynchronous() public.
 2014-11-14 00:43:03 +00:00
Abhijith Shastry
0f0642075e am 530f25d6: am fb8db1c8: Merge "new sms/mms carrier app API" into lmp-mr1-dev 
* commit '530f25d629f0e78ca2e0cd372e907207d2318182':
  new sms/mms carrier app API
 2014-11-14 00:02:51 +00:00
Abhijith Shastry
530f25d629 am fb8db1c8: Merge "new sms/mms carrier app API" into lmp-mr1-dev 
* commit 'fb8db1c84b7fd59f596a6c090a8035fab08ef2f5':
  new sms/mms carrier app API
 2014-11-13 23:50:12 +00:00
Abhijith Shastry
fb8db1c84b Merge "new sms/mms carrier app API" into lmp-mr1-dev 2014-11-13 22:15:46 +00:00
Simranjit Singh Kohli
adc62efba6 am 91b5550e: am fdcdb742: Merge "[RemoveAccount API]: Adding support for intent." into lmp-mr1-dev 
* commit '91b5550ee724bf0e41149decd55fd9ca2a3b3797':
  [RemoveAccount API]: Adding support for intent.
 2014-11-13 19:32:47 +00:00
Wale Ogunwale
442175076f am 21f16a47: am 28d3c245: Merge "Cancel or drop key events if activity is stopped." into lmp-mr1-dev 
* commit '21f16a475d0a212f9d3fb36659de5a59c2f80484':
  Cancel or drop key events if activity is stopped.
 2014-11-13 19:26:57 +00:00
Simranjit Singh Kohli
91b5550ee7 am fdcdb742: Merge "[RemoveAccount API]: Adding support for intent." into lmp-mr1-dev 
* commit 'fdcdb7429e3f150818e8df561a62328444b102c5':
  [RemoveAccount API]: Adding support for intent.
 2014-11-13 19:24:10 +00:00
Simranjit Singh Kohli
fdcdb7429e Merge "[RemoveAccount API]: Adding support for intent." into lmp-mr1-dev 2014-11-13 19:18:30 +00:00
Wale Ogunwale
21f16a475d am 28d3c245: Merge "Cancel or drop key events if activity is stopped." into lmp-mr1-dev 
* commit '28d3c245a1dde4aa5294192bec9980d8a93b0489':
  Cancel or drop key events if activity is stopped.
 2014-11-13 19:07:19 +00:00
Adam Powell
31de5dbe1e am e2820ed9: am 87bc2acf: Merge "Optimize setting padding and backgrounds for views" into lmp-mr1-dev 
* commit 'e2820ed9636368884b09347ce49658757b696b71':
  Optimize setting padding and backgrounds for views
 2014-11-13 19:03:37 +00:00
Wale Ogunwale
28d3c245a1 Merge "Cancel or drop key events if activity is stopped." into lmp-mr1-dev 2014-11-13 19:00:07 +00:00
Adam Powell
e2820ed963 am 87bc2acf: Merge "Optimize setting padding and backgrounds for views" into lmp-mr1-dev 
* commit '87bc2acfd3e874ff94fd3da948c329d2547a2bfc':
  Optimize setting padding and backgrounds for views
 2014-11-13 18:57:43 +00:00
Adam Powell
87bc2acfd3 Merge "Optimize setting padding and backgrounds for views" into lmp-mr1-dev 2014-11-13 18:12:54 +00:00
Rob Tsuk
95e5a82e1d Merge "Add a way to override Xfermode" 2014-11-13 17:17:06 +00:00
Ignacio Solla
b993a4c70b am f3bd15cf: am bf79cbab: Merge "[WebView] Allow the WebView to be compiled against the system SDK." into lmp-mr1-dev 
* commit 'f3bd15cf80ecc748fbd232fec31fdf18d06e48a1':
  [WebView] Allow the WebView to be compiled against the system SDK.
 2014-11-13 15:20:29 +00:00
Alexandra Gherghina
a3b4ab2015 am fca2575b: am 6e33f0fb: Merge "Add extra for account migration in the DevicePolicyMamager" into lmp-mr1-dev 
* commit 'fca2575bffc8bee495cede445849e0183aa9ab51':
  Add extra for account migration in the DevicePolicyMamager
 2014-11-13 15:15:44 +00:00
Narayan Kamath
cb313d1a61 am 856a0d06: am eed1fba6: Merge "Add detailed javadoc for AssetManager.getLocales." into lmp-mr1-dev 
* commit '856a0d06a64b5aebaf2afcc477bfc82308de7c9a':
  Add detailed javadoc for AssetManager.getLocales.
 2014-11-13 15:15:34 +00:00
Jeff Brown
36ed36a2ea am 4d9bd151: am fef1e0e7: Merge "Make Message.setAsynchronous() public." into lmp-mr1-dev 
* commit '4d9bd1516f7d495ee16bcfeca95a2ab45e33de4c':
  Make Message.setAsynchronous() public.
 2014-11-13 15:15:28 +00:00
Ignacio Solla
f3bd15cf80 am bf79cbab: Merge "[WebView] Allow the WebView to be compiled against the system SDK." into lmp-mr1-dev 
* commit 'bf79cbaba915dbbf419e5f59ca1ab258f64c88b4':
  [WebView] Allow the WebView to be compiled against the system SDK.
 2014-11-13 15:13:06 +00:00
Alexandra Gherghina
fca2575bff am 6e33f0fb: Merge "Add extra for account migration in the DevicePolicyMamager" into lmp-mr1-dev 
* commit '6e33f0fbb57a8afc2184bd9a1798db8bd29e680a':
  Add extra for account migration in the DevicePolicyMamager
 2014-11-13 15:08:01 +00:00
Narayan Kamath
856a0d06a6 am eed1fba6: Merge "Add detailed javadoc for AssetManager.getLocales." into lmp-mr1-dev 
* commit 'eed1fba6b54b3305af811b4dd9e367eab01a241b':
  Add detailed javadoc for AssetManager.getLocales.
 2014-11-13 15:07:51 +00:00
Jeff Brown
4d9bd1516f am fef1e0e7: Merge "Make Message.setAsynchronous() public." into lmp-mr1-dev 
* commit 'fef1e0e7f0a6a8d3564031ca4ecf14ab070468ff':
  Make Message.setAsynchronous() public.
 2014-11-13 15:07:46 +00:00
Ignacio Solla
bf79cbaba9 Merge "[WebView] Allow the WebView to be compiled against the system SDK." into lmp-mr1-dev 2014-11-13 15:03:45 +00:00
Alexandra Gherghina
6e33f0fbb5 Merge "Add extra for account migration in the DevicePolicyMamager" into lmp-mr1-dev 2014-11-13 13:59:35 +00:00
Alexandra Gherghina
aaf2f3e895 Add extra for account migration in the DevicePolicyMamager 
This is in preparation for the implementation CL

Bug: 17716971
Change-Id: I3042b0781f48f3d9e84bfff899507b4b5ca156eb
 2014-11-13 12:46:16 +00:00
Narayan Kamath
eed1fba6b5 Merge "Add detailed javadoc for AssetManager.getLocales." into lmp-mr1-dev 2014-11-13 09:33:12 +00:00
Jeff Brown
fef1e0e7f0 Merge "Make Message.setAsynchronous() public." into lmp-mr1-dev 2014-11-13 07:11:37 +00:00
Adam Lesinski
0d5ee2d10b am ffd4785e: am 648f8106: am db3d76ab: Merge "Fix ParceledListSlice to enforce the same concrete types among its elements." into lmp-mr1-dev 
* commit 'ffd4785e3c518a0b33f5451dd6c2e2be61474aa9':
  Fix ParceledListSlice to enforce the same concrete types among its elements.
 2014-11-13 02:17:19 +00:00
Adam Lesinski
ffd4785e3c am 648f8106: am db3d76ab: Merge "Fix ParceledListSlice to enforce the same concrete types among its elements." into lmp-mr1-dev 
* commit '648f81064747b58be7ea9efab6d5744d6b49397a':
  Fix ParceledListSlice to enforce the same concrete types among its elements.
 2014-11-13 00:40:28 +00:00
Adam Lesinski
648f810647 am db3d76ab: Merge "Fix ParceledListSlice to enforce the same concrete types among its elements." into lmp-mr1-dev 
* commit 'db3d76ab685955aae4a3e363238a2931d89c6f03':
  Fix ParceledListSlice to enforce the same concrete types among its elements.
 2014-11-13 00:35:58 +00:00
Adam Lesinski
db3d76ab68 Merge "Fix ParceledListSlice to enforce the same concrete types among its elements." into lmp-mr1-dev 2014-11-13 00:33:00 +00:00
George Mount
0be5277cdc am cc66b9df: am 4978ebe0: am fa781f8c: Merge "Update GhostView properly when underlying view changes." into lmp-mr1-dev 
* commit 'cc66b9dfda509ea8fd16adaa91a9f5f6adc9e21b':
  Update GhostView properly when underlying view changes.
 2014-11-13 00:00:33 +00:00
Jeff Sharkey
29df9915e6 am bea6648d: am a2781fda: am 521ca5f8: am 2e700004: am d68b87cd: Recover apps with malformed certificates. 
* commit 'bea6648df5b06240380bc0bf6feefa9af24f7d4f':
  Recover apps with malformed certificates.
 2014-11-13 00:00:29 +00:00
George Mount
d17a676a83 am a6d33fd7: am 3ba2c7c6: am 70cb4f3e: Merge "Fix getChildVisibleRect to clip correctly." into lmp-mr1-dev 
* commit 'a6d33fd7ba55cde67ca56c93e3c68592686bb01e':
  Fix getChildVisibleRect to clip correctly.
 2014-11-13 00:00:20 +00:00
Ignacio Solla
d48fe73063 am 4fc66e58: am ba1d4cd4: am c3631b98: Merge "Fix docs build breakage" into lmp-mr1-dev 
* commit '4fc66e582ac25c875e3131ca055daeddc284387f':
  Fix docs build breakage
 2014-11-13 00:00:15 +00:00
Dianne Hackborn
ebb526e976 am 7437ec8e: am caf3cddd: am fabb70b2: Add reporting of Parcel memory/count. 
* commit '7437ec8e1d01de948b1baf33c1f3f73f263a40c7':
  Add reporting of Parcel memory/count.
 2014-11-13 00:00:10 +00:00
Ignacio Solla
84ee41f507 am fd003c70: am dfb25b3d: am 10ece9c9: Merge "[WebView] Interface to access hidden APIs." into lmp-mr1-dev 
* commit 'fd003c707e57326a463acd31c232fc9ad306ec92':
  [WebView] Interface to access hidden APIs.
 2014-11-12 23:59:53 +00:00
Sandeep Siddhartha
229a266481 am 5f02d295: Merge "Don\'t unload the sound model on stopRecognition" into lmp-mr1-dev automerge: 850ec91 
automerge: 41dc467

* commit '41dc467957a77dce6fea25d29ddb5dd9d8be75df':
  Don't unload the sound model on stopRecognition
 2014-11-12 23:56:59 +00:00
George Mount
cc66b9dfda am 4978ebe0: am fa781f8c: Merge "Update GhostView properly when underlying view changes." into lmp-mr1-dev 
* commit '4978ebe04f4c06f5672e734665c592838a5d634b':
  Update GhostView properly when underlying view changes.
 2014-11-12 23:51:25 +00:00
Jeff Sharkey
bea6648df5 am a2781fda: am 521ca5f8: am 2e700004: am d68b87cd: Recover apps with malformed certificates. 
* commit 'a2781fdac332c4f6277a986c88e34daa25a3b5f9':
  Recover apps with malformed certificates.
 2014-11-12 23:50:47 +00:00
Rob Tsuk
c495e611b9 Add a way to override Xfermode 
Add a non-public API to Canvas/GLES20Canvas to provide a way to draw
the touch ripple animation without using a save layer.

Bug: 18226391
Change-Id: I6f8fb8938505e976892c4e14f6f864362c43e73c
 2014-11-12 15:49:45 -08:00
George Mount
a6d33fd7ba am 3ba2c7c6: am 70cb4f3e: Merge "Fix getChildVisibleRect to clip correctly." into lmp-mr1-dev 
* commit '3ba2c7c681f3bf355cef1c6e32a6fdf315865f57':
  Fix getChildVisibleRect to clip correctly.
 2014-11-12 23:49:40 +00:00
Ignacio Solla
4fc66e582a am ba1d4cd4: am c3631b98: Merge "Fix docs build breakage" into lmp-mr1-dev 
* commit 'ba1d4cd4fe65e60ba3eaef9cfbe93cb99424ef47':
  Fix docs build breakage
 2014-11-12 23:49:31 +00:00