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

164017 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Filip Gruszczynski
2c90a0282b am 2e052429: am b977ade1: am 625ec484: Check if context is actually an activity. 
* commit '2e052429d04c11b69b3b3ac85a6344bd3687a0dc':
  Check if context is actually an activity.
 2014-10-23 22:02:48 +00:00
Ricardo Cervera
8ead5df0c3 am 9c36848d: am 713869b2: am ce3d72e4: am 8755d9a5: Merge "docs: Updating dependency vers nums for support libs." into lmp-dev 
* commit '9c36848da68cfe6c70b799c6b1db1266a86577f4':
  docs: Updating dependency vers nums for support libs.
 2014-10-23 22:02:43 +00:00
Ricardo Cervera
b2a6784aa7 am 96e4f75c: am 0dc82921: am 92ddea18: am 30d0b242: Merge "docs: Support lib dependency fix. Bug: 18029377" into lmp-dev 
* commit '96e4f75c160bf61de7d7c44b60838c252bbf9530':
  docs: Support lib dependency fix. Bug: 18029377
 2014-10-23 22:02:37 +00:00
Sreeram Ramachandran
4573944e96 am b9248a55: am b1df48e4: Merge "Add an API to select a network for a DatagramSocket." into lmp-mr1-dev 
* commit 'b9248a5552dde8bf76db77054ed31a59300fe0cd':
  Add an API to select a network for a DatagramSocket.
 2014-10-23 22:02:25 +00:00
Adam Lesinski
08d1c80847 Merge commit 'cd8442d4' into manualmerge 
Conflicts:
	tools/aapt/ResourceIdCache.cpp

Change-Id: I5341d47ed0fe891d6fefb174f644e636ce966eb8
 2014-10-23 14:55:57 -07:00
John Reck
41707d01e9 am ebcfd24b: am 68335df6: Merge "Fix damage bug" into lmp-mr1-dev 
* commit 'ebcfd24b8f1fc8e000a08c0bbce3a4215083ae8a':
  Fix damage bug
 2014-10-23 20:41:07 +00:00
Filip Gruszczynski
2e052429d0 am b977ade1: am 625ec484: Check if context is actually an activity. 
* commit 'b977ade1e40393f661722d8eec636d10c7541588':
  Check if context is actually an activity.
 2014-10-23 20:35:32 +00:00
Ricardo Cervera
9c36848da6 am 713869b2: am ce3d72e4: am 8755d9a5: Merge "docs: Updating dependency vers nums for support libs." into lmp-dev 
* commit '713869b2f87060f7264c2dda6031e4c5b1d2da1d':
  docs: Updating dependency vers nums for support libs.
 2014-10-23 20:35:27 +00:00
Ricardo Cervera
96e4f75c16 am 0dc82921: am 92ddea18: am 30d0b242: Merge "docs: Support lib dependency fix. Bug: 18029377" into lmp-dev 
* commit '0dc82921889787d147de3970fa667b65e8407366':
  docs: Support lib dependency fix. Bug: 18029377
 2014-10-23 20:35:23 +00:00
Filip Gruszczynski
b977ade1e4 am 625ec484: Check if context is actually an activity. 
* commit '625ec4849118f061a99558ad558b16020435a88d':
  Check if context is actually an activity.
 2014-10-23 19:49:21 +00:00
Ricardo Cervera
713869b2f8 am ce3d72e4: am 8755d9a5: Merge "docs: Updating dependency vers nums for support libs." into lmp-dev 
* commit 'ce3d72e4ad78c16fd95f1fcba51cc241163cdb0d':
  docs: Updating dependency vers nums for support libs.
 2014-10-23 19:49:17 +00:00
Ricardo Cervera
0dc8292188 am 92ddea18: am 30d0b242: Merge "docs: Support lib dependency fix. Bug: 18029377" into lmp-dev 
* commit '92ddea18948a2524bc2e638a1c03c8b443e74316':
  docs: Support lib dependency fix. Bug: 18029377
 2014-10-23 19:49:10 +00:00
