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

120807 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Unsuk Jung
8114c3d02d am 1a70f391: Merge "Change wallpaper sizing" into klp-dev 
* commit '1a70f391608e82fcc5550c76ccc7bf8bac5bbc10':
  Change wallpaper sizing
 2014-03-21 19:05:40 +00:00
Will Haldean Brown
ccd55a924a am f8c78b50: Update current.txt to include windowSwipeToDismiss 
* commit 'f8c78b50fc9f6c81c7ad5d76c81445653dcf3cd9':
  Update current.txt to include windowSwipeToDismiss
 2014-03-21 19:02:16 +00:00
Unsuk Jung
1a70f39160 Merge "Change wallpaper sizing" into klp-dev 2014-03-21 19:01:08 +00:00
Alex Klyubin
92ec0a0c7a am d8c32164: am 88517170: Merge "Adjust to the change in the private SSLParameterImpl API." 
* commit 'd8c32164e19d16cf7d66b9aee368369ae16a4f0d':
  Adjust to the change in the private SSLParameterImpl API.
 2014-03-21 18:47:27 +00:00
Alex Klyubin
d8c32164e1 am 88517170: Merge "Adjust to the change in the private SSLParameterImpl API." 
* commit '88517170cbb09b45324d5b457a0e5e840cc7d09b':
  Adjust to the change in the private SSLParameterImpl API.
 2014-03-21 11:41:38 -07:00
Alex Klyubin
88517170cb Merge "Adjust to the change in the private SSLParameterImpl API." 2014-03-21 18:36:08 +00:00
Will Haldean Brown
f8c78b50fc Update current.txt to include windowSwipeToDismiss 
Change-Id: I5cbee85f7fe852e534a722083feead7359404732
 2014-03-21 11:34:13 -07:00
John Reck
91f0a455bb Eliminate mHasAlpha 
Bug: 13580771

 The cached value mHasAlpha on Bitmap could get out of sync with the
 real value stored in the SkBitmap. Fix this by just eliminating the
 cached value. This adds an extra JNI call in copy(), createBitmap(),
 and setPremultiplied(), none of which are going to be significantly
 impacted by the extra JNI call.

Change-Id: I4fce069a77d9b3bbb47dde04275ff8510ce7e4f0
 2014-03-21 18:16:18 +00:00
Alex Klyubin
a2507e8764 Adjust to the change in the private SSLParameterImpl API. 
Conscrypt's SSLParameterImpl getDefaultTrustManager was renamed to
getDefaultX509TrustManager.

Bug: 13563574
Change-Id: I601c651d631f5a2e4a04d21941186553988e5286
 2014-03-21 11:13:50 -07:00
Jeff Sharkey
cf0c4a59b6 am 4868da52: am c620ec36: am 3f523222: Merge "Lock down MANAGE_DOCUMENTS permission." into klp-dev 
* commit '4868da52450d3e5456b3567c228967539144d108':
  Lock down MANAGE_DOCUMENTS permission.
 2014-03-21 18:00:13 +00:00
Will Haldean Brown
aa0fa8eb08 am cedbfad4: Fix link in documentation for SWIPE_TO_DISMISS. 
* commit 'cedbfad48753b4e266405f677cd0f13156d0c61d':
  Fix link in documentation for SWIPE_TO_DISMISS.
 2014-03-21 18:00:09 +00:00
Jeff Sharkey
4868da5245 am c620ec36: am 3f523222: Merge "Lock down MANAGE_DOCUMENTS permission." into klp-dev 
* commit 'c620ec3614c8737b87d60efa9db96c288bcad794':
  Lock down MANAGE_DOCUMENTS permission.
 2014-03-21 17:56:44 +00:00
Will Haldean Brown
cedbfad487 Fix link in documentation for SWIPE_TO_DISMISS. 
Change-Id: I3ff1fb1ae97b088e6b2e1a7a2c27981e7220cc2e
 2014-03-21 10:51:14 -07:00
Jeff Sharkey
c620ec3614 am 3f523222: Merge "Lock down MANAGE_DOCUMENTS permission." into klp-dev 
* commit '3f5232220f2db839f690489ed272113f660daa40':
  Lock down MANAGE_DOCUMENTS permission.
 2014-03-21 17:50:39 +00:00
Jeff Sharkey
3f5232220f Merge "Lock down MANAGE_DOCUMENTS permission." into klp-dev 2014-03-21 17:47:00 +00:00
Will Haldean Brown
8f2c3252f1 am 496e8178: Merge "Make windowSwipeToDismiss a public attribute." into klp-modular-dev 
* commit '496e8178b0e11c41678e1f2747a41cc2d8b2bda3':
  Make windowSwipeToDismiss a public attribute.
 2014-03-21 17:26:15 +00:00
Will Haldean Brown
496e8178b0 Merge "Make windowSwipeToDismiss a public attribute." into klp-modular-dev 2014-03-21 17:22:34 +00:00
Ricardo Cervera
a7925384c3 docs: Added new sensor types. Bug: 10674725 
Change-Id: Ib378e3a1b3f1812b966c53a0eda6319f1bea464b
 2014-03-21 09:59:22 -07:00
