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

139102 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris Wren
0fdab2fb43 Merge "Manage heads up state during notification update." into lmp-preview-dev 2014-06-11 15:57:38 +00:00
Chris Wren
d04f6cee5f Manage heads up state during notification update. 
Notifications can now get the heads up slot on updates.
FLAG_ONLY_ALERT_ONCE suppresses this behavior.

Bug: 15534198
Change-Id: Ie27b7c7d93c590d777670c538fb796a04252046f
 2014-06-11 23:53:30 -04:00
Jorim Jaggi
a1adf0db4f Merge "resolved conflicts for merge of 6edef668 to master" 2014-06-11 15:57:38 +00:00
Jorim Jaggi
b41e0e37ec resolved conflicts for merge of 6edef668 to master 
Change-Id: Ia0c79581e9221341718799d2969f56c95a76a3de
 2014-06-12 22:02:32 +02:00
Selim Cinek
5da5e7a481 am 3ee7fb10: Merge "Introduced fading views for the camera interaction on the lockscreen." into lmp-preview-dev 
* commit '3ee7fb1045024b566d852f12ef8f081206ba7bb5':
  Introduced fading views for the camera interaction on the lockscreen.
 2014-06-12 19:58:19 +00:00
Jorim Jaggi
37ab979581 am da787d08: Merge "Material navigation bar." into lmp-preview-dev 
* commit 'da787d08accbddc3ca4fd49d798d11fe3523b1bf':
  Material navigation bar.
 2014-06-12 19:58:13 +00:00
Jean Chalard
11abbdcb78 am 7d8b87f0: Merge "Fix a CTS test" into lmp-preview-dev 
* commit '7d8b87f0d9b35694099d5f57777d27f577496960':
  Fix a CTS test
 2014-06-12 19:58:08 +00:00
Yohei Yukawa
2a97b54f49 am f09cb58d: Merge "Rename CursorAnchorInfoBuilder with Builder" into lmp-preview-dev 
* commit 'f09cb58d5f528665e6e96d8740eeeeab4167e357':
  Rename CursorAnchorInfoBuilder with Builder
 2014-06-12 19:58:02 +00:00
John Spurlock
61d3fab690 am e2f6373c: Merge "Heads-up notifications for low battery warnings." into lmp-preview-dev 
* commit 'e2f6373c80e7d1a5a7c71412bff10a71c54cd451':
  Heads-up notifications for low battery warnings.
 2014-06-12 19:57:56 +00:00
Adam Powell
61c585756c am 13cfcacf: Allow action bar navigation icon resource id of 0 
* commit '13cfcacf2a39b742ed9b0fea25924fc828e8c107':
  Allow action bar navigation icon resource id of 0
 2014-06-12 19:57:50 +00:00
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
90132dd7ca am c72a2a82: Merge "Explicitly track consumed state for WindowInsets" into lmp-preview-dev 
* commit 'c72a2a82160099e8f20c42eb0d36881c31537130':
  Explicitly track consumed state for WindowInsets
 2014-06-12 18:37:33 +00:00
Christopher Tate
93e9e7208e am ba6e8ae5: Merge "Relax duplicate-permission-definition constraints slightly" into lmp-preview-dev 
* commit 'ba6e8ae5d2a364799fd6bc84179e33b6731e574b':
  Relax duplicate-permission-definition constraints slightly
 2014-06-12 18:37:28 +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
Craig Mautner
e33010a261 Merge "Add NO_ANIMATION flag to ActivityView Intents." into klp-modular-dev 2014-06-11 08:41:11 +00:00
Christopher Tate
f9fcfaae78 Merge "Relax duplicate-permission-definition constraints slightly" into lmp-preview-dev 2014-06-11 08:41:11 +00:00
Griff Hazen
579ace0358 am 9f637d10: Reduce notification service historical archive size to 1 for watches. To remove the memory footprint 
* commit '9f637d10959490c3a28e0f40330e97eb67e954d7':
  Reduce notification service historical archive size to 1 for watches. To remove the memory footprint
 2014-06-11 01:18:36 +00:00