Sreeram Ramachandran
b9248a5552 am b1df48e4: Merge "Add an API to select a network for a DatagramSocket." into lmp-mr1-dev 
* commit 'b1df48e469cae5b0f3888c4d0410b78153503069':
  Add an API to select a network for a DatagramSocket.
 2014-10-23 19:47:27 +00:00
Adam Lesinski
cd8442d4e8 am 2bf92530: Merge "First commit of split-select tool" into lmp-mr1-dev 
* commit '2bf92530ee600088fac4e72d04a1f70debf28d2b':
  First commit of split-select tool
 2014-10-23 19:47:22 +00:00
John Reck
ebcfd24b8f am 68335df6: Merge "Fix damage bug" into lmp-mr1-dev 
* commit '68335df6e6134c919f8575aa52e11872642848ad':
  Fix damage bug
 2014-10-23 19:47:18 +00:00
Sreeram Ramachandran
b1df48e469 Merge "Add an API to select a network for a DatagramSocket." into lmp-mr1-dev 2014-10-23 19:10:24 +00:00
Filip Gruszczynski
625ec48491 Check if context is actually an activity. 
Bug: 18101409
Change-Id: Iab21338ef4ccaab0ce66d664502e0b5e88ad9c50
 2014-10-23 10:56:24 -07:00
Adam Lesinski
2bf92530ee Merge "First commit of split-select tool" into lmp-mr1-dev 2014-10-23 17:54:47 +00:00
Adam Lesinski
40e8eefbed First commit of split-select tool 
This tool emits a set of rules as JSON for when a Split APK
should match a target device.

Change-Id: I8bfbdfbdb51efcfc645889dd03e1961f16e39645
 2014-10-23 10:39:31 -07:00
John Reck
68335df6e6 Merge "Fix damage bug" into lmp-mr1-dev 2014-10-23 16:45:27 +00:00
Joe Fernandez
74edbeab49 am 8fff0a24: am f6e29739: am 3bd3a9c1: am 7c2bfa2e: Merge "docs: Add Wear App Quality checklist" into lmp-dev 
* commit '8fff0a24bcf94aec450755572f7a19891da12242':
  docs: Add Wear App Quality checklist
 2014-10-23 16:00:09 +00:00
Trevor Johns
866e309b10 am 682d3edd: am 3ee2aa0f: am 5111993f: am fdb02fcf: Merge "Docs: Update /samples/new/index.html for Clockwork Beryl release" into lmp-dev 
* commit '682d3eddaf1bdd8497bb388f1f233f2fc18d2519':
  Docs: Update /samples/new/index.html for Clockwork Beryl release
 2014-10-23 15:59:59 +00:00
Joe Fernandez
f0086412ae am 44723da8: am e562ce35: am e30fdb59: am 16350261: Merge "docs: Add article describing Location API for Android Wear." into lmp-dev 
* commit '44723da8d4c81d9f3336a089fa5f9be94851a5f1':
  docs: Add article describing Location API for Android Wear.
 2014-10-23 15:59:54 +00:00
Joe Fernandez
d969f022b6 am 9d98894a: am 3f16106c: am ac0e00db: am eaee4693: Merge "docs:Build tools revisions 21.01 and 21.02" into lmp-dev 
* commit '9d98894a8d7f8b235fe9026956ee5b04bab0aa61':
  docs:Build tools revisions 21.01 and 21.02
 2014-10-23 15:59:48 +00:00
Eric Rowe
b85d5ac85a am 868878bd: am 46ca296c: am d2983ced: am 34766d9c: Merge "Add delay in ping connectivity test retry" into lmp-dev 
* commit '868878bd91583590badd9aae882247358bfd695f':
  Add delay in ping connectivity test retry
 2014-10-23 15:59:42 +00:00
smain@google.com
dcada6320e am 5c889e36: am 0c57361f: am 3e2502cb: am 32c820fa: update android workplace screenshot bug: 18038081 
* commit '5c889e369cff83c26b4114548bdac3f9d05a44dd':
  update android workplace screenshot bug: 18038081
 2014-10-23 15:59:37 +00:00
