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

111348 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Vinit Deshapnde
4bdda52818 am ca915793: Merge "Increase sampling data size limits" into klp-dev 
* commit 'ca915793500c5db9476e21d029e836b78d580863':
  Increase sampling data size limits
 2013-08-26 17:27:17 -07:00
Vinit Deshapnde
ca91579350 Merge "Increase sampling data size limits" into klp-dev 2013-08-27 00:23:10 +00:00
Chet Haase
81d9379b43 am be6cf71d: Merge "Tweak visibility logic for inflated view scenarios" into klp-dev 
* commit 'be6cf71dc52ce2fdecc5d432abf1b30a1c62e376':
  Tweak visibility logic for inflated view scenarios
 2013-08-26 16:31:06 -07:00
Chet Haase
be6cf71dc5 Merge "Tweak visibility logic for inflated view scenarios" into klp-dev 2013-08-26 23:29:35 +00:00
Chet Haase
35a457a3ba Tweak visibility logic for inflated view scenarios 
Previously, Visibility would determine whether a given view was
worthy of a transition by checking the visibility of that view's
parent hierarchy. This is done to avoid fading every view in
a hierarchy when only the top-most node should be faded.

However, the logic was flawed because it assumed the end scene
parent was stable between scenes, which is not the case with inflated
layout scenes, in which the parent views are not the same, even though they
may represent the same parents (via ids).

The new approach is to check information on both the start and end scene
parents, and to take ids into account when checking the state of these
parents in the start/end scenes. Also, avoid this logic altogether if the
transition is targeted at specific views (don't bother checking the
parents if the transition was told to fade specific views).

Issue #10442447 Transitions: Fades don't happen correctly in some situations

Change-Id: Icea24b892f2eff2d37c6436ccfe4e288aac84178
 2013-08-26 16:04:11 -07:00
Adam Powell
4373cc90d3 am 04e3a14c: Merge "Expand documentation around ViewParent#childHasTransientStateChanged" into klp-dev 
* commit '04e3a14c2d51c2515dcae9278550d35269a9797a':
  Expand documentation around ViewParent#childHasTransientStateChanged
 2013-08-26 15:34:28 -07:00
Adam Powell
04e3a14c2d Merge "Expand documentation around ViewParent#childHasTransientStateChanged" into klp-dev 2013-08-26 22:32:04 +00:00
Jean-Michel Trivi
51d7921566 am 12a792c6: Merge ""Year" is an authorized metadate long field." into klp-dev 
* commit '12a792c644402f7d48327c08277bde141a2e978a':
  "Year" is an authorized metadate long field.
 2013-08-26 15:31:01 -07:00
Jean-Michel Trivi
12a792c644 Merge ""Year" is an authorized metadate long field." into klp-dev 2013-08-26 22:28:12 +00:00
Vinit Deshapnde
d0fec8c885 Increase sampling data size limits 
Integer doesn't seem to like number > 2 Gig; so converting all bits of
samples to long; and handling exceptions that may crash the service

Bug: 10459447
Change-Id: I1291e97ba6d0ab7304dc6a6e8ef819d17491e017
 2013-08-26 15:11:01 -07:00
Vinit Deshapnde
1b3984af8e am 402334a0: Merge "Fix an exception caused by incorrect data handling" into klp-dev 
* commit '402334a09b367551f788d3fc397a3d26269ae756':
  Fix an exception caused by incorrect data handling
 2013-08-26 15:05:44 -07:00
Adam Powell
ef53553bf8 am 962a7093: Fix padding for simple_list_item_2 
* commit '962a7093be28f7a6c9d1823bbfb02c7ef7059c3a':
  Fix padding for simple_list_item_2
 2013-08-26 15:05:32 -07:00
Chris Craik
7ff37ada13 am ff2c22e2: Merge "Move functor GL setup to just before functor" into klp-dev 
* commit 'ff2c22e2a85eab426c0542947b6cb7dce5f4fb56':
  Move functor GL setup to just before functor
 2013-08-26 15:05:27 -07:00
Alan Viverette
b19863545d am aad44178: Merge "Use transient state to preserve accessibility focus in ListView" into klp-dev 
* commit 'aad44178685c1e31a8fa1519edd561b043b7c886':
  Use transient state to preserve accessibility focus in ListView
 2013-08-26 15:05:24 -07:00
Alan Viverette
37eb3034a3 am faf7a208: Merge "Add auto-scrolling in ListPopupWindow drag-to-open mode" into klp-dev 
* commit 'faf7a2087e1228599c7b08a679a764d2abb0e9ed':
  Add auto-scrolling in ListPopupWindow drag-to-open mode
 2013-08-26 15:05:20 -07:00
