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

155946 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Elliott Hughes
011c96b556 Merge "Remove some unused %% strings from frameworks/base." into lmp-mr1-dev 2014-10-09 20:31:40 +00:00
Elliott Hughes
8d092c231f am 7d32838d: Merge "Track change to private libcore data structure." into lmp-mr1-dev 
* commit '7d32838d7817be6528b8b63ccb3a985b9cd582c1':
  Track change to private libcore data structure.
 2014-10-09 20:20:09 +00:00
Elliott Hughes
7d32838d78 Merge "Track change to private libcore data structure." into lmp-mr1-dev 2014-10-09 20:15:52 +00:00
Adam Powell
0f61804f18 am 7cb761fe: Merge "Document that MarginLayoutParams margins should be positive." into lmp-mr1-dev 
* commit '7cb761fe8c29fc00e66515c40f7fcb9111b70da0':
  Document that MarginLayoutParams margins should be positive.
 2014-10-09 20:12:29 +00:00
Adam Powell
7cb761fe8c Merge "Document that MarginLayoutParams margins should be positive." into lmp-mr1-dev 2014-10-09 20:08:41 +00:00
Adam Powell
02091f071a am 19a9e6c2: Merge "Throw a more descriptive exception when adding null to a ViewGroup" into lmp-mr1-dev 
* commit '19a9e6c23b44e4fbee2f559e921170e34732d858':
  Throw a more descriptive exception when adding null to a ViewGroup
 2014-10-09 20:00:39 +00:00
Adam Powell
19a9e6c23b Merge "Throw a more descriptive exception when adding null to a ViewGroup" into lmp-mr1-dev 2014-10-09 19:57:00 +00:00
Adam Powell
a7a735fb2a Document that MarginLayoutParams margins should be positive. 
Negative margins can cause all sorts of other problematic assumptions,
subtle errors and unexpected behavior. While they technically work
developers should steer clear of them.

Change-Id: Ia1f7d9a33e25444ebdc3c32679ae1179210558e1
 2014-10-09 12:54:52 -07:00
Adam Lesinski
f23e3ea629 am aeef612f: Merge "Search all packages for a given type string when looking up resources by name" into lmp-dev 
* commit 'aeef612f200b6b5cee214230271e1c3d718151ee':
  Search all packages for a given type string when looking up resources by name
 2014-10-09 19:30:31 +00:00
Dianne Hackborn
0e259ce2d7 am 6166a824: Merge "Implement issue #17906468: Allow search request to fall back to global search" into lmp-dev 
* commit '6166a824b2ea7b7918f54769005ab691e15f77f7':
  Implement issue #17906468: Allow search request to fall back to global search
 2014-10-09 19:30:26 +00:00
Jorim Jaggi
fc779ccf86 am 01f1c5c8: Merge "Fix content description for bluetooth icon" into lmp-dev 
* commit '01f1c5c85476b7eee3155ac1a1f6b570582ecd6c':
  Fix content description for bluetooth icon
 2014-10-09 19:30:16 +00:00
Joe Fernandez
487e15b901 am 401418d5: Merge "Revert "Removed preview license."" into lmp-dev 
* commit '401418d53b699e6cde53e45fba066c933868b6c1':
  Revert "Removed preview license."
 2014-10-09 19:30:00 +00:00
Sandeep Siddhartha
eecf74bcf7 am ed65c63b: Merge "Add tests for model management [SDK Only]" into lmp-dev 
* commit 'ed65c63bdc4a4413da5195f7e5fa392ce72f6135':
  Add tests for model management [SDK Only]
 2014-10-09 19:29:55 +00:00
Etan Cohen
4354e6046e am 5e5bc4b1: TD_SCDMA is more like GSM than CDMA - re-classifying. 
* commit '5e5bc4b13cd1fc657da940c14e2333d8d3b18080':
  TD_SCDMA is more like GSM than CDMA - re-classifying.
 2014-10-09 19:29:43 +00:00
