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

126299 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris Wren
386fff993a Merge "lower the heads up threshold to exactly PRIORITY_HIGH" 2014-03-21 19:10:50 +00:00
Will Haldean Brown
ede2a729c3 am ccd55a92: am f8c78b50: Update current.txt to include windowSwipeToDismiss 
* commit 'ccd55a924a51e5ad7a503b3bde4b3038152217e4':
  Update current.txt to include windowSwipeToDismiss
 2014-03-21 19:08:57 +00:00
Chris Wren
5d9b153db3 lower the heads up threshold to exactly PRIORITY_HIGH 
Bug: 13452562
Change-Id: I945ce22fa7253ff84fcc3d72f4cb732921ba3489
 2014-03-21 15:08:42 -04:00
Bo Liu
845535a76d Convert a attach/detach functor in ViewRootImpl to x64 
Change-Id: I93c1df8abd0ecd1686e392cada099f9864926d33
 2014-03-21 12:06:23 -07: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
7ae93b1d0c am 92ec0a0c: am d8c32164: am 88517170: Merge "Adjust to the change in the private SSLParameterImpl API." 
* commit '92ec0a0c7a568a77696964c16f4e44292c633ef1':
  Adjust to the change in the private SSLParameterImpl API.
 2014-03-21 18:53:20 +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
Fabrice Di Meglio
7434fcec69 Merge "Add support for enabled state for SearchIndexableData" 2014-03-21 18:38:58 +00:00
Fabrice Di Meglio
16f81e7542 Add support for enabled state for SearchIndexableData 
- add "enabled" member which tells if the data will be
included into the search results.

Change-Id: I17f8c4b289b21061f7fc47f4902343fecb5ddc2c
 2014-03-21 11:37:57 -07:00
Mathew Inwood
d15990aa50 Fix log spam from View.toString(). 
If a view has a non-zero ID that is not defined in resources (i.e. has been
set pragmatically), the calls to Resources.getResourcePackageName() and
Resources.getResourceEntryName() result in a log warning:
No package identifier when getting name for resource number 0x00000001

Fix this by not attempting to resolve the package & name when there is
none.

Change-Id: Id88a61539fffb36187da7911f8e8a42d5a1bb951
 2014-03-21 18:37:53 +00: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
Selim Cinek
0fa6c1b146 Disable Set Wallpaper button while loading image 
Bug: 13534714
Change-Id: I45ff3436de40ea85fb22d776584d9f30f0795898
 2014-03-21 19:19:08 +01: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
b8846c819e am cf0c4a59: am 4868da52: am c620ec36: am 3f523222: Merge "Lock down MANAGE_DOCUMENTS permission." into klp-dev 
* commit 'cf0c4a59b6d6c7d0abe6b643e200af2eb9f0d6b2':
  Lock down MANAGE_DOCUMENTS permission.
 2014-03-21 18:06:44 +00:00
Will Haldean Brown
d3e33cc25d am aa0fa8eb: am cedbfad4: Fix link in documentation for SWIPE_TO_DISMISS. 
* commit 'aa0fa8eb08043e4c070c6c0db07678cf1f8f8a99':
  Fix link in documentation for SWIPE_TO_DISMISS.
 2014-03-21 18:06:41 +00: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
e3d4f6c19b am 8f2c3252: am 496e8178: Merge "Make windowSwipeToDismiss a public attribute." into klp-modular-dev 
* commit '8f2c3252f155bf03206f879e0b89a0e32e3c6e7c':
  Make windowSwipeToDismiss a public attribute.
 2014-03-21 17:32:40 +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
Adam Lesinski
ac6e97a5a6 Merge "Reduce warning verbosity in aapt" 2014-03-21 16:51:12 +00:00
Jean-Michel Trivi
e10dd634e1 Merge "AudioTrack write from ByteBuffer updates position" 2014-03-21 16:49:55 +00:00
Craig Mautner
2bc789bf1a Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs 
Previous fix to keep non-show-when-locked windows hid dialogs from
activities that had asked to be show-when-locked. That was too
restrictive.

Fixes bug 13225149.

Change-Id: I39ae9d7cbcc9b5109257f732d027bda3a2de65e4
 2014-03-21 09:31:35 -07:00
