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

170964 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alan Viverette
f758af4e72 am 32230b2b: am 882a1e89: Merge "Let host view handle long-press when using drag-to-open" into lmp-mr1-dev 
* commit '32230b2bdec14f33d793f8f3c89673b648139170':
  Let host view handle long-press when using drag-to-open
 2014-12-09 00:17:44 +00:00
Alan Viverette
b0efde16ea am 5a8b956f: am db82c9e0: Merge "Fix regression, don\'t NPE if Switch doesn\'t have a thumb set" into lmp-mr1-dev 
* commit '5a8b956fd22ffd2d4d54b47109c79748ff723d90':
  Fix regression, don't NPE if Switch doesn't have a thumb set
 2014-12-09 00:17:37 +00:00
Svet Ganov
aad2ffe67a am 7f980d75: am 381a4236: Merge "When accessibility on cannot click on a view covered by a HorizontalScrollView" into lmp-mr1-dev 
* commit '7f980d7508cab2bc9c4f84e5ea15984e284dbbb7':
  When accessibility on cannot click on a view covered by a HorizontalScrollView
 2014-12-09 00:17:31 +00:00
Svet Ganov
2dbd133c96 am a91256bc: am e232d4a6: Merge "Clear clicked nodes from the accessibiliy cache." into lmp-mr1-dev 
* commit 'a91256bc75e510a254d4e5c6e8d1df8391f20bba':
  Clear clicked nodes from the accessibiliy cache.
 2014-12-09 00:17:24 +00:00
Alan Viverette
32230b2bde am 882a1e89: Merge "Let host view handle long-press when using drag-to-open" into lmp-mr1-dev 
* commit '882a1e89742607a3f1fdaa8f5bbd0eb894fc0150':
  Let host view handle long-press when using drag-to-open
 2014-12-09 00:07:17 +00:00
Alan Viverette
5a8b956fd2 am db82c9e0: Merge "Fix regression, don\'t NPE if Switch doesn\'t have a thumb set" into lmp-mr1-dev 
* commit 'db82c9e00ee9eefab68f6b8fff5db60736583490':
  Fix regression, don't NPE if Switch doesn't have a thumb set
 2014-12-09 00:07:12 +00:00
Svet Ganov
7f980d7508 am 381a4236: Merge "When accessibility on cannot click on a view covered by a HorizontalScrollView" into lmp-mr1-dev 
* commit '381a423634a293d53f972a0ce4abd7fe7cf7d703':
  When accessibility on cannot click on a view covered by a HorizontalScrollView
 2014-12-09 00:07:06 +00:00
Svet Ganov
a91256bc75 am e232d4a6: Merge "Clear clicked nodes from the accessibiliy cache." into lmp-mr1-dev 
* commit 'e232d4a6aadbd32cb80ffd0da9a5d164910b1b79':
  Clear clicked nodes from the accessibiliy cache.
 2014-12-09 00:07:01 +00:00
Alan Viverette
882a1e8974 Merge "Let host view handle long-press when using drag-to-open" into lmp-mr1-dev 2014-12-08 21:29:08 +00:00
Alan Viverette
db82c9e00e Merge "Fix regression, don't NPE if Switch doesn't have a thumb set" into lmp-mr1-dev 2014-12-08 21:29:04 +00:00
Svet Ganov
381a423634 Merge "When accessibility on cannot click on a view covered by a HorizontalScrollView" into lmp-mr1-dev 2014-12-08 21:28:19 +00:00
Svet Ganov
e232d4a6aa Merge "Clear clicked nodes from the accessibiliy cache." into lmp-mr1-dev 2014-12-08 21:08:36 +00:00
Alan Viverette
01a0963006 Fix regression, don't NPE if Switch doesn't have a thumb set 
BUG: 18670202
Change-Id: Iecb3498032c121c007ec87740ddebadb8e71c7a3
 2014-12-08 13:02:06 -08:00
Alan Viverette
298536b1a0 Let host view handle long-press when using drag-to-open 
BUG: 18605860
Change-Id: I75850138614f17cf728d4411c142a07bdf15d085
 2014-12-08 12:31:14 -08:00