Robin Lee
d92e9bebdf am 499a3629: am 4a718f2a: am a300025d: Merge "DevicePolicy: One cert tracker warning per profile" into lmp-dev 
* commit '499a36294b48acf5c77f36281ddb40ef205dc596':
  DevicePolicy: One cert tracker warning per profile
 2014-10-09 19:23:27 +00:00
Joe Fernandez
d240b98f99 am b455eb7b: am 5b349c4c: am e2f757d9: am a63f81ec: am e15773be: Merge "docs: Android TV publishing requirements" into klp-modular-docs 
* commit 'b455eb7b32748c326bf64467223a8e553d630176':
  docs: Android TV publishing requirements
 2014-10-09 19:23:23 +00:00
Chong Zhang
8dac6fe7ae am d4410a19: am d25b996a: am a6ae8ba4: MediaHTTPConnection: do not use proxy for localhost 
* commit 'd4410a19bcad9e402c2a8f31576454a061c0c110':
  MediaHTTPConnection: do not use proxy for localhost
 2014-10-09 19:23:19 +00:00
Christopher Tate
c049e123be am 97cb995e: am f857b272: am 2e0f6682: Merge "Also monitor MOVED_TO events for wallpaper updates" into lmp-dev 
* commit '97cb995e990ab868355f109c1466a810dbad4d35':
  Also monitor MOVED_TO events for wallpaper updates
 2014-10-09 19:23:15 +00:00
Fred Fettinger
0ebdc70d7a am 1114b3b8: am 708206c3: am 6c858c25: am b4093c12: (-s ours) hwui: Caches: use mBoundTextures only for GL_TEXTURE_2D - DO NOT MERGE 
* commit '1114b3b8d74aee0f1ec17f9f7b7f8e8c3cb3b4ca':
  hwui: Caches: use mBoundTextures only for GL_TEXTURE_2D - DO NOT MERGE
 2014-10-09 19:23:11 +00:00
mike dooley
a83896ce73 am 6e24a156: am 3175824a: am 879142bf: Fix hangouts conference calling regression. 
* commit '6e24a156cd9a43ff782926a8d5618ed63944a933':
  Fix hangouts conference calling regression.
 2014-10-09 19:23:07 +00:00
Tim Kilbourn
79297f3c1c am bb76d5cd: am 5d7f58be: am 37bd0776: Merge "Don\'t start SearchDialog on television." into lmp-dev 
* commit 'bb76d5cd886f34165e59a35a36c353fe559929c7':
  Don't start SearchDialog on television.
 2014-10-09 19:23:00 +00:00
Jeff Brown
847d269297 am 8aa2e3f1: am ab46eda8: am 704998ab: Merge "Ensure we correctly unblank displays when added." into lmp-dev 
* commit '8aa2e3f168bc68b1ed59d0ea14a212bdb1837fa8':
  Ensure we correctly unblank displays when added.
 2014-10-09 19:22:56 +00:00
smain@google.com
efdf63a74e am 8aa0e547: am 8433b63c: am b880707c: am 63cd4977: am 770c3c5e: fix unclickable link due to overlay from offset dev below 
* commit '8aa0e54703067633001d52661a423075b38ed26e':
  fix unclickable link due to overlay from offset dev below
 2014-10-09 19:22:52 +00:00
smain@google.com
520100d569 am fc696fb6: am 3ae2a715: am 9f928944: Merge "update droiddoc option to include api level 21 for javadoc tagging" into lmp-dev 
* commit 'fc696fb6f3eb1b8226ac4675da02e512e5ff48bd':
  update droiddoc option to include api level 21 for javadoc tagging
 2014-10-09 19:22:48 +00:00
Christopher Tate
353e4a99e9 am c09f6e69: am b03b6a6c: am 6dea8de7: Merge "Actually tell the widget service that restore is starting" into lmp-dev 
* commit 'c09f6e6906bc159121bf84454b0462a592032491':
  Actually tell the widget service that restore is starting
 2014-10-09 19:22:44 +00:00
