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

140161 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Greenwalt
31c5586949 am 6ca5129d: (-s ours) am a77d0ef4: (-s ours) am 0b572896: (-s ours) Merge "DO NOT MERGE refactor wifi p2p\'s startDhcpServer function" 
* commit '6ca5129d801c00a87035d04a9a8c1a2f720ba377':
  DO NOT MERGE refactor wifi p2p's startDhcpServer function
 2014-06-23 22:40:33 +00:00
Marco Nelissen
d3afc9c1d8 am 909a1b2e: am c4d37f58: am 0eee8ac2: Merge "Fix thumbnail bug" 
* commit '909a1b2e73efdb592b5a8f2c2e786f4c6c4bad14':
  Fix thumbnail bug
 2014-06-23 22:40:28 +00:00
Robert Greenwalt
6ca5129d80 am a77d0ef4: (-s ours) am 0b572896: (-s ours) Merge "DO NOT MERGE refactor wifi p2p\'s startDhcpServer function" 
* commit 'a77d0ef49e8c4b53e1cd794c0739584914bd6eda':
  DO NOT MERGE refactor wifi p2p's startDhcpServer function
 2014-06-23 22:10:37 +00:00
Robert Greenwalt
a77d0ef49e am 0b572896: (-s ours) Merge "DO NOT MERGE refactor wifi p2p\'s startDhcpServer function" 
* commit '0b57289678a4dc82fefa4894901af1be7f5cc3c6':
  DO NOT MERGE refactor wifi p2p's startDhcpServer function
 2014-06-23 22:02:12 +00:00
Robert Greenwalt
0b57289678 Merge "DO NOT MERGE refactor wifi p2p's startDhcpServer function" 2014-06-23 21:56:07 +00:00
Marco Nelissen
909a1b2e73 am c4d37f58: am 0eee8ac2: Merge "Fix thumbnail bug" 
* commit 'c4d37f58a1b5405812eaf96b4bd3a051d86884eb':
  Fix thumbnail bug
 2014-06-23 21:51:38 +00:00
Marco Nelissen
c4d37f58a1 am 0eee8ac2: Merge "Fix thumbnail bug" 
* commit '0eee8ac275927264f766bb18023365e83d4bfe5a':
  Fix thumbnail bug
 2014-06-23 21:45:30 +00:00
John Reck
6b39324d77 Merge "No-fail invokeFunctor" 2014-06-23 21:44:43 +00:00
John Reck
3b20251a35 No-fail invokeFunctor 
Bug: 15513308
 Bug: 15449247

Change-Id: I13a29f9c8d4975cdda6dcb33b6332c2555ff0f7c
 2014-06-23 15:26:49 -07:00
Adam Powell
287c036187 Compatibility shim for apps calling View methods with TypedArray params 
Apps calling the View methods that accept TypedArray params have
always been wrong. There is no way to call these methods safely since
apps can't get at the correct filter array assumed in these methods'
implementations. Do the best we can with these calls anyway; ignore
whatever they did pass and just get the styled attributes from the
Context used to construct the view and its associated theme.

Bug 15792674

Change-Id: I6dfa1abf273b581e79a17a72f68c97ff9a9148c5
 2014-06-23 15:18:28 -07:00
Craig Mautner
43015f241e Merge "Return to recents when coming from recents" 2014-06-23 21:44:43 +00:00
Craig Mautner
84984faf53 Return to recents when coming from recents 
If a task is launched from recents then backing all the way
out of the task will return you to recents. Entering the task
in any other way (home, another activity, nav bar) will reset
this behavior.

Fixes bug 15703876.

Change-Id: I98dc36e4dbcb238d59e2175832076de7225bfdd9
 2014-06-23 15:04:23 -07:00
Craig Mautner
13f6ea78b0 Avoid unnecessary timeouts. 
And fix a couple of other inefficiencies.

Fixes bug 15444410.

Change-Id: Idad95d4e4d70bc7d2965e1bd6ff3d3135b73dd9c
 2014-06-23 15:01:27 -07:00
Jianzheng Zhou
78c8e7c8bf DO NOT MERGE refactor wifi p2p's startDhcpServer function 
Add getTetheredDhcpRanges() interface and call it before calling
mNwService.startTethering() to update dhcp ranges. This will allow p2p app
to run well concurrently with other tethering app(e.g. usb tethering).

Change-Id: I5e8ffeb5d2d396f48b897cd9396f133e25ecca57
Signed-off-by: Jianzheng Zhou <jianzheng.zhou@freescale.com>
 2014-06-23 21:02:45 +00:00
Calin Juravle
ac777c8219 am 3e836835: am a06f5fa6: Merge "Fix the initialization of some profile properties" 
* commit '3e8368350e4098a5a5bd88fc2cb623f58c012ba2':
  Fix the initialization of some profile properties
 2014-06-23 19:44:53 +00:00