John Spurlock
9cfdb4f658 am 967e19a4: am 2f47eaff: Merge "Volume: Only play the new vibrate hint once per volume-down." into lmp-mr1-dev 
* commit '967e19a402046ba771cdebe99da2488bfc1959b1':
  Volume: Only play the new vibrate hint once per volume-down.
 2014-12-08 19:56:05 +00:00
Joe Fernandez
d50390ecde am 17ab7f49: am cdcabe4c: am d6a66d84: am 6ecc6d59: am 88b8b4a5: Merge "docs: studio revision update 1.0" into lmp-docs 
* commit '17ab7f4962a00542a91d0b886dc237949c568c3a':
  docs: studio revision update 1.0
 2014-12-08 19:45:34 +00:00
Rich Slogar
99253bff20 am 53202d01: am 1dfaa3a0: am 78264a4d: am 0039a73b: am b7ef7fcd: Merge "docs: skd tools revision 24.0.0" into lmp-docs 
* commit '53202d0129be87d0de7058ad206cec8ad392df14':
  docs: skd tools revision 24.0.0
 2014-12-08 19:45:29 +00:00
Alan Viverette
5a50a8bcab am e615da7e: am f1792c42: Merge "Fix hotspot coordinate propagation in ViewGroup and AbsListView" into lmp-mr1-dev 
* commit 'e615da7eb74907c7df993009ba8137e6ddd4ac62':
  Fix hotspot coordinate propagation in ViewGroup and AbsListView
 2014-12-08 19:45:20 +00:00
Winson Chung
b8c4a0f998 am 87024f73: am 16158852: Merge "Ensure that loading and unloading of tasks happen symmetrically with lifecycle events. (Bug 18574950)" into lmp-mr1-dev 
* commit '87024f7335439511aed0da8696811c3c4944b8c2':
  Ensure that loading and unloading of tasks happen symmetrically with lifecycle events. (Bug 18574950)
 2014-12-08 19:45:05 +00:00
smain@google.com
c37424dcfe am 54403cf8: am 97afbe1e: am 39519067: am a4924046: am d48168bd: add survey link 
* commit '54403cf8eb78a59b20542479d4cf542e8f63866c':
  add survey link
 2014-12-08 19:44:50 +00:00
Geoff Mendal
20ed21a5d5 am d7be88dc: (-s ours) am 878b49dc: (-s ours) am 31a23f3b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit 'd7be88dc712afbf266114d3658c34a11126f0b17':
  Import translations. DO NOT MERGE
 2014-12-08 19:44:33 +00:00
Jeff Sharkey
d5b5576dd6 am 5b41696c: am a8fb5803: Merge "Offer to "merge" subscribers for data usage." into lmp-mr1-dev 
* commit '5b41696c56c124124d48168227a83b63bd55aea7':
  Offer to "merge" subscribers for data usage.
 2014-12-08 19:44:27 +00:00
Alan Viverette
87dd3428f0 am 3891784f: am 3ad41537: Merge "Adjust edit text layout, ripple alphas to be closer to Material spec" into lmp-mr1-dev 
* commit '3891784f305edabe20f518bc43b3114e2bf38122':
  Adjust edit text layout, ripple alphas to be closer to Material spec
 2014-12-08 19:44:21 +00:00
Geoff Mendal
0d77548cda am 654d8805: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
* commit '654d8805b21f5551d70ea92cfefa16b5440da886':
  Import translations. DO NOT MERGE
 2014-12-08 19:44:14 +00:00
John Spurlock
ef10307e4a am 20a46fb1: am 2ea3650d: Merge "Zen: New behavior for built-in downtime + nextalarm conditions." into lmp-mr1-dev 
* commit '20a46fb14fa961638c0c155ea58e75ba5e33bb4e':
  Zen: New behavior for built-in downtime + nextalarm conditions.
 2014-12-08 19:43:38 +00:00
Geoff Mendal
fb4c06dafb am fb293b9f: (-s ours) am 9eb2092e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit 'fb293b9f9d7d7adb6936f526c4af9d20616c8f62':
  Import translations. DO NOT MERGE
 2014-12-08 19:43:32 +00:00