Robin Lee
499a36294b am 4a718f2a: am a300025d: Merge "DevicePolicy: One cert tracker warning per profile" into lmp-dev 
* commit '4a718f2af33159e58f4ad639d9d0e633a6ca8a8f':
  DevicePolicy: One cert tracker warning per profile
 2014-10-09 19:17:39 +00:00
Joe Fernandez
b455eb7b32 am 5b349c4c: am e2f757d9: am a63f81ec: am e15773be: Merge "docs: Android TV publishing requirements" into klp-modular-docs 
* commit '5b349c4ce9be68efe3b6d0bc09a3cfa22d837f25':
  docs: Android TV publishing requirements
 2014-10-09 19:17:34 +00:00
Chong Zhang
d4410a19bc am d25b996a: am a6ae8ba4: MediaHTTPConnection: do not use proxy for localhost 
* commit 'd25b996a7ab2589f258d0006dda6589f53d98366':
  MediaHTTPConnection: do not use proxy for localhost
 2014-10-09 19:17:29 +00:00
Christopher Tate
97cb995e99 am f857b272: am 2e0f6682: Merge "Also monitor MOVED_TO events for wallpaper updates" into lmp-dev 
* commit 'f857b272c27ca6836b5cec51a9f3714603aa2ad0':
  Also monitor MOVED_TO events for wallpaper updates
 2014-10-09 19:17:23 +00:00
Fred Fettinger
1114b3b8d7 am 708206c3: am 6c858c25: am b4093c12: (-s ours) hwui: Caches: use mBoundTextures only for GL_TEXTURE_2D - DO NOT MERGE 
* commit '708206c35ed8da1e0c3f0624a9221ecb84d3504f':
  hwui: Caches: use mBoundTextures only for GL_TEXTURE_2D - DO NOT MERGE
 2014-10-09 19:17:18 +00:00
mike dooley
6e24a156cd am 3175824a: am 879142bf: Fix hangouts conference calling regression. 
* commit '3175824a783c5d45df91ccf84fab8304f4d353c4':
  Fix hangouts conference calling regression.
 2014-10-09 19:17:14 +00:00
Tim Kilbourn
bb76d5cd88 am 5d7f58be: am 37bd0776: Merge "Don\'t start SearchDialog on television." into lmp-dev 
* commit '5d7f58be2c034823d6e5cfab847ad50b2a463dfc':
  Don't start SearchDialog on television.
 2014-10-09 19:17:10 +00:00
Jeff Brown
8aa2e3f168 am ab46eda8: am 704998ab: Merge "Ensure we correctly unblank displays when added." into lmp-dev 
* commit 'ab46eda872b4c9a4e16c57c00e5c85bb1f7143ce':
  Ensure we correctly unblank displays when added.
 2014-10-09 19:17:05 +00:00
smain@google.com
8aa0e54703 am 8433b63c: am b880707c: am 63cd4977: am 770c3c5e: fix unclickable link due to overlay from offset dev below 
* commit '8433b63c0248b4c2650ee3d8db77aaba4748ae47':
  fix unclickable link due to overlay from offset dev below
 2014-10-09 19:17:01 +00:00
smain@google.com
fc696fb6f3 am 3ae2a715: am 9f928944: Merge "update droiddoc option to include api level 21 for javadoc tagging" into lmp-dev 
* commit '3ae2a71539aeef868ec6b6c5b755a2b3f0c1b4e0':
  update droiddoc option to include api level 21 for javadoc tagging
 2014-10-09 19:16:55 +00:00
Christopher Tate
c09f6e6906 am b03b6a6c: am 6dea8de7: Merge "Actually tell the widget service that restore is starting" into lmp-dev 
* commit 'b03b6a6c5a88e4c55d936ec028dd55a699ae787f':
  Actually tell the widget service that restore is starting
 2014-10-09 19:16:50 +00:00
