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

133631 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Winson Chung
56c4370eee am ee9b42a9: Merge "Incorporating theme colors into task views." 
* commit 'ee9b42a9a330b3225182761c542a095801835354':
  Incorporating theme colors into task views.
 2014-05-03 01:46:01 +00:00
Winson Chung
b66ef989d6 am e315e251: Merge "Refactoring activity method to update recents values." 
* commit 'e315e251f07d1346925048fb420312d792af6f9b':
  Refactoring activity method to update recents values.
 2014-05-03 01:45:57 +00: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
cb08562056 am 9130633e: Merge "Allow activities to be visible behind the Home Stack" 
* commit '9130633e349deb079418ca0713b25480dca0444b':
  Allow activities to be visible behind the Home Stack
 2014-05-03 01:11:40 +00:00
Jose Lima
be2ba85c4f Merge "Allow activities to be visible behind the Home Stack" 2014-05-03 01:06:34 +00:00
Guang Zhu
7996d4dd4b am 69c6a3fe: am 9284a37d: am 1edfd835: Merge "add getAddress function to return BT mac" into klp-modular-dev 
* commit '69c6a3fedd9ad198408dea9ebb9b9383f34e7117':
  add getAddress function to return BT mac
 2014-05-03 00:45:23 +00:00
Adam Powell
c69886edc0 am 94ffd117: Merge "ListViews in ScrollViews and ScrollViews in ListViews" 
* commit '94ffd117faef4b8a73c6ffb7ba0fdf2ebe1f05d4':
  ListViews in ScrollViews and ScrollViews in ListViews
 2014-05-03 00:41:32 +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
Alan Viverette
24d80907c3 am 5e6e7cf5: Merge "Fix ripple cancel" 
* commit '5e6e7cf57008f18687ee692da8de6d9a417c4df1':
  Fix ripple cancel
 2014-05-03 00:37:37 +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
002f6939c0 am b6a827b7: Merge "Revert "camera3: Update CameraMetadata vendor tag handling."" 
* commit 'b6a827b7eee59059ba67643cb65a929f7f6073c6':
  Revert "camera3: Update CameraMetadata vendor tag handling."
 2014-05-03 00:32:16 +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
Dianne Hackborn
6c0fa43ed0 am 75e18ec4: Merge "Bump up priority of system receiving BOOT_COMPLETED." 
* commit '75e18ec4107cb7465ec91a579f5f1a6f81d268cd':
  Bump up priority of system receiving BOOT_COMPLETED.
 2014-05-03 00:28:11 +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
Igor Murashkin
3f29419313 am 051dd983: camera2: Add camera-specific data types used for metadata key/value 
* commit '051dd9832b0c6c483f2d162154f67a31ef097598':
  camera2: Add camera-specific data types used for metadata key/value
 2014-05-02 23:30:13 +00:00
Igor Murashkin
f188f1863d am 9c31c106: camera2: Add re-usable data types for camera metadata key/values 
* commit '9c31c106db115c8fba67f83a1b416839b99317ee':
  camera2: Add re-usable data types for camera metadata key/values
 2014-05-02 23:30:09 +00: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
92df423b7f am d4fe4910: Merge "camera3: Update CameraMetadata vendor tag handling." 
* commit 'd4fe491095238733adbf1df44b691487e5baadba':
  camera3: Update CameraMetadata vendor tag handling.
 2014-05-02 22:28:41 +00:00
Deepanshu Gupta
4a7b370101 am 835a6bdd: 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 '835a6bddaf2c7119b648e9c958acdfc8ac35689e':
  Add missing files to fix libphonenumber for layoutlib. [DO NOT MERGE]
 2014-05-02 22:28:28 +00:00
Deepanshu Gupta
7c7e896ad3 am 7615e0f6: 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 '7615e0f67b6a7a11e2e72bb572b997e0669f7f73':
  Set default text style in layoutlib as NORMAL [DO NOT MERGE]
 2014-05-02 22:28:25 +00:00
Deepanshu Gupta
3b846a427c am 0b976f65: 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 '0b976f65c468c29a498a568d3e275fb932329d09':
  Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]
 2014-05-02 22:28:21 +00:00
Deepanshu Gupta
e248f9401c am c3096237: 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 'c3096237d1a601f9cbe258de5349ba72830aa729':
  Improve text rendering and measurement. [DO NOT MERGE]
 2014-05-02 22:28:17 +00:00
