Sean Wan
b792f43301
Merge "DO NOT MERGE: Make wifi scan interval when disconnected configurable." into lmp-mr1-modular-dev
2015-04-17 23:45:37 +00:00
Sean Wan
79858a3260
DO NOT MERGE: Make wifi scan interval when disconnected configurable.
...
Bug: 19335429
Change-Id: I167af190f0e448915f50d8edf853cf8a33646d44
2015-04-17 16:08:59 -07:00
Rich Slogar
c1002dfc52
am 71a616e0: am 203a4739: am 1fcc6bd8: Merge "docs: studio remove gradle tasks dialog" into lmp-docs
...
* commit '71a616e05065e39a5a13b483b031a2040dc52eda':
docs: studio remove gradle tasks dialog
2015-04-17 17:27:13 +00:00
Rich Slogar
1252b4b869
am 61dd1dfd: am 684f3aa2: am efe861a4: Merge "docs: hierarchyviewer updates" into lmp-docs
...
* commit '61dd1dfda1e3f9d2c58a5d1719818b66134cadb9':
docs: hierarchyviewer updates
2015-04-17 17:27:07 +00:00
Rich Slogar
71a616e050
am 203a4739: am 1fcc6bd8: Merge "docs: studio remove gradle tasks dialog" into lmp-docs
...
* commit '203a47395dfc17ba9e9b6b46c65bfbde002312f6':
docs: studio remove gradle tasks dialog
2015-04-17 17:14:48 +00:00
Rich Slogar
61dd1dfda1
am 684f3aa2: am efe861a4: Merge "docs: hierarchyviewer updates" into lmp-docs
...
* commit '684f3aa264e678affc1b33b27602493c96ee7eac':
docs: hierarchyviewer updates
2015-04-17 17:14:43 +00:00
Rich Slogar
203a47395d
am 1fcc6bd8: Merge "docs: studio remove gradle tasks dialog" into lmp-docs
...
* commit '1fcc6bd854f6e152cf8796a4a70965e350c3bdcf':
docs: studio remove gradle tasks dialog
2015-04-17 17:03:04 +00:00
Rich Slogar
684f3aa264
am efe861a4: Merge "docs: hierarchyviewer updates" into lmp-docs
...
* commit 'efe861a4a7081da795fe6a0843308ca7cef26277':
docs: hierarchyviewer updates
2015-04-17 17:02:59 +00:00
Rich Slogar
1fcc6bd854
Merge "docs: studio remove gradle tasks dialog" into lmp-docs
2015-04-17 16:53:34 +00:00
Rich Slogar
efe861a4a7
Merge "docs: hierarchyviewer updates" into lmp-docs
2015-04-17 16:52:45 +00:00
Filip Gruszczynski
4544b927d7
Hold a wake lock while dozing when wallpaper draws.
...
This mimics what ViewRootImpl does before drawing.
Bug: 20242788
Change-Id: If85ad17113636f74267aedb3af04d0281b57ac0e
2015-04-16 15:00:58 -07:00
Deepanshu Gupta
1f3c7f3f50
am f18ceefc: am cd6e00c6: Merge changes from topic \'layoutlib-api-15\' into lmp-mr1-dev
...
* commit 'f18ceefcf0d3cc91e74737e0a93f16775e3bf18b':
Update golden image for tests.
Update to using LayoutlibCallback.
Remove implementation of deprecated method.
Add @empty support.
2015-04-16 17:31:34 +00:00
Deepanshu Gupta
f18ceefcf0
am cd6e00c6: Merge changes from topic \'layoutlib-api-15\' into lmp-mr1-dev
...
* commit 'cd6e00c6d973af350f4bb0de5d85fed7e299d9e8':
Update golden image for tests.
Update to using LayoutlibCallback.
Remove implementation of deprecated method.
Add @empty support.
2015-04-16 17:19:42 +00:00
Deepanshu Gupta
cd6e00c6d9
Merge changes from topic 'layoutlib-api-15' into lmp-mr1-dev
...
* changes:
Update golden image for tests.
Update to using LayoutlibCallback.
Remove implementation of deprecated method.
Add @empty support.
2015-04-16 17:12:45 +00:00
Deepanshu Gupta
54862febaf
Update golden image for tests.
...
Change-Id: If07edcbfb7016a6b80f4bd00cffab494f74bfc03
2015-04-15 18:20:57 -07:00
Deepanshu Gupta
37dbb8b7f3
Update to using LayoutlibCallback.
...
Change-Id: Ia89d418b0d40ca8efef8968a4a2a635616b945ac
2015-04-15 18:20:56 -07:00
Deepanshu Gupta
49ce36e175
Remove implementation of deprecated method.
...
BridgeResources.getDrawable(int) is not needed anymore, since the super
method is deprecated and it calls the alternative
getDrawable(int, Theme), which we override.
Change-Id: I00c0bfaef6c4167a787bb74990b91cebb951c847
2015-04-15 18:20:55 -07:00
Deepanshu Gupta
9ca9774726
Add @empty support.
...
Bug: http://b.android.com/162428
Change-Id: Id7a981de2fce21213e12cdabcce4104f146fd4d3
2015-04-15 18:20:47 -07:00
Rich Slogar
f9f81b49d0
docs: hierarchyviewer updates
...
b/19955159
Change-Id: I77da54048765eeb768ec59a0ce0cbe40d0ba9715
2015-04-15 15:48:35 -07:00
Rich Slogar
caa15d49f9
docs: studio remove gradle tasks dialog
...
Change-Id: If7517f49307a1e27b1d4053bd49ccdb07ffb758e
2015-04-15 10:30:18 -07:00
Joe Fernandez
726466c225
am 11002022: am 5b6e91a6: am af5f2000: Merge "docs: Add Cross-References to Material Design Spec" into lmp-docs
...
* commit '110020229e0a31b060a329dfe55181f98a31e802':
docs: Add Cross-References to Material Design Spec
2015-04-15 00:45:20 +00:00
Joe Fernandez
110020229e
am 5b6e91a6: am af5f2000: Merge "docs: Add Cross-References to Material Design Spec" into lmp-docs
...
* commit '5b6e91a6717c4d6aa34adbbb2f2b5d6625c0802d':
docs: Add Cross-References to Material Design Spec
2015-04-14 20:14:32 +00:00
Joe Fernandez
5b6e91a671
am af5f2000: Merge "docs: Add Cross-References to Material Design Spec" into lmp-docs
...
* commit 'af5f200038d377033a5c22e6f93bc49a9e67444d':
docs: Add Cross-References to Material Design Spec
2015-04-14 20:04:56 +00:00
Joe Fernandez
af5f200038
Merge "docs: Add Cross-References to Material Design Spec" into lmp-docs
2015-04-14 19:55:36 +00:00
Joe Fernandez
49ca2de88a
docs: Add Cross-References to Material Design Spec
...
Change-Id: I6945f2234beb21b368a64ecad7a1680447310d5c
2015-04-14 12:53:12 -07:00
Dirk Dougherty
cda895c53d
am c578bff7: am a80fc040: am 00f857c5: Merge "Doc change: add new pages for Designed for Families." into lmp-docs
...
* commit 'c578bff74acdaf103c05794f39acf9ea49e4621d':
Doc change: add new pages for Designed for Families.
2015-04-14 04:43:06 +00:00
Dirk Dougherty
c578bff74a
am a80fc040: am 00f857c5: Merge "Doc change: add new pages for Designed for Families." into lmp-docs
...
* commit 'a80fc040ea814af2a1d3f2cbfa5efb8eaa898697':
Doc change: add new pages for Designed for Families.
2015-04-14 04:33:27 +00:00
Dirk Dougherty
a80fc040ea
am 00f857c5: Merge "Doc change: add new pages for Designed for Families." into lmp-docs
...
* commit '00f857c5a132555774bd286c254dade281473427':
Doc change: add new pages for Designed for Families.
2015-04-14 04:22:27 +00:00
Dirk Dougherty
00f857c5a1
Merge "Doc change: add new pages for Designed for Families." into lmp-docs
2015-04-14 04:12:57 +00:00
Dirk Dougherty
f802cc02a2
Doc change: add new pages for Designed for Families.
...
Change-Id: I9bda34abf7b045213c0fcb7f044ee86155900808
2015-04-13 20:23:18 -07:00
Mathieu Chartier
2f0dc15519
am 2c871d2c: am 17781b68: am 473989c3: Merge "Update "Investigating your RAM usage" for ART" into lmp-docs
...
* commit '2c871d2cce8e926c5300fdee33526eeb5e81810c':
Update "Investigating your RAM usage" for ART
2015-04-13 21:10:29 +00:00
smain@google.com
2b92e18b4b
am 76c9e47e: am 4301dd04: am d60649c5: Merge "initial batch of NDK files for skeleton site build" into lmp-docs
...
* commit '76c9e47e9fb7e81a6bbebeee83a77efb55799b23':
initial batch of NDK files for skeleton site build
2015-04-13 21:10:15 +00:00
Mathieu Chartier
2c871d2cce
am 17781b68: am 473989c3: Merge "Update "Investigating your RAM usage" for ART" into lmp-docs
...
* commit '17781b68df70a9c0bc446d91739be651d4c9a9e3':
Update "Investigating your RAM usage" for ART
2015-04-13 20:57:26 +00:00
smain@google.com
76c9e47e9f
am 4301dd04: am d60649c5: Merge "initial batch of NDK files for skeleton site build" into lmp-docs
...
* commit '4301dd0458a0789f6cc841d9e8b18e645e73c05d':
initial batch of NDK files for skeleton site build
2015-04-13 20:57:22 +00:00
Mathieu Chartier
17781b68df
am 473989c3: Merge "Update "Investigating your RAM usage" for ART" into lmp-docs
...
* commit '473989c35d9f0a42c6e7d3a56004dc76676b65b5':
Update "Investigating your RAM usage" for ART
2015-04-13 20:52:51 +00:00
smain@google.com
4301dd0458
am d60649c5: Merge "initial batch of NDK files for skeleton site build" into lmp-docs
...
* commit 'd60649c541931a5a9e5972cdceac48b9042eaff4':
initial batch of NDK files for skeleton site build
2015-04-13 20:44:52 +00:00
Mathieu Chartier
473989c35d
Merge "Update "Investigating your RAM usage" for ART" into lmp-docs
2015-04-13 20:44:18 +00:00
smain@google.com
d60649c541
Merge "initial batch of NDK files for skeleton site build" into lmp-docs
2015-04-13 20:32:38 +00:00
smain@google.com
0178321af6
initial batch of NDK files for skeleton site build
...
Change-Id: I00152e817377c072f529940743499a3b6d91f80d
2015-04-13 12:51:19 -07:00
Rich Slogar
6b9e30fe95
am 12020cf4: am 3e664c3b: am bdc20109: Merge "docs: systrace update" into lmp-docs
...
* commit '12020cf4418fd5b0918b6df1d6a072be01aac622':
docs: systrace update
2015-04-13 18:53:14 +00:00
Rich Slogar
9761530b3f
am 8f68c77c: am 6656ea46: am 880460a7: Merge "docs: nexus usb driver update" into lmp-docs
...
* commit '8f68c77cec98a24fd43ad0a5e2d3946d2a16e15e':
docs: nexus usb driver update
2015-04-13 18:53:08 +00:00
Rich Slogar
904d498312
am 6843ae30: am c0559808: am a7ade2f7: Merge "docs: remove adb install option" into lmp-docs
...
* commit '6843ae308ea8d62aa44dda3e7ad95c6e292513af':
docs: remove adb install option
2015-04-13 18:53:01 +00:00
Rich Slogar
12020cf441
am 3e664c3b: am bdc20109: Merge "docs: systrace update" into lmp-docs
...
* commit '3e664c3bda8ee1cb3b2819ba38a8195147ad448a':
docs: systrace update
2015-04-13 18:43:04 +00:00
Rich Slogar
8f68c77cec
am 6656ea46: am 880460a7: Merge "docs: nexus usb driver update" into lmp-docs
...
* commit '6656ea4607d8250a611eddb07de890213ea31426':
docs: nexus usb driver update
2015-04-13 18:42:58 +00:00
Rich Slogar
6843ae308e
am c0559808: am a7ade2f7: Merge "docs: remove adb install option" into lmp-docs
...
* commit 'c0559808eeb881ce5afa368c51f3da3807359d56':
docs: remove adb install option
2015-04-13 18:42:54 +00:00
Rich Slogar
3e664c3bda
am bdc20109: Merge "docs: systrace update" into lmp-docs
...
* commit 'bdc20109208d16144cd052b281e25e6e243b2547':
docs: systrace update
2015-04-13 18:30:38 +00:00
Rich Slogar
6656ea4607
am 880460a7: Merge "docs: nexus usb driver update" into lmp-docs
...
* commit '880460a704c79b0d81c1aa8af9b3c163c8adf16d':
docs: nexus usb driver update
2015-04-13 18:30:33 +00:00
Rich Slogar
c0559808ee
am a7ade2f7: Merge "docs: remove adb install option" into lmp-docs
...
* commit 'a7ade2f7f0c496cb12edfc4ae805fd08c9c2359d':
docs: remove adb install option
2015-04-13 18:30:29 +00:00
Rich Slogar
bdc2010920
Merge "docs: systrace update" into lmp-docs
2015-04-13 18:14:06 +00:00
Rich Slogar
880460a704
Merge "docs: nexus usb driver update" into lmp-docs
2015-04-13 18:13:47 +00:00