Michael Jurka
3368a63c64 Change wallpaper sizing 
Bug: 11997581

- ignore suggested dimensions
- when orientation changes, scale up wallpaper if
it doesn't fill the whole screen, or scale back to
original size if not necessary

Change-Id: I75b7519a105d4097bf7a35cd8af61fc40f45f8fb
(cherry picked from commit 824a4b5ea4c58592b9b2ebe787f5fb6974e7cabe)
 2014-03-21 10:29:27 +00:00
Jinsuk Kim
cfba284ad7 am d73e66cc: Fix broken build 
* commit 'd73e66cce12f13faec44b12d9e6f33c2f28a2d5a':
  Fix broken build
 2014-03-21 03:40:08 +00:00
Jinsuk Kim
d73e66cce1 Fix broken build 
Change-Id: Ia7d207f7937e29cf48dce30d8c5a91f50c9e7d4c
 2014-03-21 12:30:59 +09:00
Jinsuk Kim
f2fecf48f7 am c61f4dd7: Merge "Add HDMI-CEC service" into klp-modular-dev 
* commit 'c61f4dd744b1b0396703aa58eb22fc31d2b7050e':
  Add HDMI-CEC service
 2014-03-21 02:37:00 +00:00
Jinsuk Kim
c61f4dd744 Merge "Add HDMI-CEC service" into klp-modular-dev 2014-03-21 02:32:38 +00:00
Mike Lockwood
a5853b177c am 1fe28b20: am 71060db6: am dffdf107: Merge "UsbDeviceManager: A better fix for race condition when starting USB accessory mode" into klp-dev 
* commit '1fe28b20f1cfc6d2542f8b0bfe48355f3a58067b':
  UsbDeviceManager: A better fix for race condition when starting USB accessory mode
 2014-03-21 01:20:43 +00:00
Mike Lockwood
8611960301 am aa7e396f: am 935d417b: am afc3a5d3: Merge "Revert "UsbDeviceManager: Fix race condition between accessory start and USB configured uevents"" into klp-dev 
* commit 'aa7e396f44f9b3b12a6abc9d8d62cf3a6f17527b':
  Revert "UsbDeviceManager: Fix race condition between accessory start and USB configured uevents"
 2014-03-21 01:20:40 +00:00
Mike Lockwood
1fe28b20f1 am 71060db6: am dffdf107: Merge "UsbDeviceManager: A better fix for race condition when starting USB accessory mode" into klp-dev 
* commit '71060db65e0e1c903b429c932cd6e27beec10a3e':
  UsbDeviceManager: A better fix for race condition when starting USB accessory mode
 2014-03-21 01:14:15 +00:00
Mike Lockwood
aa7e396f44 am 935d417b: am afc3a5d3: Merge "Revert "UsbDeviceManager: Fix race condition between accessory start and USB configured uevents"" into klp-dev 
* commit '935d417b5615a62bc521a8eb58c35de1b4fdf841':
  Revert "UsbDeviceManager: Fix race condition between accessory start and USB configured uevents"
 2014-03-21 01:14:12 +00:00
Mike Lockwood
71060db65e am dffdf107: Merge "UsbDeviceManager: A better fix for race condition when starting USB accessory mode" into klp-dev 
* commit 'dffdf1079da76f532cd6e72bf537c1a69b099c7e':
  UsbDeviceManager: A better fix for race condition when starting USB accessory mode
 2014-03-21 01:09:33 +00:00
Mike Lockwood
935d417b56 am afc3a5d3: Merge "Revert "UsbDeviceManager: Fix race condition between accessory start and USB configured uevents"" into klp-dev 
* commit 'afc3a5d386459667f87d764038dd30e3490c64c2':
  Revert "UsbDeviceManager: Fix race condition between accessory start and USB configured uevents"
 2014-03-21 01:09:31 +00:00
Mike Lockwood
dffdf1079d Merge "UsbDeviceManager: A better fix for race condition when starting USB accessory mode" into klp-dev 2014-03-21 01:06:16 +00:00
Mike Lockwood
afc3a5d386 Merge "Revert "UsbDeviceManager: Fix race condition between accessory start and USB configured uevents"" into klp-dev 2014-03-21 01:05:57 +00:00
Wei Wang
e781efd651 am f479d158: am bf056846: am 058061da: Merge "Fix stopBatchedScan not working for wifi" into klp-dev 
* commit 'f479d15814f58ed820829fef0bfadf73cb2b88aa':
  Fix stopBatchedScan not working for wifi
 2014-03-21 00:51:14 +00:00
Wei Wang
f479d15814 am bf056846: am 058061da: Merge "Fix stopBatchedScan not working for wifi" into klp-dev 
* commit 'bf0568468da9e02c177abaf9116f9995d53b59aa':
  Fix stopBatchedScan not working for wifi
 2014-03-21 00:45:42 +00:00
Wei Wang
bf0568468d am 058061da: Merge "Fix stopBatchedScan not working for wifi" into klp-dev 
* commit '058061da46db0fdac8ea53c463a6b615fde3e928':
  Fix stopBatchedScan not working for wifi
 2014-03-21 00:41:23 +00:00