Ye Wen
3f6b575017 am 127597e9: am e6ac3c71: am 4e0ba198: am 9d28487e: Merge "Disable Content-Disposition header for 53005 and 310120" into lmp-dev 
* commit '127597e92fc2c1ef7814ebf4a2008f152eb5ab74':
  Disable Content-Disposition header for 53005 and 310120
 2014-10-23 15:59:32 +00:00
smain@google.com
c646c1d963 am ed65508a: am b3cd9e86: am b7db4ed0: am 9f987e0a: fix a few of the tags for helpouts compatibility 
* commit 'ed65508a94484c0b3ea750e18a9a6970daa9acb1':
  fix a few of the tags for helpouts compatibility
 2014-10-23 15:59:26 +00:00
smain@google.com
80dfb2588f am e958e6c0: am 78e99264: am 20e6a369: am 54504966: Merge "some fixes to TV App quality and TV games doc. add section to TV Games doc about controller instructions w/ template download. clarify use of <meta-data> tag and standardize headings per Training conventions." 
* commit 'e958e6c01bf66ed5944dabbb12a75a9c2767d63c':
  some fixes to TV App quality and TV games doc. add section to TV Games doc about controller instructions w/ template download. clarify use of <meta-data> tag and standardize headings per Training conventions.
 2014-10-23 15:59:21 +00:00
Nancy Chen
79b82817b3 am 9d3f616b: am 2ff95729: am df0ace26: Merge "Add an option to set the selected phone account as the default. (1/3)" into lmp-sprout-dev 
* commit '9d3f616b0a7b6de8bc5dcebfea59e7a8285b035d':
  Add an option to set the selected phone account as the default. (1/3)
 2014-10-23 15:59:15 +00:00
smain@google.com
580186ae9e am 5ba3d0dc: am 6837b6af: am c5c029e9: am 13eb86a1: Merge "add helpouts widget to first round of pages" into lmp-dev 
* commit '5ba3d0dc3cdce781620ffe3b441242daecddf7ae':
  add helpouts widget to first round of pages
 2014-10-23 15:59:10 +00:00
Jae Seo
39f2182732 am 7d2dcd6b: am 6c9b0847: Merge "Update documentation for notifyTracksChanged() and notifyTrackSelected()" into lmp-mr1-dev 
* commit '7d2dcd6b677f99da90d1cdb65fcfedcb03e54801':
  Update documentation for notifyTracksChanged() and notifyTrackSelected()
 2014-10-23 15:58:49 +00:00
Svet Ganov
ae23078b23 am 012b4eae: am d8bc6677: Merge "Optimize text rendering in accessibility mode." into lmp-mr1-dev 
* commit '012b4eae10216648b2cff082e2c7809a1b0489a7':
  Optimize text rendering in accessibility mode.
 2014-10-23 15:58:43 +00:00
Alan Viverette
d439b034cb am 171c98bd: am e8f676c0: Merge "Use correct smooth scroll default duration" into lmp-mr1-dev 
* commit '171c98bd71c97a7f37c5274a2e37c359837cf9e3':
  Use correct smooth scroll default duration
 2014-10-23 15:58:38 +00:00
Alan Viverette
beb45a194d am eb09aaa5: am e1201e87: Merge "Lighten action bar on light theme, use secondary color for subtitle" into lmp-mr1-dev 
* commit 'eb09aaa5acd4bfaa4e71c60f23a934294b8130cd':
  Lighten action bar on light theme, use secondary color for subtitle
 2014-10-23 15:58:33 +00:00
Craig Mautner
e9d65deb3d am 2abc8aa0: am 105e8f3e: Merge "Fix dumpsys display apptoken ordering." into lmp-mr1-dev 
* commit '2abc8aa032c5e4d7caaac196c1ecb5bb57d459bd':
  Fix dumpsys display apptoken ordering.
 2014-10-23 15:58:27 +00:00
Rich Slogar
883c7ee745 am 145016f3: am 9ba1d92c: am 1e44dc18: am cb79d086: docs:Update 4.4W for Wear GPS suppport 
* commit '145016f375efe8fe1e4744adb164df93696ae487':
  docs:Update 4.4W for Wear GPS suppport
 2014-10-23 15:58:22 +00:00