Baligh Uddin
15aca0aa6d am 858b47ca: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit '858b47ca1eb9bc7d5efe183018a4053dd4d068ca':
  Import translations. DO NOT MERGE
 2014-06-23 17:27:53 +00:00
Baligh Uddin
96e98d4170 am 2d91bc23: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit '2d91bc23128fc1ab2a958a24c84f75d653886ef1':
  Import translations. DO NOT MERGE
 2014-06-23 17:27:49 +00:00
Calin Juravle
3e8368350e am a06f5fa6: Merge "Fix the initialization of some profile properties" 
* commit 'a06f5fa6563f7fc08b7bb2305f61bf649add0b5a':
  Fix the initialization of some profile properties
 2014-06-23 17:26:29 +00:00
Quddus Chong
d0027fd67f am 11b319c2: Merge "docs: Updated L Preview Highlights." into klp-modular-dev 
* commit '11b319c234ef32b6ebd4fb8f44f592c491281de9':
  docs: Updated L Preview Highlights.
 2014-06-23 16:45:02 +00:00
Brian Carlstrom
9e36a8cd3e am 1b98ccf2: am 0924ef65: Merge "Treat missing package usage data as a separate case" 
* commit '1b98ccf275d93197c1aa746d5c492a57cd62be7f':
  Treat missing package usage data as a separate case
 2014-06-23 15:47:45 +00:00
Brian Carlstrom
1b98ccf275 am 0924ef65: Merge "Treat missing package usage data as a separate case" 
* commit '0924ef6592c3172db6ae1f3d92f845951f901486':
  Treat missing package usage data as a separate case
 2014-06-23 15:43:40 +00:00
Craig Mautner
9587ee0203 am a2121e49: am 5957d6a8: Merge "Fix frontOfTask assignment." 
* commit 'a2121e497c2e82676b4bf5dc35b0015c38ddc5ab':
  Fix frontOfTask assignment.
 2014-06-23 15:00:10 +00:00
Craig Mautner
a2121e497c am 5957d6a8: Merge "Fix frontOfTask assignment." 
* commit '5957d6a889d9c9e46d260d915b9ffa66a763dd23':
  Fix frontOfTask assignment.
 2014-06-23 14:52:41 +00:00
Quddus Chong
11b319c234 Merge "docs: Updated L Preview Highlights." into klp-modular-dev 2014-06-23 14:51:00 +00:00
Marco Nelissen
0eee8ac275 Merge "Fix thumbnail bug" 2014-06-23 14:50:49 +00:00
Robert Ly
12426cff73 am 878325b3: Merge "docs: l-preview fixes" into klp-modular-dev 
* commit '878325b3677584e50536c128e661b4921f2aa154':
  docs: l-preview fixes
 2014-06-23 09:56:03 +00:00
Robert Ly
2061f0a2df am 0cff6256: docs: more auto updates 
* commit '0cff6256d829a79fa51c189eff765f42bb454907':
  docs: more auto updates
 2014-06-23 09:55:53 +00:00
Quddus Chong
aa9d7788e0 docs: Updated L Preview Highlights. 
Change-Id: I79e756d1ae93d009395fd3c6c222776705624f47
 2014-06-22 15:42:41 -07:00
Robert Ly
0cff6256d8 docs: more auto updates 
Change-Id: I50b936217ba5933cbc01d81f1bd1d4b78df4239f
 2014-06-22 14:37:38 -07:00
Robert Ly
1fd580b7c3 am 5d9681a3: docs: auto landing cleanup 
* commit '5d9681a3986050c8b59201aac5b4243b6b2d0cda':
  docs: auto landing cleanup
 2014-06-22 18:38:19 +00:00
Robert Ly
5d9681a398 docs: auto landing cleanup 
Change-Id: I9b9f706341047613fd536ba44b6e887922f13d54
 2014-06-22 11:33:33 -07:00
Robert Ly
d62cb5843a am e7e8c1b4: Merge "docs: Further work on the Android Auto dev site Added partner logos (car OEMs, aftermarket, apps) Added platform screenshots to the hero page" into klp-modular-dev 
* commit 'e7e8c1b4c02544852ddcb07e77e8104a7d7f9e10':
  docs: Further work on the Android Auto dev site  Added partner logos (car OEMs, aftermarket, apps)  Added platform screenshots to the hero page
 2014-06-21 22:07:04 +00:00
Robert Ly
ee80a268ac am d7208fda: Merge "docs: remove description text for index" into klp-modular-dev 
* commit 'd7208fdaebd6625d8e25fdd4eff3c2d2b5eea065':
  docs: remove description text for index
 2014-06-21 21:11:37 +00:00
Quddus Chong
aef3e9e6fd am 1aa273e0: Merge "docs: Updated Support page for L Developer Preview." into klp-modular-dev 
* commit '1aa273e0da3a4be9a6e48ba21593ed3b6d0c1014':
  docs: Updated Support page for L Developer Preview.
 2014-06-21 20:50:35 +00:00
