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

139220 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam Powell
c78f2f7fea am 22e41e9a: Merge "Enable collapsing empty Toolbar-based ActionBars above tabs" into lmp-preview-dev 
* commit '22e41e9add1aeb0c8a79741f587c270752a50d16':
  Enable collapsing empty Toolbar-based ActionBars above tabs
 2014-06-12 19:57:42 +00:00
Chris Craik
5b368b3d9f am 98b10e48: Merge "Limit path approximation recursion depth" into lmp-preview-dev 
* commit '98b10e480279d331e54b9f28546629687244a01c':
  Limit path approximation recursion depth
 2014-06-12 19:57:36 +00:00
Chris Craik
a9b2639cba am b1f0d0b1: (-s ours) Merge "Workaround to avoid polygon flashing DO NOT MERGE" into lmp-preview-dev 
* commit 'b1f0d0b1853b54b6ce5f8f307a3f21845afc2fe2':
  Workaround to avoid polygon flashing DO NOT MERGE
 2014-06-12 19:57:31 +00:00
Robert Greenwalt
756c4b795e am f7c964fa: Merge "Fix Build" into lmp-preview-dev 
* commit 'f7c964fa06257d6db1b894bfbe905ca125c755c8':
  Fix Build
 2014-06-12 19:57:23 +00:00
Alan Viverette
5dcb543199 am 4ea9d069: Merge "Add Settings theme, fix DialogWhenLarge theme" into lmp-preview-dev 
* commit '4ea9d0698df166d30e38db4d16450530eb9c1f38':
  Add Settings theme, fix DialogWhenLarge theme
 2014-06-12 19:57:17 +00:00
Robert Greenwalt
54e312a51b am 9c6d406e: Fix build breakage. 
* commit '9c6d406eb7ab0fce40fb7cd1257714a29d06774c':
  Fix build breakage.
 2014-06-12 19:57:11 +00:00
Robert Greenwalt
1455a0a05a am 67b8af58: Merge "Missed an api update." into lmp-preview-dev 
* commit '67b8af5843f835d3d3124025d63c96b184cc87f5':
  Missed an api update.
 2014-06-12 19:57:05 +00:00
Robert Greenwalt
1ced737cf4 am c7d65d75: Merge "Fix wifi connectivity issues." into lmp-preview-dev 
* commit 'c7d65d759be6cd48a7bbaa4f061b4c4f85424b11':
  Fix wifi connectivity issues.
 2014-06-12 19:56:55 +00:00
Robert Greenwalt
86eb5906c0 am e1f5b5e0: Merge "Minor changes to the LinkAddress API docs." into lmp-preview-dev 
* commit 'e1f5b5e0cd5206e01e1c0e2bd282d421d9951960':
  Minor changes to the LinkAddress API docs.
 2014-06-12 19:56:45 +00:00
Robert Greenwalt
962b987085 am 4ad1f0d3: (-s ours) Merge "Add a new IpPrefix class and use it in RouteInfo." into lmp-preview-dev 
* commit '4ad1f0d31e4c998aa65344ccb8abb51cf96dd909':
  Add a new IpPrefix class and use it in RouteInfo.
 2014-06-12 19:56:39 +00:00
Scott Main
3a1d38b331 am 91b078c8: am 55c11af7: Merge "reorg the SDK setup docs to streamline setup for all variations. Move ADT plugin to the ADT help doc and combine the three setup guides into one page that is dynamic based on a URL parameter." into klp-modular-dev 
* commit '91b078c8dcce20d5b04f14f730e35cc0b25b4041':
  reorg the SDK setup docs to streamline setup for all variations. Move ADT plugin to the ADT help doc and combine the three setup guides into one page that is dynamic based on a URL parameter.
 2014-06-12 19:23:48 +00:00
Andrew Solovay
ad60891a6e Merge branch 'master' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base 2014-06-12 18:50:02 +00:00
Andrew Solovay
56dc9a56f8 am d51a5b38: am 25b8af9d: am 436f4e36: am ded9c171: Merge "docs: New "Verifying App Behavior on the Android Runtime (ART)" guide." into klp-docs 
* commit 'd51a5b389187ad7db3444a74dc75439ff739d7dc':
  docs: New "Verifying App Behavior on the Android Runtime (ART)" guide.
 2014-06-12 18:49:55 +00:00
Robert Greenwalt
7c9f5529ea am 558aeb90: Merge "Make NetworkCapabilities publicly immutable." into lmp-preview-dev 
* commit '558aeb901144fac460575402e38fc8baa2da83eb':
  Make NetworkCapabilities publicly immutable.
 2014-06-12 18:49:07 +00:00
RoboErik
b41ed6ca70 am 8c4b4dc8: Merge "b/15330955 Make RemoteController use the new session APIs" into lmp-preview-dev 
* commit '8c4b4dc87f68d13331d67f4a25480455a7fb2378':
  b/15330955 Make RemoteController use the new session APIs
 2014-06-12 18:49:02 +00:00