Alan Viverette
4650258039 am 9212e350: Merge "Reconcile drag-to-open and touch event interception" into klp-dev 
* commit '9212e350d52ea98cb673280870c54319b03ccad3':
  Reconcile drag-to-open and touch event interception
 2013-08-26 15:05:18 -07:00
Leon Scroggins III
8f564fbef3 am 3871fdb9: Merge "Fix unpremul setting in BitmapRegionDecoder." into klp-dev 
* commit '3871fdb966846d9026500696e48ccc64349eedb4':
  Fix unpremul setting in BitmapRegionDecoder.
 2013-08-26 15:05:15 -07:00
Edward Jee
0b3adcdfd3 am b2cc1d54: Merge "Enables AT+ANDROID command in Bluetooth HFP." into klp-dev 
* commit 'b2cc1d54aad84293c32c9c1e8727895d160898f9':
  Enables AT+ANDROID command in Bluetooth HFP.
 2013-08-26 15:05:10 -07:00
Igor Murashkin
395375e1b0 am 9e680685: Merge "camera2: CameraDevice#configureOutputs now deletes unused streams" into klp-dev 
* commit '9e680685f92752c5c75a2f4929e017aec902aef6':
  camera2: CameraDevice#configureOutputs now deletes unused streams
 2013-08-26 15:05:07 -07:00
Scott Main
f369afe690 am 0ef8a431: am 032c5630: am bb6b1ff0: am d608d5e3: add jb mr2 uses-feature items to reference page and fix a couple doc bugs 
* commit '0ef8a431a5090549dbc031bad36cb1e2a54ea839':
  add jb mr2 uses-feature items to reference page and fix a couple doc bugs
 2013-08-26 15:04:58 -07:00
John Spurlock
7be199d7ce am f8388885: Merge "Add new logging for system bar window state." into klp-dev 
* commit 'f8388885e49a0a0fa71f9a90301bd90a349cb1dd':
  Add new logging for system bar window state.
 2013-08-26 15:04:44 -07:00
Ying Wang
62f16fe93d am d3373c29: Merge "Better aidl generated dependency" into klp-dev 
* commit 'd3373c292a9fd0ae9c6bafb594ed7132304c6516':
  Better aidl generated dependency
 2013-08-26 15:04:34 -07:00
Wink Saville
2f963e79e9 am 3084eb99: am 59adfca6: (-s ours) am 33283a97: am dce52cdb: DO NOT MERGE: MDST is not ready until connected to DcTracker. 
* commit '3084eb999ab81cb27be484802e2a71b57905b889':
  DO NOT MERGE: MDST is not ready until connected to DcTracker.
 2013-08-26 15:04:28 -07:00
Wink Saville
185601d431 am 3a9a4c2a: am 4e6e1749: am b42beeaf: am e63411f2: In isMobileOk don\'t execute finally if mobile data is not supported. 
* commit '3a9a4c2a1005cabffec74369f39201c827a87936':
  In isMobileOk don't execute finally if mobile data is not supported.
 2013-08-26 15:04:25 -07:00
Jeff Tinker
ded3c260a4 am 91b87de7: Merge "Enhancement for OnInfo callback on DRM Framework" into klp-dev 
* commit '91b87de7e1d9ddcef2dd1da0c7ad85a04ab2fe6f':
  Enhancement for OnInfo callback on DRM Framework
 2013-08-26 15:04:03 -07:00
Daniel Sandler
e820825c81 am fead1290: Make xxhdpi adb icon consistent with other densities. 
* commit 'fead1290d74492af5fdf3dcb6739fbd1898dc239':
  Make xxhdpi adb icon consistent with other densities.
 2013-08-26 15:04:00 -07:00
Ying Wang
b44e5561de am 94366313: Fix docs build. 
* commit '94366313331a789440a3c077173aafcb85cabe78':
  Fix docs build.
 2013-08-26 15:03:43 -07:00
Jim Miller
517c8cf318 am 14cabdab: Merge "Add setting to disable keyguard widgets" into klp-dev 
* commit '14cabdabac1eb87026e4bbd71a18530031b1dd34':
  Add setting to disable keyguard widgets
 2013-08-26 15:03:33 -07:00
Jeff Brown
2517d08b9a am 61d806c7: Merge "Docs changes pursuant to API review feedback." into klp-dev 
* commit '61d806c76ad1158f5cfbf3daef87dac81e51fc94':
  Docs changes pursuant to API review feedback.
 2013-08-26 15:03:30 -07:00
destradaa
8ea7b21670 am 9e73cce6: Merge "Fix leaks of JNI objects in the local reference table" into klp-dev 
* commit '9e73cce6acef3b5116a49e724f1b90b560a771e5':
  Fix leaks of JNI objects in the local reference table
 2013-08-26 15:03:27 -07:00