Robert Ly
901866ccd0 am efa289e2: docs: add device icons for index page 
* commit 'efa289e2f01aa069505d830c57e3ef6e46288c9c':
  docs: add device icons for index page
 2014-06-21 20:46:43 +00:00
Robert Ly
efa289e2f0 docs: add device icons for index page 
Change-Id: I255cff3d4771c5bebc48f3d6a03a4ebacb248a89
 2014-06-21 13:40:48 -07:00
Robert Ly
54a7b9325b am 50f08149: Merge "docs: add whitelisting instructions and new index icons" into klp-modular-dev 
* commit '50f08149ec7d5ede16f44a855ccf4db450336e93':
  docs: add whitelisting instructions and new index icons
 2014-06-21 20:16:37 +00:00
Dirk Dougherty
da6b32226a am ceaa57c9: am 39b707c8: am bf66c17e: Merge "remove extraneous tag causing extra spacing between heading/text." into klp-docs 
* commit 'ceaa57c927ad61ed8a8a1fc8c1b5c28d5472a50a':
  remove extraneous tag causing extra spacing between heading/text.
 2014-06-21 20:16:25 +00:00
smain@google.com
92cb2a7522 am e77f41a6: prettier sdk buttons 
* commit 'e77f41a6e388258d24a29228b8f41d01bd9ae81f':
  prettier sdk buttons
 2014-06-21 20:16:16 +00:00
smain@google.com
9ea1436255 am 941f800a: update Edu pages for launch of Chrome edu apps on play store removes the FAQ and Guidelines docs, redirect to devsite copy will be implemented with separate CL 
* commit '941f800a848a5dad4d4541a214477e95f738a5c8':
  update Edu pages for launch of Chrome edu apps on play store removes the FAQ and Guidelines docs, redirect to devsite copy will be implemented with separate CL
 2014-06-21 20:16:07 +00:00
smain@google.com
3a4924d417 am 371d68cc: add link back to main dev site home 
* commit '371d68ccb03e4c3827f8b548ebb128cddd8c4bd3':
  add link back to main dev site home
 2014-06-21 20:15:59 +00:00
Michael Kolb
c6ffc840c4 am 270c099f: Merge "Move emulator check & save system properties access" into klp-modular-dev 
* commit '270c099faf63868dcc21836a84de778337ff3be9':
  Move emulator check & save system properties access
 2014-06-21 20:15:47 +00:00
Craig Mautner
aaadf92210 am 90c9fffc: Merge "Do not delete stack if empty task is being reused." into klp-modular-dev 
* commit '90c9fffc956589f06d4a0c45a893c5db6a85fabc':
  Do not delete stack if empty task is being reused.
 2014-06-21 20:15:36 +00:00
Michael Kolb
71f65485bf am db9fed74: Merge "Make WindowInsets.isRound work with emulator" into klp-modular-dev 
* commit 'db9fed74c2bbf97157683b47f3cbdcd04c729839':
  Make WindowInsets.isRound work with emulator
 2014-06-21 20:15:24 +00:00
Joe Fernandez
82d013d45a am 8b19cdf7: am 845835c7: am 2d7b3ded: Merge "ExoPlayer developer guide" into klp-docs 
* commit '8b19cdf7535b193c2633bc311038521f749ebc70':
  ExoPlayer developer guide
 2014-06-21 20:15:12 +00:00
Robert Ly
5c26b33e4a am d8b94456: fix build 
* commit 'd8b94456c49578fa152fe5bd6a07a131056e3288':
  fix build
 2014-06-21 20:15:07 +00:00
Robert Ly
9e51442ca5 am 8c573178: Merge "docs: fix l preview bugs" into klp-modular-dev 
* commit '8c573178dfa68fc57594124128c9fd8e2abe8f01':
  docs: fix l preview bugs
 2014-06-21 20:14:59 +00:00
Robert Ly
31dde38567 am 448f823e: Merge "docs: fix margins and add partners back" into klp-modular-dev 
* commit '448f823e2048e2e5843557fe255b751c5a1b2961':
  docs: fix margins and add partners back
 2014-06-21 20:14:55 +00:00
Robert Ly
e7e8c1b4c0 Merge "docs: Further work on the Android Auto dev site Added partner logos (car OEMs, aftermarket, apps) Added platform screenshots to the hero page" into klp-modular-dev 2014-06-21 03:15:09 +00:00
Ricardo Cervera
6d61530f13 docs: Further work on the Android Auto dev site 
Added partner logos (car OEMs, aftermarket, apps)
 Added platform screenshots to the hero page

Change-Id: I41669dd4ec29569f300b64ed9689c0a8dd78fda4
 2014-06-21 14:12:41 -07:00