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

128618 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Selim Cinek
49c4f4e2d8 am a4c1ccf3: Merge "Disable Set Wallpaper button while loading image" 
* commit 'a4c1ccf3e045accd321be4d4c7d2ba1941a49ab4':
  Disable Set Wallpaper button while loading image
 2014-03-21 12:43:52 -07:00
John Reck
fc603ca6b5 am abf701e6: Merge "Eliminate mHasAlpha" into klp-dev 
* commit 'abf701e6751aed487d4ed0986e0fae8810c3658f':
  Eliminate mHasAlpha
 2014-03-21 19:41:00 +00:00
Selim Cinek
a4c1ccf3e0 Merge "Disable Set Wallpaper button while loading image" 2014-03-21 19:39:38 +00:00
John Reck
abf701e675 Merge "Eliminate mHasAlpha" into klp-dev 2014-03-21 19:37:28 +00:00
Craig Mautner
5fc6747ed6 am f7ad8557: Apply FLAG_SHOW_WHEN_LOCKED within tasks. 
* commit 'f7ad855718dc576a1618a54035b82e92356aa0d8':
  Apply FLAG_SHOW_WHEN_LOCKED within tasks.
 2014-03-21 12:32:38 -07:00
Selim Cinek
5ab7d37d90 Catch exceptions if Exif is malformed 
Bug: 11650650
Change-Id: Ie1680220fdb235a166a0eaa0a2309729f861865c
 2014-03-21 20:32:34 +01:00
Selim Cinek
d6901a95d8 Catching security exception when activity destroyed 
Fixed a bug where an asynctask tried to load an image
even after the activity was destroyed leading to a
security exception since the permission could not be granted anymore.

Bug: 12760267
Change-Id: Ieffb10b1007f349371647512ffe4fe72433344e7
 2014-03-21 20:24:55 +01:00
Craig Mautner
f7ad855718 Apply FLAG_SHOW_WHEN_LOCKED within tasks. 
If the bottommost fullscreen window of a task has FLAG_SHOW_WHEN_LOCKED
set then show all windows of the task that are above that window.

Fixes bug 13558398.

Change-Id: Ied8ada54efbb079eaf375470b2eae749e5551c24
 2014-03-21 12:24:07 -07:00
Unsuk Jung
8ae2ce76e3 am 7bde0fc7: am 2270ac96: am 8114c3d0: am 1a70f391: Merge "Change wallpaper sizing" into klp-dev 
* commit '7bde0fc751192fd70f6e42ddffe7f1513fc67b71':
  Change wallpaper sizing
 2014-03-21 19:23:46 +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
Chris Wren
27ae6b6b9c am 386fff99: Merge "lower the heads up threshold to exactly PRIORITY_HIGH" 
* commit '386fff993a205f551f4e3d6f8e31e0740365f727':
  lower the heads up threshold to exactly PRIORITY_HIGH
 2014-03-21 12:14:10 -07: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
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
Fabrice Di Meglio
72a3b9a136 am 7434fcec: Merge "Add support for enabled state for SearchIndexableData" 
* commit '7434fcec6928e9e570f7ab0bf033f04ca5a13ba1':
  Add support for enabled state for SearchIndexableData
 2014-03-21 11:44:21 -07: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
c1ecfe6233 am ac6e97a5: Merge "Reduce warning verbosity in aapt" 
* commit 'ac6e97a5a69738a1d32794fc76ca639201639501':
  Reduce warning verbosity in aapt
 2014-03-21 09:53:21 -07:00
Jean-Michel Trivi
b50a6c3d5f am e10dd634: Merge "AudioTrack write from ByteBuffer updates position" 
* commit 'e10dd634e169ae628455a3dc49638ffde3583a80':
  AudioTrack write from ByteBuffer updates position
 2014-03-21 09:53:18 -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
03e5344f06 am 824ad0e6: Merge "Unhide notification category." 
* commit '824ad0e6f9c799f5b0faa2024e35fc6e714a681a':
  Unhide notification category.
 2014-03-21 07:31:28 -07:00