Adam Powell
6bb10554ba Allow action bar navigation icon resource id of 0 
Fix a bug preventing this from being treated properly.

Bug 15458868

Change-Id: Ib1a7def482755757e524dfddd1eb6a02522c5d6b
 2014-06-11 19:57:12 -07:00
Robert Greenwalt
130669992c Fix build breakage. 
Change-Id: Ideb32704ce5dc37ef36b05609f88da2aa55b3a00
 2014-06-11 18:06:55 -07:00
Adam Powell
263a2d658b Merge "Enable collapsing empty Toolbar-based ActionBars above tabs" into lmp-preview-dev 2014-06-11 23:10:23 +00:00
Adam Powell
360c1d8922 Enable collapsing empty Toolbar-based ActionBars above tabs 
Fixes a regression where Toolbar ActionBars would hold empty space
when previous platform versions would collapse to tabs-only.

Bug 15573337

Change-Id: I6da379d2ed58e8ba8cadcd727606c7fc160ecf91
 2014-06-11 19:31:41 -07:00
Chris Craik
0adb6d6e50 Merge "Limit path approximation recursion depth" into lmp-preview-dev 2014-06-11 23:10:23 +00:00
Chris Craik
9c3dd62d0f Limit path approximation recursion depth 
bug:15369119
Change-Id: I6f009f5e8790129e1aa8a51e1fc6cdd1415dd617
 2014-06-11 17:24:51 -07:00
Robert Greenwalt
55213c8022 Merge "Add a new IpPrefix class and use it in RouteInfo." into lmp-preview-dev 2014-06-11 23:10:23 +00:00
Sreeram Ramachandran
6307b35e1d Add a new IpPrefix class and use it in RouteInfo. 
This change uses IpPrefix only in the public API and continues
to use LinkAddress for everything else. It does not change the
callers to use the new APIs, with the exception of changing
all current uses of getDestination to getDestinationLinkAddress
to make room for the new getDestination method that returns an
IpPrefix.

Based on Sreeram's earlier change:
https://googleplex-android-review.git.corp.google.com/#/c/477874/
but a bit simplified and with a bit more documentation.

Bug: 15142362
Bug: 13885501
Change-Id: Ib4cd96b22cbff4ea31bb26a7853989f50da8de4e
(cherry picked from commit 7d3b4b9a3d4de9673119632da0ebd583e50126f7)
 2014-06-11 16:32:21 -07:00
RoboErik
c92856c4bb Merge "b/15330955 Make RemoteController use the new session APIs" into lmp-preview-dev 2014-06-11 23:10:23 +00:00
Robert Greenwalt
9c1b8af720 Merge "Make IpPrefix final." 2014-06-11 21:23:31 +00:00
Robert Greenwalt
0cbe94a349 Make IpPrefix final. 
Couldn't resolve a merge conflict, so skipped and make the change this way.

Change-Id: Ib043f660fca2090f0d12a5a707e5e1ad28f76adb
 2014-06-12 12:57:19 -07:00
Robert Greenwalt
9468ddee2d Merge "Missed an api update." into lmp-preview-dev 2014-06-11 21:23:31 +00:00
Robert Greenwalt
10e049b651 Missed an api update. 
Fix build.

Change-Id: I2563ec3c26e1c8dbb9abea9f87537a87ce5fda41
 2014-06-11 16:57:03 -07:00
Robert Greenwalt
f09d128517 Merge "Fix wifi connectivity issues." into lmp-preview-dev 2014-06-11 21:23:31 +00:00
Sreeram Ramachandran
fb7690d4e1 Fix wifi connectivity issues. 
http://ag/480881 changed RouteInfo.getDestination() to return an IpPrefix
instead of a LinkAddress. This makes the equals() comparison always fail.

So, when ConnectivityService.updateRoutes() is given identical routes, instead
of realizing that there's no diff, it would consider them different, and thus
add and remove the same route. The add would fail, since the route already
existed in netd, but the remove would succeed, leaving the system with no routes
and thus no connectivity.

Bug: 15564210
Change-Id: I2003b0fcb809cc20837dc489c58af37891ca4556
 2014-06-11 23:02:59 +00:00
Robert Greenwalt
6ba62e6416 Merge "Make NetworkCapabilities publicly immutable." into lmp-preview-dev 2014-06-11 21:23:31 +00:00
Robert Greenwalt
7569f1811f Make NetworkCapabilities publicly immutable. 
Applying API council comments.

bug: 15142362

(cherry picked from commit Ie0bde68b72656a676d90c0343b9756fe9268d8d6)
Change-Id: Ie0bde68b72656a676d90c0343b9756fe9268d8d6
 2014-06-11 23:29:39 +00:00
RoboErik
73e23e229d b/15330955 Make RemoteController use the new session APIs 
This moves RemoteController over to using Sessions instead of
the RCC/RCD framework. This also adds several hidden APIs to
help with translating between the two apis.

Change-Id: I0f50313db2b6190b16fa86ce670ac9250654ca05
 2014-06-11 10:58:52 -07:00