smain@google.com
4df464d053 am 8bd51aa5: am 983ba2ba: am 9a379e73: am 341c518f: am 43838855: fix migrate instruction step 
* commit '8bd51aa52d30fc38d9f397bf74f0201633f6ff89':
  fix migrate instruction step
 2014-12-08 19:43:24 +00:00
John Spurlock
967e19a402 am 2f47eaff: Merge "Volume: Only play the new vibrate hint once per volume-down." into lmp-mr1-dev 
* commit '2f47eaff9b4d8fdd3cba7580ebb91a87881fe25f':
  Volume: Only play the new vibrate hint once per volume-down.
 2014-12-08 19:43:20 +00:00
Jinsuk Kim
ec3f3244ae am 33697d85: am 78a73577: Merge "CEC: Update CEC device info properly" into lmp-mr1-dev 
* commit '33697d859ff701e6aec101351b3b3a0395a6637c':
  CEC: Update CEC device info properly
 2014-12-08 19:43:16 +00:00
Geoff Mendal
6e5522ca81 am a551f6c8: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
* commit 'a551f6c8606220ec116b48f7bc4b6147324441e9':
  Import translations. DO NOT MERGE
 2014-12-08 19:43:10 +00:00
Geoff Mendal
18446cb185 am b266393e: (-s ours) am b9f245d4: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit 'b266393ecde6ec273209cfde4c062d9e267eb935':
  Import translations. DO NOT MERGE
 2014-12-08 19:43:04 +00:00
Jason Monk
d3eee336d6 am 15a8a153: am 32eb928c: Merge "QS Wifi panel show icon on secure networks" into lmp-mr1-dev 
* commit '15a8a1531eb457a71fe2db6c6d2bde981d5d7944':
  QS Wifi panel show icon on secure networks
 2014-12-08 19:42:56 +00:00
Geoff Mendal
c34118a70d am 9c00c3d5: (-s ours) am 8510d014: (-s ours) Import translations. DO NOT MERGE 
* commit '9c00c3d57fcbaedfab096041fee4f4c2468b3ebf':
  Import translations. DO NOT MERGE
 2014-12-08 19:42:50 +00:00
Geoff Mendal
f10f2f47b5 am e734a86b: (-s ours) Import translations. DO NOT MERGE 
* commit 'e734a86b69ca6d5a3e902f0ece0cd4ac86f6310e':
  Import translations. DO NOT MERGE
 2014-12-08 19:42:42 +00:00
Zoltan Szatmary-Ban
32ed193bb5 am f5e44c29: am c5c93edd: Merge "When switching to default USB function set, check restriction" into lmp-mr1-dev 
* commit 'f5e44c29e85681fdcc6d09bfda503af99b4da543':
  When switching to default USB function set, check restriction
 2014-12-08 19:42:17 +00:00
Jinsuk Kim
4fffb74847 am 0cc53a5b: am 15556bbb: Merge "CEC: Disable debug logging" into lmp-mr1-dev 
* commit '0cc53a5baefdd6b051251ec4bfeb1680e7a1c75c':
  CEC: Disable debug logging
 2014-12-08 19:42:08 +00:00
smain@google.com
c137d08c1c am 937cb812: am 01a7eeba: am d9babcf0: am 5939bd03: am 35ee3018: revisions to Studio landing page 
* commit '937cb812b689c9b3ee5ce9868422406c970cc4f0':
  revisions to Studio landing page
 2014-12-08 19:41:58 +00:00
smain@google.com
132004f869 am 195a0da4: am 229f8a3c: am e0245cb5: am 1f5b2510: am 2cfdbf5f: Merge "fix migrate guide and other studio edits cherryick from Ic223d8fa3cd1e66ddd37b8f896fef12869be4268" into lmp-docs 
* commit '195a0da45777b8a2549f93f3494abc5d59d2467b':
  fix migrate guide and other studio edits cherryick from  Ic223d8fa3cd1e66ddd37b8f896fef12869be4268
 2014-12-08 19:41:52 +00:00
smain@google.com
dbb636fc53 am befef081: am 2b4bd09c: am d9c08bac: am 895ab42f: am 59a3dd7b: misc fixes for studio launch: update install instructions, update tools nav for AVD page, update AVD instructions in first app class, other edits to first app. 
* commit 'befef081a84f1d1911906811c9afd07b8c393c1f':
  misc fixes for studio launch: update install instructions, update tools nav for AVD page, update AVD instructions in first app class, other edits to first app.
 2014-12-08 19:41:42 +00:00
