John Spurlock
c8d7ab9ff9
Log all notification interceptions.
...
Change-Id: I036a4b5eb7c5a3ce2addb0a16d9d6806e3952929
2014-05-05 09:22:57 -04:00
Zhijun He
dab4049383
Merge "Camera2: Minor update for hyperfocalDistance spec"
2014-05-04 23:38:28 +00:00
Zhijun He
b41fcc2506
Camera2: Minor update for hyperfocalDistance spec
...
Doc only change.
Change-Id: I1b425ab739f10d5e2ba9403baf918f3ee6150d71
2014-05-04 16:29:57 -07:00
Jinsuk Kim
d0e2095180
Update current.txt to fix the broken build
...
Change-Id: Ifaf9e2221791907b953995c5c4066528746811b3
2014-05-05 08:16:11 +09:00
Jinsuk Kim
043aa252cf
Merge "Define Feature action for obtaining info on a new CEC device"
2014-05-04 21:51:44 +00:00
Winson Chung
c74b3cb6f0
Merge "Adding ability to load a search widget into Recents."
2014-05-03 01:58:10 +00:00
Winson Chung
f7bca430d9
Adding ability to load a search widget into Recents.
...
Change-Id: Ie17d9b9a47c979774b39a37e87f75d9dadc79ad9
2014-05-02 18:45:40 -07:00
Winson Chung
7e78b8d3db
Merge "Incorporating theme colors into task views."
2014-05-03 01:43:01 +00:00
Winson Chung
3e586e4621
Merge "Refactoring activity method to update recents values."
2014-05-03 01:42:42 +00:00
Winson Chung
f5e22e71cb
Incorporating theme colors into task views.
...
Change-Id: Ie7166d78dacabe4bff7afdade2d1da9d0651e403
2014-05-02 18:35:35 -07:00
Jose Lima
be2ba85c4f
Merge "Allow activities to be visible behind the Home Stack"
2014-05-03 01:06:34 +00:00
Guang Zhu
ce63f59906
am 9284a37d: am 1edfd835: Merge "add getAddress function to return BT mac" into klp-modular-dev
...
* commit '9284a37d601f8d90e868f6fb032ebb8b4e07029d':
add getAddress function to return BT mac
2014-05-03 00:39:06 +00:00
Adam Powell
3feb0419d2
Merge "ListViews in ScrollViews and ScrollViews in ListViews"
2014-05-03 00:36:21 +00:00
Guang Zhu
9284a37d60
am 1edfd835: Merge "add getAddress function to return BT mac" into klp-modular-dev
...
* commit '1edfd835c2573711587cc77befeefd96083ccba5':
add getAddress function to return BT mac
2014-05-03 00:35:26 +00:00
Alan Viverette
223b1e0ba7
Merge "Fix ripple cancel"
2014-05-03 00:35:24 +00:00
Winson Chung
03a9baedc9
Refactoring activity method to update recents values.
...
Change-Id: Ic525be207714d34abe0c2d26091c3e46abcd9bad
2014-05-02 17:34:37 -07:00
Guang Zhu
1edfd835c2
Merge "add getAddress function to return BT mac" into klp-modular-dev
2014-05-03 00:32:58 +00:00
Ruben Brunk
9dfcbb8403
Merge "Revert "camera3: Update CameraMetadata vendor tag handling.""
2014-05-03 00:29:01 +00:00
Ruben Brunk
31efe22b40
Revert "camera3: Update CameraMetadata vendor tag handling."
...
This reverts commit e03a7eab1d08c821a516f1c07d29a77797acab68.
Change-Id: I1682b5b0904974f488d3e51c3dbaa8f9f02ac71d
2014-05-03 00:28:49 +00:00
Alan Viverette
40c3734939
Fix ripple cancel
...
BUG: 14495933
Change-Id: Ie3498f35705b70e4c059ff86250cef4746f174da
2014-05-02 17:25:05 -07:00
Dianne Hackborn
93be005f43
Merge "Bump up priority of system receiving BOOT_COMPLETED."
2014-05-03 00:24:31 +00:00
Adam Powell
96d62aff0f
ListViews in ScrollViews and ScrollViews in ListViews
...
Dogs and cats, living together, mass hysteria!
Add support for nested scrolling to AbsListView, granting the ability
to both ListView and GridView.
Change-Id: Iae5c0518c5cebe41927720a7a27916ef13ca706e
2014-05-02 17:16:04 -07:00
Dianne Hackborn
d83a096f29
Bump up priority of system receiving BOOT_COMPLETED.
...
Change-Id: I5166f88f11f781914312e867cb653c8ecbefa705
2014-05-02 16:29:10 -07:00
Igor Murashkin
94814218d2
camera2: Add camera-specific data types used for metadata key/value
...
Adds new public API classes:
* InputOutputFormatsMap
* LensShadingMap
* RggbChannelVector
* StreamConfigurationMap
* TonemapCurve
Adds new @hide classes:
* StreamConfiguration
* StreamConfigurationDuration
Minor changes:
* CameraDevice (doc only)
* Preconditions (new @hide function)
Change-Id: I2f3757e2fe9d63e710f51469c650377165fd6631
2014-05-02 15:55:30 -07:00
Igor Murashkin
b3a78b2ca9
camera2: Add re-usable data types for camera metadata key/values
...
Adds new types to public API:
* ColorSpaceTransform
* Range<T>
* SizeF (android.util)
* MeteringRectangle
Minor changes to:
* Size (docs and move to android.util)
* Preconditions (@hide)
Adds helper class:
* HashCodeHelpers
Change-Id: Ied6749a19234f3af9da838f365f8d68d90251aaf
2014-05-02 15:55:29 -07:00
Ruben Brunk
5295745026
Merge "camera3: Update CameraMetadata vendor tag handling."
2014-05-02 22:23:29 +00:00
Deepanshu Gupta
9862c0b102
am e84f6b5a: (-s ours) am 106c24fb: am c7149708: am bab277cc: am 13542c7e: (-s ours) am 00e0b992: am 75f435b0: am 495c14d8: (-s ours) am 47ad22ed: am 961e3281: am 6df2860b: Add missing files to fix libphonenumber for layoutlib. [DO NOT MERGE]
...
* commit 'e84f6b5a4ee22c1106bbf668a6d6853cfbde31d0':
Add missing files to fix libphonenumber for layoutlib. [DO NOT MERGE]
2014-05-02 22:17:52 +00:00
Deepanshu Gupta
1389b7723a
am db176326: (-s ours) am 2f73224c: am b4367eaf: am 5ac33148: am 29376cea: (-s ours) am a996ff5c: am c529b700: am 8ad4b8b1: (-s ours) am 9932e589: am 9e2dadae: am bcbeaf83: Set default text style in layoutlib as NORMAL [DO NOT MERGE]
...
* commit 'db1763266dde346ed99a2f6dfac618c1b4b98c05':
Set default text style in layoutlib as NORMAL [DO NOT MERGE]
2014-05-02 22:17:48 +00:00
Deepanshu Gupta
812922f44f
am 85c6a654: (-s ours) am 3df2b07c: am 6241a6ce: am eecb79a8: am 22b47b28: (-s ours) am 16fda528: am b7431172: am 826a215c: (-s ours) am 320f1126: am cf3f108e: am 5be65fda: Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]
...
* commit '85c6a65471d5ec53a537b56de9924de866c633e3':
Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]
2014-05-02 22:17:44 +00:00
Deepanshu Gupta
5c67ea4b6c
am b8cdabb9: (-s ours) am f9852395: am 00251f77: am d1830eb6: am 57e410d9: (-s ours) am 9f81e73a: am 28ec8b4f: am 0a37981c: (-s ours) am 1b28d8d4: am d642de58: am ec4623d0: Improve text rendering and measurement. [DO NOT MERGE]
...
* commit 'b8cdabb990c69ae58bd184bb41f2c1d96735abd5':
Improve text rendering and measurement. [DO NOT MERGE]
2014-05-02 22:17:39 +00:00
Deepanshu Gupta
1405277606
am 8298b7f6: (-s ours) am 8c084dde: am 6214d7aa: am 5f0fb2a1: am 4da3827f: (-s ours) am acbff099: am d9076a95: am f4b35c6a: (-s ours) am ef822b3f: am 62a4a1f9: am 2a82a48f: Fix the measurement of text bounds. [DO NOT MERGE]
...
* commit '8298b7f649063dcbe3f857c21fcb609adf74f179':
Fix the measurement of text bounds. [DO NOT MERGE]
2014-05-02 22:17:35 +00:00
Deepanshu Gupta
7f53bf2bc0
am 976ee87d: (-s ours) am 9802058c: am eec3eb86: am c1ce1c99: am 951c6976: (-s ours) am fcdbc3cb: am 38f954c8: am e0537c1d: (-s ours) am c7f8e64c: am 1830a58f: am 5bb3414d: Fix a bug in Nine Patch library. [DO NOT MERGE]
...
* commit '976ee87d9908d47bab5be7e70671170afd6cc162':
Fix a bug in Nine Patch library. [DO NOT MERGE]
2014-05-02 22:17:31 +00:00
Deepanshu Gupta
4cb57587fb
am affabf47: (-s ours) am aefb9b8b: am 73e7402e: am 7b6ab8f3: am 031f4beb: (-s ours) am 469b4aea: am 35f9f310: am 5e6a2990: (-s ours) am 4d887ec3: am bcd50a7c: am 5712b5fc: Optimize layout rendering in layoutlib [DO NOT MERGE]
...
* commit 'affabf4734fee160e36628f0631e723cb9364b76':
Optimize layout rendering in layoutlib [DO NOT MERGE]
2014-05-02 22:17:26 +00:00
Deepanshu Gupta
f12768412e
am 2c3b7d18: (-s ours) am 856e0e3a: am 02a07b73: am 20e540be: am 2d7a9c3e: (-s ours) am c3e89c3f: am 95672929: am 73f9e467: (-s ours) am edd67cb1: am 7c02c6e2: am 02cde9ce: Add methods for Time_Delegate [DO NOT MERGE]
...
* commit '2c3b7d18526ce3240d26c720e5b22c73adfe1b0a':
Add methods for Time_Delegate [DO NOT MERGE]
2014-05-02 22:17:22 +00:00
Deepanshu Gupta
73280da4a3
am d3866faa: (-s ours) am e8045e10: am d35e28f3: am d88cece4: am d683d56c: (-s ours) am 35a94df7: am ea18b2d6: am 95fd97aa: (-s ours) am 84e7a6b8: am 443372dd: am 9d7b5165: Add libphonenumber to layoutlib.jar. [DO NOT MERGE]
...
* commit 'd3866faaffbd0ca46aa070df0c844fa18b392f0b':
Add libphonenumber to layoutlib.jar. [DO NOT MERGE]
2014-05-02 22:17:18 +00:00
Deepanshu Gupta
68b65db09e
am 77f37918: (-s ours) am c03530c1: am b20352f5: am 33f44937: am e9c20fd4: (-s ours) am 81f1e754: am fd581059: am 88a12f57: (-s ours) am 43034b54: am 62591cff: am 689c0dfe: Fix NPE in layoutlib. [DO NOT MERGE]
...
* commit '77f37918943cebf6f8cae049a7c0e01abdcf75e4':
Fix NPE in layoutlib. [DO NOT MERGE]
2014-05-02 22:17:14 +00:00
Deepanshu Gupta
7b87e87719
am f07a7a7a: (-s ours) am e5a066c7: am ad0060b5: am 1da7b0b5: am 35b16e5d: (-s ours) am 9e8ae205: am f41ce157: am 43ed35da: (-s ours) am ce205d0a: am 600539c7: am 083d1562: Fix text size in Fake Action Bar. [DO NOT MERGE]
...
* commit 'f07a7a7aaf9ab89ac69afae9f5c39349561c8bbe':
Fix text size in Fake Action Bar. [DO NOT MERGE]
2014-05-02 22:17:10 +00:00
Deepanshu Gupta
c87df0bafa
am 3f7c81ee: (-s ours) am 551ee874: am 94f1de7a: am 27c91491: am 8c54c861: (-s ours) am 2fee69e0: am 071206b4: am aab9d9a7: (-s ours) am 1a434aa8: am 697c511d: am 80c668f2: Remove references to non-std Java classes. [DO NOT MERGE]
...
* commit '3f7c81eed4e908c4258627e79d51edd331588a52':
Remove references to non-std Java classes. [DO NOT MERGE]
2014-05-02 22:17:07 +00:00
Deepanshu Gupta
40d34742dc
am 0beb2037: (-s ours) am f07310bb: am 61c8829a: am 67da11c2: am 683e1663: (-s ours) am 79150645: am c37f7c84: am d15bbac6: (-s ours) am a2b530fb: am e39de9ae: am 6335590a: Fix DatePicker and Calendar widget in layoutlib. [DO NOT MERGE]
...
* commit '0beb2037369a1d12c8c83ccfd9fa19347bef9573':
Fix DatePicker and Calendar widget in layoutlib. [DO NOT MERGE]
2014-05-02 22:17:02 +00:00
Deepanshu Gupta
b0742b2bdd
am b65e5b1b: (-s ours) am 02e4ee55: am e216cfc4: am 1e884cd0: am 543452e8: (-s ours) am e860b24e: am 8cc1d989: am 3e9bc262: (-s ours) am 9d209905: am 6f469e54: am 11ee746d: Layoutlib: Update the wifi icon in the status bar. [DO NOT MERGE]
...
* commit 'b65e5b1b0a90a1fe8f1ac33cbdce0c6ecc584116':
Layoutlib: Update the wifi icon in the status bar. [DO NOT MERGE]
2014-05-02 22:16:58 +00:00
Deepanshu Gupta
5c7b9d4f86
am b9182c00: (-s ours) am 9748d534: am 909acf69: am 53fae496: am dd74d6ed: (-s ours) am 042d992d: am b22644fa: am 2bb672a2: (-s ours) am 582bb0dc: am fbb1561a: am 44bcd64e: Fix CalendarView to show the right labels. [DO NOT MERGE]
...
* commit 'b9182c00ff490b11f521861f776fd10268d69f5a':
Fix CalendarView to show the right labels. [DO NOT MERGE]
2014-05-02 22:16:54 +00:00
Deepanshu Gupta
d0457265c5
am 457df2e0: (-s ours) am e5ce95d3: am a4d43c1f: am 1aca6e06: am 8bc5b5b6: (-s ours) am 4c3549a2: am 789f7ada: am 27f0cf0b: (-s ours) am 10fd7f6b: am ca2c6307: am 87be67f9: Fix layoutlib [DO NOT MERGE]
...
* commit '457df2e02d3294fed8472f6b0a53b55d98819e2d':
Fix layoutlib [DO NOT MERGE]
2014-05-02 22:16:49 +00:00
Deepanshu Gupta
a3e1ef744f
am c591ecd8: (-s ours) am ec7bd328: am a76b37e1: am 265df035: am cb52ff3a: (-s ours) am efc7ec99: am cc5e933f: am 5c7a844c: (-s ours) am 23726255: am 77d1eca7: am 7b5d54f0: Fix ClassCastException when rendering ListView [DO NOT MERGE]
...
* commit 'c591ecd849b70f00f23c6c4e3c151be98978f14b':
Fix ClassCastException when rendering ListView [DO NOT MERGE]
2014-05-02 22:16:45 +00:00
Deepanshu Gupta
6cf440a844
am bc0cd97d: (-s ours) am da4e3e40: am d8ca6e55: am b4d5b4f6: am 718b8028: (-s ours) am bd532261: am ffba5739: am d60d0c1c: (-s ours) am f5512973: am fe675441: am ce22440d: Fix text rendering [DO NOT MERGE]
...
* commit 'bc0cd97d8dd4fb1b5cee1f3dd4b53a32599f75c5':
Fix text rendering [DO NOT MERGE]
2014-05-02 22:16:34 +00:00
Deepanshu Gupta
6eecfd425f
am 170e427f: (-s ours) am 185c51f5: am 2f9e1769: am a1fa08e8: am dd7a3706: (-s ours) am 0d1d0f4b: am 519e77bb: am 44cc867f: (-s ours) am 9a1f13a4: am afc623e3: am bd9e181b: Fix layout rendering for RTL locales [DO NOT MERGE]
...
* commit '170e427fb42e3159c44ac343a97da69351c1f2fb':
Fix layout rendering for RTL locales [DO NOT MERGE]
2014-05-02 22:16:30 +00:00
Deepanshu Gupta
c6b40a1be5
am f2480d5f: (-s ours) am 18da05bc: am d2dc1b09: am 767df122: am 8b95eb0b: (-s ours) am 1ae98755: am 64d1c57a: am 11976058: (-s ours) am b80247d3: am 811b331a: am d4875e19: Add orientation to configuration for layoutlib. [DO NOT MERGE]
...
* commit 'f2480d5f97c83c1fee9f94823f3d3773996df173':
Add orientation to configuration for layoutlib. [DO NOT MERGE]
2014-05-02 22:16:25 +00:00
Deepanshu Gupta
ad2e88fa50
am 6343490a: (-s ours) am 217f182a: am e73e005b: am ba09a379: am 05fea8bf: (-s ours) am 779972f1: am 175a1e60: am e821d0cc: (-s ours) am b27d8814: am 21cf9843: am d1084cc0: Add missing native methods. [DO NOT MERGE]
...
* commit '6343490a80059a6c31af80de8d8b719b228df771':
Add missing native methods. [DO NOT MERGE]
2014-05-02 22:16:19 +00:00
Deepanshu Gupta
8734db386c
am 090e3b54: (-s ours) am 99879842: am 3d564043: am 7b5a7434: am 288d32b9: (-s ours) am 17e0eebd: am 465cb53b: Use ApplicationInfo only when not in edit mode [DO NOT MERGE]
...
* commit '090e3b5437b6e15c99b743672542991326c00b16':
Use ApplicationInfo only when not in edit mode [DO NOT MERGE]
2014-05-02 22:16:15 +00:00
Deepanshu Gupta
85af2edf79
am 9b8602d5: (-s ours) am 0ec21781: am 7c6c49b0: am 4c3e5340: am e4fe8556: (-s ours) am bb1d24d7: am b5cdfd97: Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE]
...
* commit '9b8602d5112d4c2c45f986b27ee6b190fd48d11e':
Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE]
2014-05-02 22:16:10 +00:00
Deepanshu Gupta
f5da96479e
am 79ee53ec: (-s ours) am 0ae06aa6: am 8328a237: am 78317c44: am 5a94ac62: (-s ours) am 63a6de79: am 20e0695b: Action bar rendering in layoutlib [DO NOT MERGE]
...
* commit '79ee53eca98fae132d0954a804d04696b8afc95c':
Action bar rendering in layoutlib [DO NOT MERGE]
2014-05-02 22:16:06 +00:00