Selim Cinek
98751ac6d3 Merge "Introduced fading views for the camera interaction on the lockscreen." into lmp-preview-dev 2014-06-11 15:57:38 +00:00
Selim Cinek
1aed973665 Introduced fading views for the camera interaction on the lockscreen. 
Bug: 15126905
Change-Id: I82b0050a4216873d9cd191b32d1e5bf6871acbd6
 2014-06-12 03:33:14 +00:00
Santos Cordon
d5bb622553 Merge "Support conference calling. (1/4)" 2014-06-11 08:41:11 +00:00
Jinsuk Kim
0340bbc89f RoutingControlAction for HdmiControlService 
Routing control action is initiated in various cases, such as manual
TV input port switching, routing change of a different CEC switch,
and so on. The action determines the device to be a new active source.

Change-Id: I1efcd6ff1919dd94d6fa0e0ffa6e430c48d4e9c6
 2014-06-12 23:40:05 +00:00
Selim Cinek
056396edbf am 02faebd2: Merge "Fixed the calculation of the clipTopAmount which lead to holes." into lmp-preview-dev 
* commit '02faebd2bab4524e9ba0c9fcd288ad1a09f8feef':
  Fixed the calculation of the clipTopAmount which lead to holes.
 2014-06-12 23:37:49 +00:00
Santos Cordon
b693998fdf Support conference calling. (1/4) 
Bug: 15006702
Change-Id: I2764ea242f783ba478c9eae86618dd33e9fc792a
 2014-06-12 16:15:09 -07:00
Craig Mautner
a46ac5094e Merge "Do not display unsecure windows behind dialogs" 2014-06-12 17:09:07 +00:00
Dianne Hackborn
60a0cd3df9 am 8840d6b9: Merge "Remove landscape and tablet animations." into lmp-preview-dev 
* commit '8840d6b978cf3616a871e50bbbb055a51bbfc1a2':
  Remove landscape and tablet animations.
 2014-06-12 23:20:57 +00:00
Amith Yamasani
76f7e7ee20 am 54b3006b: Merge "Undo some API changes that affect third party launcher writers" into lmp-preview-dev 
* commit '54b3006b6340a2a311acb8f70d4602506e63b1ae':
  Undo some API changes that affect third party launcher writers
 2014-06-12 23:16:47 +00:00
Tim Murray
eb2b52ffaf am 604ea0e4: am b1c9430c: am 77d28ca2: Merge "Move FieldPacker over to use large objects on 64-bit." 
* commit '604ea0e415faa2466ab6c89372001d6c93ad0d98':
  Move FieldPacker over to use large objects on 64-bit.
 2014-06-12 23:13:28 +00:00
Jinsuk Kim
a6ce7708d6 DeviceSelectAction for HdmiControlService 
DeviceSelectAction is the main handler for the API deviceSelect() which is
used to choose a new active source among logical devices on the bus.

Change-Id: I77582a1f873423fc316d89f67a89a867461a76b2
 2014-06-12 23:06:29 +00:00
Adam Powell
85c262772d am d3b9bac6: Merge "Fix incorrect dispatch of empty WindowInsets from ActionBarOverlayLayout" into lmp-preview-dev 
* commit 'd3b9bac6a96a065cd4058429569e0ed6ec4df032':
  Fix incorrect dispatch of empty WindowInsets from ActionBarOverlayLayout
 2014-06-12 22:51:53 +00:00
Amith Yamasani
962c7b14ea am 8f7c6f07: Merge "Rename "Android for Work" to "Android Work"" into lmp-preview-dev 
* commit '8f7c6f079d008d76fb3876db29a78c642e74a7dd':
  Rename "Android for Work" to "Android Work"
 2014-06-12 22:51:40 +00:00
Matthew Williams
748a0ebf6b am 00768c4d: Merge "JobScheduler blocking main thread." into lmp-preview-dev 
* commit '00768c4dc67aed2f156184e9544b869cb80cdd50':
  JobScheduler blocking main thread.
 2014-06-12 22:51:32 +00:00
Chris Craik
bd2d97f2b7 am 9de2a8f4: Merge "Add AA flag to TessellationCache key" into lmp-preview-dev 
* commit '9de2a8f42d88e50146947a7bf21b212ea134ee83':
  Add AA flag to TessellationCache key
 2014-06-12 22:51:27 +00:00
John Spurlock
4cf5fc2e65 am c4288bbd: Merge "PowerUI: dismiss warning notifications when falling back." into lmp-preview-dev 
* commit 'c4288bbd56d6b89ffd9534bd78b17b491d131b3f':
  PowerUI: dismiss warning notifications when falling back.
 2014-06-12 22:31:27 +00:00
John Spurlock
6cf5f8026e am 85231047: Merge "PowerUI: Remove obsolete workaround." into lmp-preview-dev 
* commit '85231047078a79a0ed465ce15bd7e34740d8eb73':
  PowerUI: Remove obsolete workaround.
 2014-06-12 22:31:22 +00:00