Joe Fernandez
66189de6f8 am d816a983: am c4bac980: am 44e7bcf4: am b6be2bff: am 40c4ccf4: Merge "doc: SDK install page fix and link fixes" into lmp-docs 
* commit 'd816a983927e382d2f6814053f339e4b59bdf871':
  doc: SDK install page fix and link fixes
 2014-12-08 19:41:36 +00:00
smain@google.com
6310c32386 am 42b65c6e: am 4ec024e9: am 71319f28: am 160e7607: am dee9e37e: Merge "add studio 1.0 files and reorder features list" into lmp-docs 
* commit '42b65c6e89203bfbbc3175b4f4ff1be938aeca47':
  add studio 1.0 files and reorder features list
 2014-12-08 19:41:30 +00:00
Joe Fernandez
dda0cb9fc5 am 5c09d4b8: am d7f9f30e: am dc842637: am ac3152ee: am 7b9ae53b: doc: fix for SDK installing page 
* commit '5c09d4b8d8121514c63bd0cf72035a03d9ae8776':
  doc: fix for SDK installing page
 2014-12-08 19:41:24 +00:00
smain@google.com
7e5fbc1dc0 am 8804b2a6: am 4e0575be: am c10acd71: am 9a041f18: am d3c9f2b9: update studio hero image and add section about code editor [CP] 
* commit '8804b2a6e08b46112dcf3a5993b1254bba63131d':
  update studio hero image and add section about code editor [CP]
 2014-12-08 19:40:58 +00:00
Rich Slogar
85f69e0b96 am 6a0e1906: am 8fa02c18: am 08ba05b9: am 6cc5e87d: am 4083327e: docs:build system updates [CP] 
* commit '6a0e190646a6c518a017007afbfb0d918d95df37':
  docs:build system updates [CP]
 2014-12-08 19:40:52 +00:00
smain@google.com
485901732e am 8e29e218: am acd40aa9: am 67fa34e9: am 2d0cf342: am d0c79c4e: fix migrate guide and other studio edits [CP] 
* commit '8e29e218a811237175f69b4260308fc653b77ff0':
  fix migrate guide and other studio edits [CP]
 2014-12-08 19:40:46 +00:00
smain@google.com
ae3a1d70e5 am 8dac5b5e: am fedf3943: am c493dd3f: am e9f63a0f: am 5797e272: docs:sdk installing file update [CP] 
* commit '8dac5b5e8710b9d2ff8acbee3e2de349a9518f44':
  docs:sdk installing file update [CP]
 2014-12-08 19:40:22 +00:00
smain@google.com
283a2046d2 am c5d38e73: am baa56314: am f0eee644: am 521d7277: am 29e13c5a: new Android Studio download page [CP] 
* commit 'c5d38e7345e4185231197c2976fe2218a0547eeb':
  new Android Studio download page [CP]
 2014-12-08 19:40:16 +00:00
Rich Slogar
b2b89de607 am d0a96b67: am cd13e657: am ca61ce33: am e1136835: am 5d9d7610: docs: publishing with studio [CP] 
* commit 'd0a96b6742e03213b8d8d28f13a069029514f6f9':
  docs: publishing with studio [CP]
 2014-12-08 19:40:09 +00:00
smain@google.com
2153969c19 am d1ffd1e3: am 139c7def: am 53513e9e: am 5962474c: am fc64b70a: docs: new Eclipse menu [CP] 
* commit 'd1ffd1e3de1590ff7330706b8c1221992f3634ec':
  docs: new Eclipse menu [CP]
 2014-12-08 19:40:03 +00:00
Rich Slogar
3d368a16d8 am 2e3daaa6: am 6bbb5ed1: am 43304cfc: am 9e6ad10b: am e3fe9382: docs: studio basics v2 [CP] 
* commit '2e3daaa6ea3ca883b3d7c79761517dce35319d53':
  docs: studio basics v2 [CP]
 2014-12-08 19:39:55 +00:00