OSDN Git Service
Pierre Vandwalle [Mon, 16 Mar 2015 18:31:47 +0000 (11:31 -0700)]
add BASE_WIFI_LOGGER to system protocol messages
Change-Id: I4bb59b220208d5cb4fa415ad092970312392d8e4
xinhe [Fri, 13 Mar 2015 01:43:05 +0000 (18:43 -0700)]
Change rtt Framework interface
Bug:
19735392
Change-Id: I0886d3c0e40a6dd5477c81a5df5dbc2746942ec3
Tyler Gunn [Wed, 18 Mar 2015 20:09:14 +0000 (13:09 -0700)]
resolve merge conflicts of
bcb17eb to m-wireless-dev.
Change-Id: Ic8211fb14caec993c8e38c790006577493f7a607
Brian Carlstrom [Wed, 18 Mar 2015 19:08:26 +0000 (19:08 +0000)]
am
97f3cd0a: Merge "Update vmSafeMode documentation" into lmp-mr1-dev
automerge:
6a6cf63
* commit '
6a6cf634f527cdde9382e8fabb4de5aaad748879':
Update vmSafeMode documentation
Pavel Zhamaitsiak [Wed, 18 Mar 2015 19:08:18 +0000 (19:08 +0000)]
Merge "Add format string for displaying SPN in Wi-Fi calling mode." into lmp-mr1-wfc-dev
automerge:
1d33a37
* commit '
1d33a37e0591b27386db2d324313e601cef42527':
Add format string for displaying SPN in Wi-Fi calling mode.
Deepanshu Gupta [Wed, 18 Mar 2015 19:08:09 +0000 (19:08 +0000)]
am
1f9a26af: am
158c08bc: am
ada85905: Fix AppCompat action bar theming.
automerge:
579535a
* commit '
579535acfa1c5c093b5152cf6f20603b273137be':
Fix AppCompat action bar theming.
Deepanshu Gupta [Wed, 18 Mar 2015 19:08:01 +0000 (19:08 +0000)]
am
9a00f1c8: am
79f7fce7: am
2e4d9324: Fix NoActionBar themes rendering.
automerge:
cc5c1a5
* commit '
cc5c1a57b05b2cda45936172bbe91a52ae9adee6':
Fix NoActionBar themes rendering.
Luan Nguyen [Wed, 18 Mar 2015 19:07:53 +0000 (19:07 +0000)]
am
0d756f7d: am
217a4356: am
a8bdd2f3: am
42bb44db: Merge "docs: Remove deprecated Fitness information from this doc. Guides have been moved to developers.google.com/fit" into lmp-docs
automerge:
7962ae3
* commit '
7962ae36eb8be221753f2b3c75bdb676beda938c':
docs: Remove deprecated Fitness information from this doc. Guides have been moved to developers.google.com/fit
Craig Mautner [Wed, 18 Mar 2015 19:07:44 +0000 (19:07 +0000)]
am
98560bdf: am
bfcc60a3: am
2825a9c6: am
470ad0fa: Merge "Correct docs to specify leading slash in paths." into lmp-docs
automerge:
c5ee610
* commit '
c5ee610da5e3732e38e7e15d684c455eb6131279':
Correct docs to specify leading slash in paths.
Nathan Harold [Wed, 18 Mar 2015 19:07:35 +0000 (19:07 +0000)]
Merge "Adding hidden isWifiCallingEnabled() and isVolteEnabled()" into lmp-mr1-wfc-dev
automerge:
8ee14a2
* commit '
8ee14a244851ac80af0193541a5d521462d75e1e':
Adding hidden isWifiCallingEnabled() and isVolteEnabled()
Vinit Deshpande [Wed, 18 Mar 2015 18:43:35 +0000 (18:43 +0000)]
Merge "Fix scan results to hold passpoint data" into m-wireless-dev
Erik Kline [Wed, 18 Mar 2015 00:18:40 +0000 (00:18 +0000)]
Merge "Fix missing printf argument." into m-wireless-dev
Vinit Deshpande [Fri, 13 Mar 2015 00:04:35 +0000 (17:04 -0700)]
Fix scan results to hold passpoint data
Change-Id: I8ab75ec49226a59b04de6463de596cc9f5f6d800
Vinit Deshpande [Wed, 18 Mar 2015 00:06:49 +0000 (00:06 +0000)]
Merge "Improve passpoint configuration validation" into m-wireless-dev
Erik Kline [Tue, 17 Mar 2015 23:08:57 +0000 (08:08 +0900)]
Fix missing printf argument.
Change-Id: Ifd1eebfbcefa06570882da54a1c410eabf26bce7
Dong Zhou [Tue, 17 Mar 2015 22:21:21 +0000 (22:21 +0000)]
am
89f41eb3: Define the capability to speed up MT call audio
* commit '
89f41eb39e910e220957ac861651ead17eff9085':
Define the capability to speed up MT call audio
Dong Zhou [Sun, 15 Mar 2015 16:59:49 +0000 (11:59 -0500)]
Define the capability to speed up MT call audio
Bug:
19656525
Change-Id: I0bc88e85b807871b2883a785efac91bd0e1f6d8d
Wei Wang [Tue, 13 Jan 2015 04:02:37 +0000 (20:02 -0800)]
Add opportunistic ble scan mode. (1/2)
Bug:
19003667
Change-Id: Ibed7e9ec604cb11a58736d168d3d19ece53fc77a
(cherry picked from commit
7508ddf8b53bf350a3424ef71f1ce62ea17006b8)
Brian Carlstrom [Tue, 17 Mar 2015 19:29:38 +0000 (19:29 +0000)]
am
97f3cd0a: Merge "Update vmSafeMode documentation" into lmp-mr1-dev
* commit '
97f3cd0a8280b2cf08069cc1e2d89d8bb227633f':
Update vmSafeMode documentation
Brian Carlstrom [Tue, 17 Mar 2015 19:22:45 +0000 (19:22 +0000)]
Merge "Update vmSafeMode documentation" into lmp-mr1-dev
Pavel Zhamaitsiak [Tue, 17 Mar 2015 18:28:34 +0000 (18:28 +0000)]
Merge "Add format string for displaying SPN in Wi-Fi calling mode." into lmp-mr1-wfc-dev
Deepanshu Gupta [Tue, 17 Mar 2015 14:28:36 +0000 (14:28 +0000)]
am
1f9a26af: am
158c08bc: am
ada85905: Fix AppCompat action bar theming.
* commit '
1f9a26af95abba385b612c734d1d5e32d9e3f363':
Fix AppCompat action bar theming.
Deepanshu Gupta [Tue, 17 Mar 2015 14:28:32 +0000 (14:28 +0000)]
am
9a00f1c8: am
79f7fce7: am
2e4d9324: Fix NoActionBar themes rendering.
* commit '
9a00f1c84b7a7936a12415a08604ac8fb98ec5ea':
Fix NoActionBar themes rendering.
Deepanshu Gupta [Tue, 17 Mar 2015 14:16:50 +0000 (14:16 +0000)]
am
158c08bc: am
ada85905: Fix AppCompat action bar theming.
* commit '
158c08bcf1cd0bc702748ee2a4cf6aa259c26147':
Fix AppCompat action bar theming.
Deepanshu Gupta [Tue, 17 Mar 2015 14:16:42 +0000 (14:16 +0000)]
am
79f7fce7: am
2e4d9324: Fix NoActionBar themes rendering.
* commit '
79f7fce7a49e7b7cd414ff5c3fdb5cbaae45c1f1':
Fix NoActionBar themes rendering.
Lorenzo Colitti [Tue, 17 Mar 2015 06:55:39 +0000 (15:55 +0900)]
DHCP: Don't write options longer than 255 bytes.
Change-Id: Iddc971c7ac97253af3063850cde3dee10c3829ff
Lorenzo Colitti [Tue, 17 Mar 2015 04:18:31 +0000 (13:18 +0900)]
DHCP: parsing robustness fixes.
1. Check the length of the fixed-length portions of the packet.
2. Catch BufferUnderflowException while parsing options.
Change-Id: If907f49f02a04a4a3360f46a3192e94ab099af0e
Lorenzo Colitti [Mon, 16 Mar 2015 14:46:24 +0000 (23:46 +0900)]
DHCP: Add a hidden setting to use the legacy DHCP client.
Change-Id: I5505bd2c20ddc895df0e9b176e1ed770ad74a3f4
Lorenzo Colitti [Mon, 9 Mar 2015 16:38:38 +0000 (01:38 +0900)]
DHCP: Add a Java DHCP client.
The behaviour of the client is intended to mirror the behaviour
of the current DhcpStateMachine + dhcpcd combination, except it
does not store leases across network changes.
Bug:
19704592
Change-Id: I110b58003da2d8293059d48a0181e16f7f7f145c
Lorenzo Colitti [Tue, 17 Mar 2015 08:56:10 +0000 (17:56 +0900)]
Add a protectFromVpn method that takes a FileDescriptor
Bug:
19704592
Change-Id: I9aeb29c2f6cf55fa010bc606c99b21a797ac5a19
Lorenzo Colitti [Tue, 10 Mar 2015 15:01:25 +0000 (00:01 +0900)]
DHCP: protocol changes.
1. Define and add parsing code for MTU, max message size, T1, T2.
2. Add common TLVs (message size, hostname, vendor ID) to all
packets sent by the client.
3. Don't include requested IP and server ID in renew messages,
since the RFC says MUST NOT.
4. Don't hardcode the broadcast flag to true in DISCOVER packets,
use what the caller passed in.
5. Make some methods static.
Bug:
19704592
Change-Id: I42a0997e468b12e19cad9b403b98fe266e6cea73
Deepanshu Gupta [Tue, 17 Mar 2015 00:21:02 +0000 (00:21 +0000)]
am
ada85905: Fix AppCompat action bar theming.
* commit '
ada8590547348b77d8cbd56abdb8fadb3e72c015':
Fix AppCompat action bar theming.
Deepanshu Gupta [Tue, 17 Mar 2015 00:20:58 +0000 (00:20 +0000)]
am
2e4d9324: Fix NoActionBar themes rendering.
* commit '
2e4d93245764a1c1d7515361ddbb8fc1665f814e':
Fix NoActionBar themes rendering.
Vinit Deshpande [Thu, 12 Mar 2015 00:43:04 +0000 (17:43 -0700)]
Improve passpoint configuration validation
Change-Id: I717242b2f8b2e7d0f84c3a7c74c4672289387151
Deepanshu Gupta [Fri, 13 Mar 2015 18:06:47 +0000 (11:06 -0700)]
Fix AppCompat action bar theming.
Use themed context to inflate the action bar when AppCompat is used.
Also fix minor issues exposed as a result.
- Set project callback when LayoutInflater is created by
LayoutInflater.from(context).
- Remove duplication of code to get base context from context wrapper.
Bug: http://b.android.com/159711
Change-Id: I379ba2ba71c0ef547460987c3aa5db521c7de967
Lorenzo Colitti [Tue, 10 Mar 2015 16:16:18 +0000 (01:16 +0900)]
DHCP: glue code.
1. Add a method to make a DhcpResults object from a DHCP packet.
2. Add a method to fetch the client MAC from the packet. This is
needed to check that the message is for us (lots of DHCP
messages are broadcast).
3. Add a length argument to the method that parses DHCP packets,
so the caller can use the same MTU-sized array all the time
instead of having to pass in a new array for every packet.
Bug:
19704592
Change-Id: I58223f5ec90fb5c762bc2934649e02f9122018b2
Lorenzo Colitti [Thu, 12 Mar 2015 13:36:49 +0000 (22:36 +0900)]
DHCP: Ethernet/IP packet header changes.
1. Support L2_ENCAP when building packets as well as when parsing.
2. Skip IP options when parsing DHCP packets.
Bug:
19704592
Change-Id: Ic27a45790ed1cf7cf5b82d63b6c0b64c909a570f
Lorenzo Colitti [Mon, 16 Mar 2015 12:12:41 +0000 (12:12 +0000)]
Merge changes from topic 'dhcpclient' into m-wireless-dev
* changes:
DHCP: Minor cleanups to the packet code.
DHCP: Move the packet code to frameworks/base/services.
DHCP: Add a native method for making a DHCP socket.
DHCP: Add a superclass for DhcpStateMachine.
Lorenzo Colitti [Mon, 16 Mar 2015 12:11:37 +0000 (12:11 +0000)]
Merge "Add two utility methods for IPv4 netmasks." into m-wireless-dev
Paul Jensen [Mon, 16 Mar 2015 11:59:02 +0000 (11:59 +0000)]
Merge "Fix javadoc braces for ConnectivityManager.EXTRA_NETWORK." into m-wireless-dev
Lorenzo Colitti [Sat, 14 Mar 2015 04:52:18 +0000 (13:52 +0900)]
DHCP: Minor cleanups to the packet code.
1. Delete the DhcpStateMachine, since we don't plan to use it.
2. Make all InetAddresses Inet4Addresses, since that's what they
are. In order to do this, define INADDR_ANY and
INADDR_BROADCAST, constants, since Inet4Address.{ANY,ALL} are
not Inet4Addresses but InetAddresses.
Bug:
19704592
Change-Id: I5a0499be889076992a60aaad0bd8be5ea66bd560
Lorenzo Colitti [Mon, 9 Mar 2015 16:36:14 +0000 (01:36 +0900)]
DHCP: Move the packet code to frameworks/base/services.
There's no need for it to be in frameworks/base/core, since it
will only be used by services.
Bug:
19704592
Change-Id: I2f5277eca848b7000ca46db575e8602eacb5c8bd
Lorenzo Colitti [Fri, 6 Mar 2015 10:57:39 +0000 (19:57 +0900)]
DHCP: Add a native method for making a DHCP socket.
Bug:
19704592
Change-Id: Iadd60d39c93aaabd2917e76791101a7d313b34be
Lorenzo Colitti [Tue, 10 Mar 2015 14:59:36 +0000 (23:59 +0900)]
DHCP: Add a superclass for DhcpStateMachine.
This can be used to switch between different DHCP client
implementations. The caller can declare objects of type
BaseDhcpStateMachine, and call its methods, without needing to
care what implementation is in use.
Bug:
19704592
Change-Id: Icefad9b0d0f83b349681388b1fa16b5e2e37c042
Lorenzo Colitti [Mon, 9 Mar 2015 16:32:40 +0000 (01:32 +0900)]
Add two utility methods for IPv4 netmasks.
1. Add a validating method to convert a netmask to a prefix length.
2. Add a function to get the implicit netmask of an IPv4 address.
3. Add a unit test.
Bug:
19704592
Change-Id: Icb9f58d3903ea01df9e3720383c9bd5db6dd8f26
Deepanshu Gupta [Fri, 13 Mar 2015 01:46:36 +0000 (18:46 -0700)]
Fix NoActionBar themes rendering.
Also fix some warnings.
Bug: http://b.android.com/159780
Change-Id: I64fd4259b802722af7a271f51d5943018ed11e9e
Prerepa Viswanadham [Fri, 13 Mar 2015 20:05:42 +0000 (20:05 +0000)]
Merge "Per controller tx/rx/idle current values - to be populated in device overlays" into m-wireless-dev
Prerepa Viswanadham [Thu, 5 Feb 2015 19:46:05 +0000 (11:46 -0800)]
Per controller tx/rx/idle current values - to be populated in
device overlays
Change-Id: Ib49d2ecc1bcc52ab76d16f236ab54cf5ec5d9864
Pavel Zhamaitsiak [Thu, 12 Mar 2015 00:09:13 +0000 (17:09 -0700)]
Add format string for displaying SPN in Wi-Fi calling mode.
Bug:
19681794
Change-Id: I31feab956d14accda73288cd43a2aa34db7175ae
Luan Nguyen [Fri, 13 Mar 2015 18:28:32 +0000 (18:28 +0000)]
am
0d756f7d: am
217a4356: am
a8bdd2f3: am
42bb44db: Merge "docs: Remove deprecated Fitness information from this doc. Guides have been moved to developers.google.com/fit" into lmp-docs
* commit '
0d756f7d5646f84753a3db5f702f4ac79bda22bf':
docs: Remove deprecated Fitness information from this doc. Guides have been moved to developers.google.com/fit
Luan Nguyen [Fri, 13 Mar 2015 18:13:39 +0000 (18:13 +0000)]
am
217a4356: am
a8bdd2f3: am
42bb44db: Merge "docs: Remove deprecated Fitness information from this doc. Guides have been moved to developers.google.com/fit" into lmp-docs
* commit '
217a435665880076abb71085e9d76aec4ff83b6d':
docs: Remove deprecated Fitness information from this doc. Guides have been moved to developers.google.com/fit
Paul Jensen [Fri, 13 Mar 2015 18:06:12 +0000 (14:06 -0400)]
Fix javadoc braces for ConnectivityManager.EXTRA_NETWORK.
Change-Id: I5ad30a34f96e9e99a557b5bae9a30bfc08c89620
Luan Nguyen [Fri, 13 Mar 2015 17:57:02 +0000 (17:57 +0000)]
am
a8bdd2f3: am
42bb44db: Merge "docs: Remove deprecated Fitness information from this doc. Guides have been moved to developers.google.com/fit" into lmp-docs
* commit '
a8bdd2f341ded0f2096e2750d176873e3e9e89c7':
docs: Remove deprecated Fitness information from this doc. Guides have been moved to developers.google.com/fit
Luan Nguyen [Fri, 13 Mar 2015 17:49:46 +0000 (17:49 +0000)]
am
42bb44db: Merge "docs: Remove deprecated Fitness information from this doc. Guides have been moved to developers.google.com/fit" into lmp-docs
* commit '
42bb44dbf5bffc5d3fcf89eacfd5c561dbe8095c':
docs: Remove deprecated Fitness information from this doc. Guides have been moved to developers.google.com/fit
Luan Nguyen [Fri, 13 Mar 2015 17:42:04 +0000 (17:42 +0000)]
Merge "docs: Remove deprecated Fitness information from this doc. Guides have been moved to developers.google.com/fit" into lmp-docs
Craig Mautner [Fri, 13 Mar 2015 00:38:53 +0000 (00:38 +0000)]
am
98560bdf: am
bfcc60a3: am
2825a9c6: am
470ad0fa: Merge "Correct docs to specify leading slash in paths." into lmp-docs
* commit '
98560bdf87ad5f97054b13d3c92954132584c7f7':
Correct docs to specify leading slash in paths.
Craig Mautner [Fri, 13 Mar 2015 00:29:21 +0000 (00:29 +0000)]
am
bfcc60a3: am
2825a9c6: am
470ad0fa: Merge "Correct docs to specify leading slash in paths." into lmp-docs
* commit '
bfcc60a3f03ff25dccb5277626da213b1e254ccd':
Correct docs to specify leading slash in paths.
Craig Mautner [Fri, 13 Mar 2015 00:22:33 +0000 (00:22 +0000)]
am
2825a9c6: am
470ad0fa: Merge "Correct docs to specify leading slash in paths." into lmp-docs
* commit '
2825a9c618840c1cf3d59806a794674f12a7c7c6':
Correct docs to specify leading slash in paths.
Craig Mautner [Fri, 13 Mar 2015 00:17:36 +0000 (00:17 +0000)]
am
470ad0fa: Merge "Correct docs to specify leading slash in paths." into lmp-docs
* commit '
470ad0fa1c0a4047c0a4c3d132a9ec3106e447ba':
Correct docs to specify leading slash in paths.
Craig Mautner [Fri, 13 Mar 2015 00:09:30 +0000 (00:09 +0000)]
Merge "Correct docs to specify leading slash in paths." into lmp-docs
Nathan Harold [Thu, 12 Mar 2015 21:37:44 +0000 (21:37 +0000)]
Merge "Adding hidden isWifiCallingEnabled() and isVolteEnabled()" into lmp-mr1-wfc-dev
Roozbeh Pournader [Thu, 12 Mar 2015 17:54:19 +0000 (17:54 +0000)]
am
db56b5a6: Move Noto Sans Tai Le to the end of the font fallback list.
automerge:
c984826
* commit '
c98482663674cfae7e3640cd1dbd263d467f536d':
Move Noto Sans Tai Le to the end of the font fallback list.
Roozbeh Pournader [Thu, 12 Mar 2015 17:41:20 +0000 (17:41 +0000)]
am
db56b5a6: Move Noto Sans Tai Le to the end of the font fallback list.
* commit '
db56b5a681b097f7649937e8ad4d73c1e560fb3b':
Move Noto Sans Tai Le to the end of the font fallback list.
Roozbeh Pournader [Wed, 11 Feb 2015 23:45:49 +0000 (15:45 -0800)]
Move Noto Sans Tai Le to the end of the font fallback list.
This is to make sure the East Asian punctuation shared between CJK languages
and Tai Le are rendered from the CJK fonts when no language is specified
for the text, or CJK text is rendered in a non-CJK locale.
Also remove the old comment about 64k glyphs limit.
Bug:
19355391
Change-Id: Ic2cbc79cecf9539ace8a432f373685eeff81e106
(cherry picked from commit
70f0a4365bbffd016470807c9dbd7e9c1ea2df9d)
Deepanshu Gupta [Thu, 12 Mar 2015 02:05:06 +0000 (02:05 +0000)]
am
c44430a3: Merge "Tools attribute improvements for RecyclerView LayoutManager." into lmp-mr1-dev
automerge:
713e7cc
* commit '
713e7cc8c04a3486c99ad8c5af1adfd877f59798':
Tools attribute improvements for RecyclerView LayoutManager.
Rich Slogar [Thu, 12 Mar 2015 02:04:57 +0000 (02:04 +0000)]
am
0146922a: am
633f4829: am
7256fb4f: am
a6b0ddb7: Merge "docs: build image updates" into lmp-docs
automerge:
3a5a410
* commit '
3a5a410bca766aa7d48a6538df02e692ac693035':
docs: build image updates
Deepanshu Gupta [Thu, 12 Mar 2015 01:45:25 +0000 (01:45 +0000)]
am
c44430a3: Merge "Tools attribute improvements for RecyclerView LayoutManager." into lmp-mr1-dev
* commit '
c44430a36813dc4afb6000279254e578bc5d0391':
Tools attribute improvements for RecyclerView LayoutManager.
Deepanshu Gupta [Thu, 12 Mar 2015 01:16:44 +0000 (01:16 +0000)]
Merge "Tools attribute improvements for RecyclerView LayoutManager." into lmp-mr1-dev
Nathan Harold [Thu, 12 Mar 2015 01:08:08 +0000 (18:08 -0700)]
Adding hidden isWifiCallingEnabled() and isVolteEnabled()
Change-Id: Ic33f8c50dfb2d81b2bdc149629724e3972aad09e
Deepanshu Gupta [Thu, 12 Mar 2015 01:03:46 +0000 (01:03 +0000)]
am
71ba1230: am
efc09c64: am
78660423: Merge "Fix cyclic dependency in BlendComposite and BlendingMode." into lmp-dev
automerge:
5c69ca2
* commit '
5c69ca2b6d9e33fa84c78355d68215d88c6f23b2':
Fix cyclic dependency in BlendComposite and BlendingMode.
Deepanshu Gupta [Thu, 12 Mar 2015 01:03:39 +0000 (01:03 +0000)]
am
b3cfb334: Merge "Fix rare NPE in BridgeContext." into lmp-mr1-dev
automerge:
49d3c36
* commit '
49d3c36134f818e06dc6c71d462ee8369c73c195':
Fix rare NPE in BridgeContext.
Deepanshu Gupta [Thu, 12 Mar 2015 01:03:31 +0000 (01:03 +0000)]
am
71518174: Merge "Fix project settings." into lmp-mr1-dev
automerge:
4abf088
* commit '
4abf0885d7411e92ea0345686781e663a00fc1ba':
Fix project settings.
Deepanshu Gupta [Thu, 12 Mar 2015 01:03:23 +0000 (01:03 +0000)]
am
b171be1a: Merge "Add RecyclerView support." into lmp-mr1-dev
automerge:
26f672a
* commit '
26f672a94cdc7cf8ff04745cc1a42b0e2acdf9e4':
Add RecyclerView support.
Rich Slogar [Thu, 12 Mar 2015 00:59:36 +0000 (00:59 +0000)]
am
0146922a: am
633f4829: am
7256fb4f: am
a6b0ddb7: Merge "docs: build image updates" into lmp-docs
* commit '
0146922a6fee8af01ffd6ea201cbb6de0dbd4ed8':
docs: build image updates
Deepanshu Gupta [Thu, 12 Mar 2015 00:53:12 +0000 (00:53 +0000)]
am
71ba1230: am
efc09c64: am
78660423: Merge "Fix cyclic dependency in BlendComposite and BlendingMode." into lmp-dev
* commit '
71ba12308e338595d8068ff788bb5c8abfcfe515':
Fix cyclic dependency in BlendComposite and BlendingMode.
Rich Slogar [Thu, 12 Mar 2015 00:52:49 +0000 (00:52 +0000)]
am
633f4829: am
7256fb4f: am
a6b0ddb7: Merge "docs: build image updates" into lmp-docs
* commit '
633f482907d6c9cce672341f0d0a4d6c5c2b7f78':
docs: build image updates
Quddus Chong [Thu, 12 Mar 2015 00:51:43 +0000 (00:51 +0000)]
am
77eb85e1: am
c706a980: am
a236a49e: am
47426f1c: Merge "docs: Added overview page and Javadocs for the Android Testing Support Library." into lmp-docs
automerge:
766889e
* commit '
766889e9e27256c5772ee9f0eabe80444e9586d4':
docs: Added overview page and Javadocs for the Android Testing Support Library.
Deepanshu Gupta [Thu, 12 Mar 2015 00:46:14 +0000 (00:46 +0000)]
am
b3cfb334: Merge "Fix rare NPE in BridgeContext." into lmp-mr1-dev
* commit '
b3cfb334893a0b302cd6a0a998f27ca2e8ba7f9d':
Fix rare NPE in BridgeContext.
Deepanshu Gupta [Thu, 12 Mar 2015 00:46:10 +0000 (00:46 +0000)]
am
71518174: Merge "Fix project settings." into lmp-mr1-dev
* commit '
71518174fcd57c85d1e38f1794c44b763baff286':
Fix project settings.
Deepanshu Gupta [Thu, 12 Mar 2015 00:46:07 +0000 (00:46 +0000)]
am
b171be1a: Merge "Add RecyclerView support." into lmp-mr1-dev
* commit '
b171be1a54a6a0fe416916ff91e41362b8bb4873':
Add RecyclerView support.
Rich Slogar [Thu, 12 Mar 2015 00:45:40 +0000 (00:45 +0000)]
am
7256fb4f: am
a6b0ddb7: Merge "docs: build image updates" into lmp-docs
* commit '
7256fb4fdd088cd0a827452cbdd8bd243da00881':
docs: build image updates
Deepanshu Gupta [Thu, 12 Mar 2015 00:45:40 +0000 (00:45 +0000)]
am
efc09c64: am
78660423: Merge "Fix cyclic dependency in BlendComposite and BlendingMode." into lmp-dev
* commit '
efc09c644fa4e8354d54485aab6c0b18868284eb':
Fix cyclic dependency in BlendComposite and BlendingMode.
Quddus Chong [Thu, 12 Mar 2015 00:41:08 +0000 (00:41 +0000)]
am
77eb85e1: am
c706a980: am
a236a49e: am
47426f1c: Merge "docs: Added overview page and Javadocs for the Android Testing Support Library." into lmp-docs
* commit '
77eb85e14fb37a67af2eaf120e1c866dee64ad2c':
docs: Added overview page and Javadocs for the Android Testing Support Library.
Deepanshu Gupta [Thu, 12 Mar 2015 00:38:45 +0000 (00:38 +0000)]
am
78660423: Merge "Fix cyclic dependency in BlendComposite and BlendingMode." into lmp-dev
* commit '
78660423900fa255cc83b85320e98d5184be393b':
Fix cyclic dependency in BlendComposite and BlendingMode.
Rich Slogar [Thu, 12 Mar 2015 00:38:38 +0000 (00:38 +0000)]
am
a6b0ddb7: Merge "docs: build image updates" into lmp-docs
* commit '
a6b0ddb7f1437d67538364f16dedb61f7966c653':
docs: build image updates
Rich Slogar [Thu, 12 Mar 2015 00:34:09 +0000 (00:34 +0000)]
Merge "docs: build image updates" into lmp-docs
Deepanshu Gupta [Thu, 12 Mar 2015 00:32:45 +0000 (00:32 +0000)]
Merge "Fix cyclic dependency in BlendComposite and BlendingMode." into lmp-dev
Deepanshu Gupta [Thu, 12 Mar 2015 00:32:22 +0000 (00:32 +0000)]
Merge "Fix rare NPE in BridgeContext." into lmp-mr1-dev
Deepanshu Gupta [Thu, 12 Mar 2015 00:31:52 +0000 (00:31 +0000)]
Merge "Fix project settings." into lmp-mr1-dev
Deepanshu Gupta [Thu, 12 Mar 2015 00:31:49 +0000 (00:31 +0000)]
Merge "Add RecyclerView support." into lmp-mr1-dev
Deepanshu Gupta [Wed, 11 Mar 2015 23:48:20 +0000 (16:48 -0700)]
Tools attribute improvements for RecyclerView LayoutManager.
1. Change tools attribute for layout manager from layoutManagerType to
LayoutManager.
2. Support classnames in the tools attribute.
This change doesn't try to supprt arbitrary classnames for now. The
reason for this is that the new layoutlib API is supposed to contain a
new method for inflating custom classes that are not views. This will
allow us to throw better error messages. Without the new API, trying for
different constructors, will result in a error messages being logged.
Change-Id: I3a31359c06b7452bfd973c3e5e54f9038acccfaa
Deepanshu Gupta [Wed, 11 Mar 2015 23:34:13 +0000 (16:34 -0700)]
Fix cyclic dependency in BlendComposite and BlendingMode.
Introduced in commit
1a10ca7e526736b4fd143f7c9f3b29643c0062a4
Bug: http://b.android.com/159708
Change-Id: I6add5be3a933bbe4f8d888906e2aa1b2e35d045a
Quddus Chong [Wed, 11 Mar 2015 23:30:58 +0000 (23:30 +0000)]
am
c706a980: am
a236a49e: am
47426f1c: Merge "docs: Added overview page and Javadocs for the Android Testing Support Library." into lmp-docs
* commit '
c706a980e426ea0e0b6aaee5530516b1a16c3755':
docs: Added overview page and Javadocs for the Android Testing Support Library.
Quddus Chong [Wed, 11 Mar 2015 23:24:37 +0000 (23:24 +0000)]
am
a236a49e: am
47426f1c: Merge "docs: Added overview page and Javadocs for the Android Testing Support Library." into lmp-docs
* commit '
a236a49edec87cd24fe683550c0ab83be3dcbf07':
docs: Added overview page and Javadocs for the Android Testing Support Library.
Quddus Chong [Wed, 11 Mar 2015 23:16:59 +0000 (23:16 +0000)]
am
47426f1c: Merge "docs: Added overview page and Javadocs for the Android Testing Support Library." into lmp-docs
* commit '
47426f1c190b17548eabb50fad3945844f1a7363':
docs: Added overview page and Javadocs for the Android Testing Support Library.
Quddus Chong [Wed, 11 Mar 2015 23:11:02 +0000 (23:11 +0000)]
Merge "docs: Added overview page and Javadocs for the Android Testing Support Library." into lmp-docs
Quddus Chong [Fri, 27 Feb 2015 00:38:46 +0000 (16:38 -0800)]
docs: Added overview page and Javadocs for the Android Testing Support Library.
Change-Id: I645d3a302ce0d1d4cd389c6a58709a11a0426aed
Deepanshu Gupta [Wed, 11 Mar 2015 22:41:47 +0000 (15:41 -0700)]
Fix rare NPE in BridgeContext.
Also fixed some deprecation warnings.
Change-Id: I2fa00996dab0b008b9ca07a5382a059e5780529d
Tyler Gunn [Fri, 6 Feb 2015 21:56:52 +0000 (13:56 -0800)]
Fix emergency callback number not shown for incoming calls.
- Adding new Connection/Call capability: CAPABILITY_SHOW_CALLBACK_NUMBER.
- Used in Telephony to indicate on an incoming call that the callback
number should be shown.
Bug:
18689292
Change-Id: I1ab3baf9f0d5a22c4b01e6504e88d496182e01c7
Luan Nguyen [Wed, 11 Mar 2015 19:26:09 +0000 (19:26 +0000)]
am
dd7d025b: am
ca0db1a0: am
eeb79d10: am
9a7238d8: Merge "Revert "docs: Update auto landing and design page image assets"" into lmp-docs
automerge:
e32c162
* commit '
e32c162a40d55cca897b3572098fa0d552d20be9':
Revert "docs: Update auto landing and design page image assets"