Tim Murray
493a4c85cd am c264e044: Merge "Add garbage collection hooks" into klp-dev 
* commit 'c264e0440076ccca4be6ec66e33bcd7f8a1ae5b3':
  Add garbage collection hooks
 2013-08-26 15:03:14 -07:00
Chong Zhang
9c70038cba am 5de1faca: Merge "wifi-display: add certification options" into klp-dev 
* commit '5de1faca166e2241cf9ad1981007caa947a1fc1b':
  wifi-display: add certification options
 2013-08-26 15:03:00 -07:00
Jeff Sharkey
308aacb924 am 365768fd: Merge "Return EXIF thumbnails when available." into klp-dev 
* commit '365768fd3533343d6631875d7d46882907f7ab09':
  Return EXIF thumbnails when available.
 2013-08-26 15:02:57 -07:00
Jeff Sharkey
d0fcacd949 am 98d62123: Merge "Add CancellationSignal support to file operations." into klp-dev 
* commit '98d6212327d1c483894b642d5e24c3aac9fca9cf':
  Add CancellationSignal support to file operations.
 2013-08-26 15:02:53 -07:00
Dirk Dougherty
43bc44f512 am 570cd0f4: am f1fea527: am be2f72a1: am 2c30fe8a: Doc change: fix typo in policy docs. 
* commit '570cd0f4c06a6e3de2af348040415ff2fcff57a1':
  Doc change: fix typo in policy docs.
 2013-08-26 15:02:39 -07:00
Baligh Uddin
056c7d4876 am 4f5e0804: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '4f5e080486f076517ef4ecc02437dfaf6df46d6b':
  Import translations. DO NOT MERGE
 2013-08-26 15:02:23 -07:00
Baligh Uddin
dc010ce544 am 881de10c: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '881de10cfccabd51aa3c9d22702214110fb97b55':
  Import translations. DO NOT MERGE
 2013-08-26 15:02:20 -07:00
Svetoslav Ganov
e0612ffe54 am 826debf5: Merge "Print UI bug fixing and printer discovery refactoring." into klp-dev 
* commit '826debf5f806fdab77f9e3aa17d4e32abc87ec77':
  Print UI bug fixing and printer discovery refactoring.
 2013-08-26 15:01:57 -07:00
John Huang
0d3313ecb6 am 83bc5a8a: Merge "Additional logging to debug lost Wifi APs" into klp-dev 
* commit '83bc5a8a8674ae02592c73993795d83eaae8fe47':
  Additional logging to debug lost Wifi APs
 2013-08-26 15:01:12 -07:00
Baligh Uddin
33c9f69bb1 am 8a2df167: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '8a2df167456e3a5ffce407e8ce694994dd4e24ae':
  Import translations. DO NOT MERGE
 2013-08-26 15:00:49 -07:00
Baligh Uddin
54239215ae am e1f9e2f6: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'e1f9e2f60d25b661837d2860e9fdb6ac76d1768e':
  Import translations. DO NOT MERGE
 2013-08-26 15:00:46 -07:00
Zhijun He
1278507a83 am 4cabe3ea: Merge "ImageReader: Fix API doc table misalignment issue" into klp-dev 
* commit '4cabe3eae8068695933dd3fb10a6ee9071bc658f':
  ImageReader: Fix API doc table misalignment issue
 2013-08-26 15:00:41 -07:00
Jason Monk
4163241f14 am 4359d564: Merge "System binds PAC Local Proxy instead of self start" into klp-dev 
* commit '4359d56420b114f433ba4187c2d1f341bb35c938':
  System binds PAC Local Proxy instead of self start
 2013-08-26 15:00:22 -07:00
Vinit Deshapnde
402334a09b Merge "Fix an exception caused by incorrect data handling" into klp-dev 2013-08-26 21:50:20 +00:00
Adam Powell
0da4a282ee Expand documentation around ViewParent#childHasTransientStateChanged 
Bug 10461020

Change-Id: Id27df5de171b01effae949bcb1ce69bd4101b5ee
 2013-08-26 21:33:03 +00:00
Adam Powell
962a7093be Fix padding for simple_list_item_2 
Bug 9267688

Change-Id: I33270d9661581e116e16fd9216387a4fbdd72351
 2013-08-26 21:00:56 +00:00
Chris Craik
ff2c22e2a8 Merge "Move functor GL setup to just before functor" into klp-dev 2013-08-26 20:50:50 +00:00
Alan Viverette
aad4417868 Merge "Use transient state to preserve accessibility focus in ListView" into klp-dev 2013-08-26 20:49:50 +00:00
Alan Viverette
faf7a2087e Merge "Add auto-scrolling in ListPopupWindow drag-to-open mode" into klp-dev 2013-08-26 20:49:28 +00:00
Alan Viverette
9212e350d5 Merge "Reconcile drag-to-open and touch event interception" into klp-dev 2013-08-26 20:48:59 +00:00