Craig Mautner
d39c01c93c resolved conflicts for merge of 933d807c to lmp-mr1-dev-plus-aosp 
Change-Id: I183baf510e084e07244a8583c0bd162cd9715b50
 2014-10-23 08:48:36 -07:00
Ricardo Cervera
ce3d72e4ad am 8755d9a5: Merge "docs: Updating dependency vers nums for support libs." into lmp-dev 
* commit '8755d9a5361d716433505e883986e8bf5f28d041':
  docs: Updating dependency vers nums for support libs.
 2014-10-23 15:43:48 +00:00
Ricardo Cervera
92ddea1894 am 30d0b242: Merge "docs: Support lib dependency fix. Bug: 18029377" into lmp-dev 
* commit '30d0b24280abe4b2c5e1e20819d87f60d34964de':
  docs: Support lib dependency fix. Bug: 18029377
 2014-10-23 15:43:44 +00:00
Sreeram Ramachandran
e15db7c23d Add an API to select a network for a DatagramSocket. 
Mirrors the API that does this for Sockets.

Bug: 18076907
Change-Id: Ifa27b39e23797558546aab751fbfb3aed3b7dbcb
 2014-10-23 08:37:33 -07:00
Ricardo Cervera
8755d9a536 Merge "docs: Updating dependency vers nums for support libs." into lmp-dev 2014-10-23 15:10:09 +00:00
Ricardo Cervera
30d0b24280 Merge "docs: Support lib dependency fix. Bug: 18029377" into lmp-dev 2014-10-23 15:09:42 +00:00
Joe Fernandez
8fff0a24bc am f6e29739: am 3bd3a9c1: am 7c2bfa2e: Merge "docs: Add Wear App Quality checklist" into lmp-dev 
* commit 'f6e297398ba23ce7d26cf2e0efaf0d8a2230fe1c':
  docs: Add Wear App Quality checklist
 2014-10-23 09:20:05 +00:00
Trevor Johns
682d3eddaf am 3ee2aa0f: am 5111993f: am fdb02fcf: Merge "Docs: Update /samples/new/index.html for Clockwork Beryl release" into lmp-dev 
* commit '3ee2aa0fa309a0f8638bd6d13180f42ac91463b0':
  Docs: Update /samples/new/index.html for Clockwork Beryl release
 2014-10-23 09:20:00 +00:00
Joe Fernandez
44723da8d4 am e562ce35: am e30fdb59: am 16350261: Merge "docs: Add article describing Location API for Android Wear." into lmp-dev 
* commit 'e562ce35c957ed6717f4f26347485fbb696487c5':
  docs: Add article describing Location API for Android Wear.
 2014-10-23 09:19:56 +00:00
Joe Fernandez
9d98894a8d am 3f16106c: am ac0e00db: am eaee4693: Merge "docs:Build tools revisions 21.01 and 21.02" into lmp-dev 
* commit '3f16106c519ca8e630cd05f0d245023403de1773':
  docs:Build tools revisions 21.01 and 21.02
 2014-10-23 09:19:51 +00:00
Eric Rowe
868878bd91 am 46ca296c: am d2983ced: am 34766d9c: Merge "Add delay in ping connectivity test retry" into lmp-dev 
* commit '46ca296c533bb6dd5939a2e6ad72f8c7dd8a0c82':
  Add delay in ping connectivity test retry
 2014-10-23 09:19:46 +00:00
smain@google.com
5c889e369c am 0c57361f: am 3e2502cb: am 32c820fa: update android workplace screenshot bug: 18038081 
* commit '0c57361f3e1a35816ca829b63b2683faaaf021a1':
  update android workplace screenshot bug: 18038081
 2014-10-23 09:19:42 +00:00
Ye Wen
127597e92f am e6ac3c71: am 4e0ba198: am 9d28487e: Merge "Disable Content-Disposition header for 53005 and 310120" into lmp-dev 
* commit 'e6ac3c71193545a490a526a1c935d06f800653eb':
  Disable Content-Disposition header for 53005 and 310120
 2014-10-23 09:19:38 +00:00