Deepanshu Gupta
43516439c1 am 0284ac3f: 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 '0284ac3fbf556614b10e23d5c8bd56c1bc21d6c7':
  Fix the measurement of text bounds. [DO NOT MERGE]
 2014-05-02 22:28:14 +00:00
Deepanshu Gupta
1acab16260 am 2b0d0364: 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 '2b0d03645e66f335ff5b727fe689a61df542fc58':
  Fix a bug in Nine Patch library. [DO NOT MERGE]
 2014-05-02 22:28:10 +00:00
Deepanshu Gupta
1166fb0d78 am 238a1f7b: 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 '238a1f7bf85d1b2adcd509e6c461dcadad6759ab':
  Optimize layout rendering in layoutlib [DO NOT MERGE]
 2014-05-02 22:28:07 +00:00
Deepanshu Gupta
295884b81e am 3d7fcf89: 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 '3d7fcf89c891f697a61afd58ac9d13d41fc50406':
  Add methods for Time_Delegate [DO NOT MERGE]
 2014-05-02 22:28:02 +00:00
Deepanshu Gupta
723ca3802f am 06ffd100: 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 '06ffd1009b3d7f09b399cdee2ee20a6c6556ed23':
  Add libphonenumber to layoutlib.jar. [DO NOT MERGE]
 2014-05-02 22:27:59 +00:00
Deepanshu Gupta
36dbbac7de am c66b8465: 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 'c66b8465400f6ad9597c8ba0dd1e059ad69e4f56':
  Fix NPE in layoutlib. [DO NOT MERGE]
 2014-05-02 22:27:55 +00:00
Deepanshu Gupta
438955a27f am 249a896b: 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 '249a896b7be47b3b03c1e6574cb0b81e6d9fca10':
  Fix text size in Fake Action Bar. [DO NOT MERGE]
 2014-05-02 22:27:51 +00:00
Deepanshu Gupta
caf88e771f am d3badd55: 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 'd3badd5503c1592db7d3cadc7369a1d3838c8405':
  Remove references to non-std Java classes. [DO NOT MERGE]
 2014-05-02 22:27:47 +00:00
Deepanshu Gupta
4c04167163 am cc3c35a7: 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 'cc3c35a7d77e5a2a85dd856b15e71fc9f803c628':
  Fix DatePicker and Calendar widget in layoutlib. [DO NOT MERGE]
 2014-05-02 22:27:42 +00:00
Deepanshu Gupta
f2018fff07 am 7630d381: 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 '7630d3816c730466c5e0303756dfce3007133d79':
  Layoutlib: Update the wifi icon in the status bar. [DO NOT MERGE]
 2014-05-02 22:27:38 +00:00
Deepanshu Gupta
0bbf6724c5 am 97d6a9ce: 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 '97d6a9ced8d5296a4af835918dcd53eea8f6e977':
  Fix CalendarView to show the right labels. [DO NOT MERGE]
 2014-05-02 22:27:34 +00:00
Deepanshu Gupta
4ab55a82f8 am eab9bdcc: 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 'eab9bdcc1de7773cb20afd8e9f2dbe1f42f266b8':
  Fix layoutlib [DO NOT MERGE]
 2014-05-02 22:27:30 +00:00
Deepanshu Gupta
0f225de1a5 am aaff1c66: 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 'aaff1c668ddf75d0917501f6b8194f652c4e252c':
  Fix ClassCastException when rendering ListView [DO NOT MERGE]
 2014-05-02 22:27:25 +00:00
Deepanshu Gupta
2dde997ffe am ff83dc89: 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 'ff83dc891ec6dab703a98eac63aab833cbc3ca61':
  Fix text rendering [DO NOT MERGE]
 2014-05-02 22:27:22 +00:00
Deepanshu Gupta
171ccfe297 am c1164d39: 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 'c1164d3949bf5bd8e79b438e6b8a13a8d253c1de':
  Fix layout rendering for RTL locales [DO NOT MERGE]
 2014-05-02 22:27:18 +00:00
Deepanshu Gupta
1304193ddb am 3a724795: 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 '3a72479528b3b0af546b47e0d063ad7e583fdea6':
  Add orientation to configuration for layoutlib. [DO NOT MERGE]
 2014-05-02 22:27:14 +00:00
Deepanshu Gupta
9e69177272 am 3c4b0f20: 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 '3c4b0f204df3bed9b6c6b8bd19499cf1ec2db22c':
  Add missing native methods. [DO NOT MERGE]
 2014-05-02 22:27:11 +00:00