Robin Lee
4a718f2af3 am a300025d: Merge "DevicePolicy: One cert tracker warning per profile" into lmp-dev 
* commit 'a300025d23fac899c2294a8281b12b52d4e830b6':
  DevicePolicy: One cert tracker warning per profile
 2014-10-09 19:11:29 +00:00
Joe Fernandez
5b349c4ce9 am e2f757d9: am a63f81ec: am e15773be: Merge "docs: Android TV publishing requirements" into klp-modular-docs 
* commit 'e2f757d9f3341b66d75d335cd9dd29848a4b8969':
  docs: Android TV publishing requirements
 2014-10-09 19:11:22 +00:00
Chong Zhang
d25b996a7a am a6ae8ba4: MediaHTTPConnection: do not use proxy for localhost 
* commit 'a6ae8ba4a59f3f893fe8893335e7517388123c10':
  MediaHTTPConnection: do not use proxy for localhost
 2014-10-09 19:11:11 +00:00
Christopher Tate
f857b272c2 am 2e0f6682: Merge "Also monitor MOVED_TO events for wallpaper updates" into lmp-dev 
* commit '2e0f66820e12bbd24f476fba863d9dab564c6f97':
  Also monitor MOVED_TO events for wallpaper updates
 2014-10-09 19:11:06 +00:00
Fred Fettinger
708206c35e am 6c858c25: am b4093c12: (-s ours) hwui: Caches: use mBoundTextures only for GL_TEXTURE_2D - DO NOT MERGE 
* commit '6c858c25f31bcdd72b60cbd0c91b085d9f298ffa':
  hwui: Caches: use mBoundTextures only for GL_TEXTURE_2D - DO NOT MERGE
 2014-10-09 19:09:50 +00:00
mike dooley
3175824a78 am 879142bf: Fix hangouts conference calling regression. 
* commit '879142bf1c6b72670d4aedac82938f00a97acf5b':
  Fix hangouts conference calling regression.
 2014-10-09 19:09:41 +00:00
Tim Kilbourn
5d7f58be2c am 37bd0776: Merge "Don\'t start SearchDialog on television." into lmp-dev 
* commit '37bd07768a05aabb0905608606f354a488a2d5cf':
  Don't start SearchDialog on television.
 2014-10-09 19:09:30 +00:00
Jeff Brown
ab46eda872 am 704998ab: Merge "Ensure we correctly unblank displays when added." into lmp-dev 
* commit '704998abbafea84c28c0bcd0c540af87562b4cc9':
  Ensure we correctly unblank displays when added.
 2014-10-09 19:09:01 +00:00
smain@google.com
8433b63c02 am b880707c: am 63cd4977: am 770c3c5e: fix unclickable link due to overlay from offset dev below 
* commit 'b880707c7facd8f9232379ef481b2b5a0030b682':
  fix unclickable link due to overlay from offset dev below
 2014-10-09 19:08:56 +00:00
smain@google.com
3ae2a71539 am 9f928944: Merge "update droiddoc option to include api level 21 for javadoc tagging" into lmp-dev 
* commit '9f928944fa4186e97b051b0076d7e30469b92124':
  update droiddoc option to include api level 21 for javadoc tagging
 2014-10-09 19:08:41 +00:00
Christopher Tate
b03b6a6c5a am 6dea8de7: Merge "Actually tell the widget service that restore is starting" into lmp-dev 
* commit '6dea8de7097eb91c9595cea63acd489e34c63aac':
  Actually tell the widget service that restore is starting
 2014-10-09 19:08:33 +00:00
Adam Lesinski
aeef612f20 Merge "Search all packages for a given type string when looking up resources by name" into lmp-dev 2014-10-09 19:02:24 +00:00
Dianne Hackborn
6166a824b2 Merge "Implement issue #17906468: Allow search request to fall back to global search" into lmp-dev 2014-10-09 19:00:12 +00:00
Jorim Jaggi
ef72a198af Apply color to progress bar for notifications 
Bug: 17128179
Change-Id: Ia642ff2a352bbabf2d1e468367d45dc188ee0e73
 2014-10-09 11:37:00 -07:00