120675 Commits

Author SHA1 Message Date
Selim Cinek
d9e5761a4e am 04ea3ca0: am 50ac19e9: am ba126c09: Disable Set Wallpaper button while loading image
* commit '04ea3ca000312f4eccc44347c37c49471081b852':
  Disable Set Wallpaper button while loading image
2014-03-21 22:52:52 +00:00
Selim Cinek
04ea3ca000 am 50ac19e9: am ba126c09: Disable Set Wallpaper button while loading image
* commit '50ac19e9b8d3435eab44cacbb62c5081f44df910':
  Disable Set Wallpaper button while loading image
2014-03-21 22:46:33 +00:00
Selim Cinek
50ac19e9b8 am ba126c09: Disable Set Wallpaper button while loading image
* commit 'ba126c09a5c00cb0a96da6ece0b4ab4d7ed2d8cb':
  Disable Set Wallpaper button while loading image
2014-03-21 22:41:07 +00:00
Selim Cinek
ba126c09a5 Disable Set Wallpaper button while loading image
Bug: 13534714
Change-Id: I45ff3436de40ea85fb22d776584d9f30f0795898
(cherry picked from commit 0fa6c1b146f7ed1aba335c30878e2c1b2bf2a8f1)
2014-03-21 22:15:10 +00:00
Chad Brubaker
05e4dc96fb am 850eb678: am eb3c0d9a: am 1aad3ad4: Merge "Fix support for simultaneous VPN tuns" into klp-dev
* commit '850eb678d7356ea60925dc6fa450e213d5cea2d5':
  Fix support for simultaneous VPN tuns
2014-03-21 21:09:44 +00:00
Chad Brubaker
9506e84b6f am c7726147: am 1fce89d9: am de4e7b49: Merge "Include the interface for clearDnsInterfaceForUidRange" into klp-dev
* commit 'c77261471432e1577586395dd0a6a481ef7431b5':
  Include the interface for clearDnsInterfaceForUidRange
2014-03-21 21:09:41 +00:00
Chad Brubaker
850eb678d7 am eb3c0d9a: am 1aad3ad4: Merge "Fix support for simultaneous VPN tuns" into klp-dev
* commit 'eb3c0d9ac387bb0aea5b4956daac1403253bc76d':
  Fix support for simultaneous VPN tuns
2014-03-21 21:02:47 +00:00
Chad Brubaker
c772614714 am 1fce89d9: am de4e7b49: Merge "Include the interface for clearDnsInterfaceForUidRange" into klp-dev
* commit '1fce89d946760a1bcf3a733f55494f963eab00c2':
  Include the interface for clearDnsInterfaceForUidRange
2014-03-21 21:02:43 +00:00
Chad Brubaker
eb3c0d9ac3 am 1aad3ad4: Merge "Fix support for simultaneous VPN tuns" into klp-dev
* commit '1aad3ad4ec2137c5aa043f96ccc621a4faffeb56':
  Fix support for simultaneous VPN tuns
2014-03-21 20:56:41 +00:00
Chad Brubaker
1fce89d946 am de4e7b49: Merge "Include the interface for clearDnsInterfaceForUidRange" into klp-dev
* commit 'de4e7b4947998638e0345ab9a181bf35a8827bef':
  Include the interface for clearDnsInterfaceForUidRange
2014-03-21 20:56:37 +00:00
Chad Brubaker
1aad3ad4ec Merge "Fix support for simultaneous VPN tuns" into klp-dev 2014-03-21 20:52:14 +00:00
Chad Brubaker
de4e7b4947 Merge "Include the interface for clearDnsInterfaceForUidRange" into klp-dev 2014-03-21 20:52:05 +00:00
Ricardo Cervera
419b17ec9e am 1d77a874: am 588300cb: am 2e929658: Merge "docs: Added new sensor types. Bug: 10674725" into klp-docs
* commit '1d77a8741c8b08c2b911e714c56521483e23bdac':
  docs: Added new sensor types. Bug: 10674725
2014-03-21 20:18:29 +00:00
Ricardo Cervera
1d77a8741c am 588300cb: am 2e929658: Merge "docs: Added new sensor types. Bug: 10674725" into klp-docs
* commit '588300cb5211f7217b81683f8a76bdf95c7bfa8d':
  docs: Added new sensor types. Bug: 10674725
2014-03-21 20:11:48 +00:00
Ricardo Cervera
588300cb52 am 2e929658: Merge "docs: Added new sensor types. Bug: 10674725" into klp-docs
* commit '2e92965820d61b704e0eb307da70825c46d899d3':
  docs: Added new sensor types. Bug: 10674725
2014-03-21 20:06:06 +00:00
Ricardo Cervera
2e92965820 Merge "docs: Added new sensor types. Bug: 10674725" into klp-docs 2014-03-21 20:01:31 +00:00
John Reck
ae31664390 am aff40e25: am fc603ca6: am abf701e6: Merge "Eliminate mHasAlpha" into klp-dev
* commit 'aff40e25e8f16c3ecd20376901d7062774850023':
  Eliminate mHasAlpha
2014-03-21 19:53:17 +00:00
John Reck
aff40e25e8 am fc603ca6: am abf701e6: Merge "Eliminate mHasAlpha" into klp-dev
* commit 'fc603ca6b518777a7e4dc391bc771e5609ab3ab5':
  Eliminate mHasAlpha
2014-03-21 19:47:22 +00:00
John Reck
fc603ca6b5 am abf701e6: Merge "Eliminate mHasAlpha" into klp-dev
* commit 'abf701e6751aed487d4ed0986e0fae8810c3658f':
  Eliminate mHasAlpha
2014-03-21 19:41:00 +00:00
John Reck
abf701e675 Merge "Eliminate mHasAlpha" into klp-dev 2014-03-21 19:37:28 +00:00
Unsuk Jung
7bde0fc751 am 2270ac96: am 8114c3d0: am 1a70f391: Merge "Change wallpaper sizing" into klp-dev
* commit '2270ac96d5d8ab6c2d1601f8dd5d8409762fb35f':
  Change wallpaper sizing
2014-03-21 19:17:01 +00:00
Unsuk Jung
2270ac96d5 am 8114c3d0: am 1a70f391: Merge "Change wallpaper sizing" into klp-dev
* commit '8114c3d02d6bf72c0627aea6ecf738074ac3f232':
  Change wallpaper sizing
2014-03-21 19:11:01 +00:00
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