Wei Wang
058061da46 Merge "Fix stopBatchedScan not working for wifi" into klp-dev 2014-03-21 00:37:34 +00:00
Adam Powell
d5f3183eed am 1c84e98f: am a6454ccb: am 49325305: Merge "Update contextual asset bar assets to avoid 9-patch artifacts" into klp-dev 
* commit '1c84e98fc482f75a7ed4373a22096cd447bc55f9':
  Update contextual asset bar assets to avoid 9-patch artifacts
 2014-03-21 00:33:06 +00:00
Adam Powell
1c84e98fc4 am a6454ccb: am 49325305: Merge "Update contextual asset bar assets to avoid 9-patch artifacts" into klp-dev 
* commit 'a6454ccbfb5b1f39047f8bac74ec11093469cce2':
  Update contextual asset bar assets to avoid 9-patch artifacts
 2014-03-21 00:26:43 +00:00
Adam Powell
a6454ccbfb am 49325305: Merge "Update contextual asset bar assets to avoid 9-patch artifacts" into klp-dev 
* commit '49325305905198b9d077ccc784be96e5684e3623':
  Update contextual asset bar assets to avoid 9-patch artifacts
 2014-03-21 00:22:38 +00:00
Adam Powell
4932530590 Merge "Update contextual asset bar assets to avoid 9-patch artifacts" into klp-dev 2014-03-21 00:19:12 +00:00
Wei Wang
d181673e28 Fix stopBatchedScan not working for wifi 
Change-Id: I011747da2a98cbed76a8fc6716f0c539c65f2804
 2014-03-20 17:05:42 -07:00
Will Haldean Brown
06c23150bf Make windowSwipeToDismiss a public attribute. 
Bug: 13348970
Change-Id: I695139376fc7f38b3438ab38659ca15490ce8f7c
 2014-03-20 16:31:48 -07:00
Marco Nelissen
113847c3f4 am 46b26641: am 7d09713c: am 7cd52895: am 5035faba: (-s ours) am cecc6208: am 759445c5: resolved conflicts for merge of c53ad4cd to jb-mr2-dev 
* commit '46b2664177521a11ee6f4c05a9aee2b516b8f4c3':
  Verify certificates
 2014-03-20 20:49:54 +00:00
Marco Nelissen
46b2664177 am 7d09713c: am 7cd52895: am 5035faba: (-s ours) am cecc6208: am 759445c5: resolved conflicts for merge of c53ad4cd to jb-mr2-dev 
* commit '7d09713c5198579c0855089a0a77328d4ec1dc36':
  Verify certificates
 2014-03-20 20:45:32 +00:00
Marco Nelissen
7d09713c51 am 7cd52895: am 5035faba: (-s ours) am cecc6208: am 759445c5: resolved conflicts for merge of c53ad4cd to jb-mr2-dev 
* commit '7cd52895ec3e014c1097852725ba68646c1d6665':
  Verify certificates
 2014-03-20 20:41:54 +00:00
Marco Nelissen
7cd52895ec am 5035faba: (-s ours) am cecc6208: am 759445c5: resolved conflicts for merge of c53ad4cd to jb-mr2-dev 
* commit '5035faba9a28f988291c4ff3d3cbf64d828f3f5a':
  Verify certificates
 2014-03-20 20:36:34 +00:00
Marco Nelissen
5035faba9a am cecc6208: am 759445c5: resolved conflicts for merge of c53ad4cd to jb-mr2-dev 
* commit 'cecc62086a6ac7c17ce87d6fab1a4364b8d96cd7':
  Verify certificates
 2014-03-20 13:22:34 -07:00
Marco Nelissen
cecc62086a am 759445c5: resolved conflicts for merge of c53ad4cd to jb-mr2-dev 
* commit '759445c5bdb2eb54af9e974f604226596976e078':
  Verify certificates
 2014-03-20 13:16:32 -07:00
Marco Nelissen
759445c5bd resolved conflicts for merge of c53ad4cd to jb-mr2-dev 
Change-Id: I5fdbc5c8c20386f173efa8957e470a644e6c14ff
 2014-03-20 12:51:55 -07:00
Vinit Deshapnde
bb7fdd6e0a am b876cae9: am f92b0072: am 52bc363c: Merge "DO NOT MERGE - Use Samoa country code to satisfy wifi regulatory concerns" into klp-dev 
* commit 'b876cae90d8e7e57a685e31cd3b347c325728823':
  DO NOT MERGE - Use Samoa country code to satisfy wifi regulatory concerns
 2014-03-20 19:42:08 +00:00
Vinit Deshapnde
b876cae90d am f92b0072: am 52bc363c: Merge "DO NOT MERGE - Use Samoa country code to satisfy wifi regulatory concerns" into klp-dev 
* commit 'f92b00722d84fa0caea25a3363242b6dced0635c':
  DO NOT MERGE - Use Samoa country code to satisfy wifi regulatory concerns
 2014-03-20 19:36:59 +00:00