Jean-Michel Trivi
5d21f679c5 AudioTrack write from ByteBuffer updates position 
Remove offset parameter.
Update buffer position when data is successfully written.

Bug 7919023

Change-Id: I1701532ef0a91e2ccecfc38b24de29bc4f64d035
 2014-03-21 09:24:26 -07:00
John Spurlock
824ad0e6f9 Merge "Unhide notification category." 2014-03-21 14:26:55 +00:00
John Spurlock
fd7f1e0039 Unhide notification category. 
Rename @hidden Notification.kind -> category, and flesh out
shared values.  Now a single value.

Update framework references, remove unused SystemUpdateService
magic value unused since 2012.

Change-Id: If06d19ff3a8c3125fca1457f5d3c665e2939c66c
 2014-03-21 09:25:00 -04:00
John Spurlock
f9e1a0b369 Annotate framework vibrate calls with stream hints. 
Migrate existing framework usages of Vibrator.vibrate to use
the new overload with an explicit stream hint.  This prevents
them from being blocked by rules targeting the unspecified stream.

For calls that pass the existing appops check in VibrateService,
pass streamHint down to the input device vibrator so we don't lose
the signal, but leave it up to InputManager to decide what to do
with it - currently unused.

Change-Id: I65c944e4010edea29a412bf57d8d7d3b8098b746
 2014-03-21 08:57:53 -04:00
Przemyslaw Szczepaniak
952c0fd7bc Do not reset language in case of the TTS service reconnect. 
Bug:12428804
Change-Id: I0b1b1274c47edd28eae1701808d50aeb6c36324c
 2014-03-21 11:21:07 +00: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
a10958f1c3 am cfba284a: am d73e66cc: Fix broken build 
* commit 'cfba284ad72b6ac3d7189f7c87cddb7299da7617':
  Fix broken build
 2014-03-21 03:44:11 +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
Mike Lockwood
0416faa2b2 am 7a07f4d4: am a5853b17: am 1fe28b20: am 71060db6: am dffdf107: Merge "UsbDeviceManager: A better fix for race condition when starting USB accessory mode" into klp-dev 
* commit '7a07f4d4ad1f2f4893223693aece62f095ce004e':
  UsbDeviceManager: A better fix for race condition when starting USB accessory mode
 2014-03-21 03:10:34 +00:00
Mike Lockwood
c84b4d7ff2 am e920322f: am 86119603: am aa7e396f: am 935d417b: am afc3a5d3: Merge "Revert "UsbDeviceManager: Fix race condition between accessory start and USB configured uevents"" into klp-dev 
* commit 'e920322ff0c67cdd9e9682fd7c7df5221a6fb13e':
  Revert "UsbDeviceManager: Fix race condition between accessory start and USB configured uevents"
 2014-03-21 03:10:30 +00:00
Wei Wang
6890727c0d am 3b6689c0: (-s ours) am e781efd6: am f479d158: am bf056846: am 058061da: Merge "Fix stopBatchedScan not working for wifi" into klp-dev 
* commit '3b6689c010edd2deaf112f4d4239deeb2a244ea5':
  Fix stopBatchedScan not working for wifi
 2014-03-21 03:10:24 +00:00
Jinsuk Kim
a67e34c80f am f2fecf48: am c61f4dd7: Merge "Add HDMI-CEC service" into klp-modular-dev 
* commit 'f2fecf48f740a079cf9015ea8c2695039ca11d81':
  Add HDMI-CEC service
 2014-03-21 02:41:43 +00: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
7a07f4d4ad am a5853b17: am 1fe28b20: am 71060db6: am dffdf107: Merge "UsbDeviceManager: A better fix for race condition when starting USB accessory mode" into klp-dev 
* commit 'a5853b177c80052246c361e0bc2b0e5809cfeef2':
  UsbDeviceManager: A better fix for race condition when starting USB accessory mode
 2014-03-21 01:25:57 +00:00
Mike Lockwood
e920322ff0 am 86119603: am aa7e396f: am 935d417b: am afc3a5d3: Merge "Revert "UsbDeviceManager: Fix race condition between accessory start and USB configured uevents"" into klp-dev 
* commit '861196030145ac2a5c9c2abd2c22272cc94fe884':
  Revert "UsbDeviceManager: Fix race condition between accessory start and USB configured uevents"
 2014-03-21 01:25:54 +00:00