OSDN Git Service
Deepanshu Gupta [Tue, 17 Feb 2015 22:24:20 +0000 (22:24 +0000)]
am
221d7320: am
12c9e498: Merge "Changes made by intelliJ 14.1" into lmp-dev automerge:
4e47416
* commit '
221d732005b04b5f979d2e03e8ebe00160e52ca3':
Changes made by intelliJ 14.1
Deepanshu Gupta [Tue, 17 Feb 2015 22:18:35 +0000 (22:18 +0000)]
am
12c9e498: Merge "Changes made by intelliJ 14.1" into lmp-dev
automerge:
4e47416
* commit '
4e47416012b8cb88d564a04a29c0b79a28b9e529':
Changes made by intelliJ 14.1
Adrian Roos [Tue, 17 Feb 2015 18:39:25 +0000 (18:39 +0000)]
am
024fd0c6: Disable color view animations when stable insets change
* commit '
024fd0c6051e01579018fad0c1a56e9e47b195df':
Disable color view animations when stable insets change
Adrian Roos [Tue, 17 Feb 2015 15:37:53 +0000 (16:37 +0100)]
Disable color view animations when stable insets change
Prevents color view from showing up on phones when
the orientation changes to landscape. Previously, the
animation was only prevented when the stable inset of a
bar became nonzero; now we disable animations whenever
the nonzeroness changes.
Bug:
19353466
Change-Id: I31b4103fe984d158a98cd446ac2ddbe15a408e49
Deepanshu Gupta [Fri, 13 Feb 2015 22:38:07 +0000 (22:38 +0000)]
am
12c9e498: Merge "Changes made by intelliJ 14.1" into lmp-dev
* commit '
12c9e4980e889d1c72656a4062f9cee9a0e6f15a':
Changes made by intelliJ 14.1
Deepanshu Gupta [Fri, 13 Feb 2015 22:33:47 +0000 (22:33 +0000)]
Merge "Changes made by intelliJ 14.1" into lmp-dev
Svetoslav [Fri, 13 Feb 2015 03:41:55 +0000 (03:41 +0000)]
am
27ad2e95: Accessibility: Ensure fresh accessilbity focused and input focused nodes.
* commit '
27ad2e95b40fd0ca76de384695498ea114d627ca':
Accessibility: Ensure fresh accessilbity focused and input focused nodes.
Ruben Brunk [Fri, 13 Feb 2015 02:15:21 +0000 (02:15 +0000)]
am
d2ccbd43: Merge "camera2: Fix legacy scaling factor application." into lmp-mr1-dev
* commit '
d2ccbd43d24a79122e404206c528995600a6507d':
camera2: Fix legacy scaling factor application.
Svetoslav [Fri, 13 Feb 2015 01:54:15 +0000 (17:54 -0800)]
Accessibility: Ensure fresh accessilbity focused and input focused nodes.
Change-Id: Ia3c84284843a415cdbbc2b6a9b06d9ddffbe0e04
Ruben Brunk [Fri, 13 Feb 2015 01:22:24 +0000 (01:22 +0000)]
Merge "camera2: Fix legacy scaling factor application." into lmp-mr1-dev
Luan Nguyen [Fri, 13 Feb 2015 00:20:07 +0000 (00:20 +0000)]
am
474746c7: am
2ea209ab: am
8d0df9b8: Merge "docs: Update device art generator to include Wear generic devices." into lmp-docs automerge:
fe2c687
* commit '
474746c7b08842cefecc9c1408c7837d93cff823':
docs: Update device art generator to include Wear generic devices.
Luan Nguyen [Fri, 13 Feb 2015 00:20:03 +0000 (00:20 +0000)]
am
71cf2b6d: am
e726495a: am
fe5e7e92: Merge "docs: Fix issue with onCreate() method declaration in file backup section" into lmp-docs automerge:
e0306bb
* commit '
71cf2b6d5344a45413f0c77691d7e1efb18b398f':
docs: Fix issue with onCreate() method declaration in file backup section
Luan Nguyen [Fri, 13 Feb 2015 00:19:59 +0000 (00:19 +0000)]
am
b14aec1b: am
b6de0316: am
e1f90b4e: Merge "docs: Fix notification api guide issues (
7461154,
12765600)" into lmp-docs automerge:
946bf2d
* commit '
b14aec1b954f6fea5fc3ead9a289c8896f372096':
docs: Fix notification api guide issues (
7461154,
12765600)
Luan Nguyen [Fri, 13 Feb 2015 00:16:48 +0000 (00:16 +0000)]
am
2ea209ab: am
8d0df9b8: Merge "docs: Update device art generator to include Wear generic devices." into lmp-docs
automerge:
fe2c687
* commit '
fe2c687b97f21b7dd5471279c1b2b9458dcd22bf':
docs: Update device art generator to include Wear generic devices.
Luan Nguyen [Fri, 13 Feb 2015 00:15:09 +0000 (00:15 +0000)]
am
e726495a: am
fe5e7e92: Merge "docs: Fix issue with onCreate() method declaration in file backup section" into lmp-docs
automerge:
e0306bb
* commit '
e0306bbece4fd32d1e2f837dc515506180e04e8e':
docs: Fix issue with onCreate() method declaration in file backup section
Luan Nguyen [Fri, 13 Feb 2015 00:13:35 +0000 (00:13 +0000)]
am
b6de0316: am
e1f90b4e: Merge "docs: Fix notification api guide issues (
7461154,
12765600)" into lmp-docs
automerge:
946bf2d
* commit '
946bf2de30545a548022b8b8ba1b0ebc890ab08e':
docs: Fix notification api guide issues (
7461154,
12765600)
John Spurlock [Thu, 12 Feb 2015 22:58:14 +0000 (22:58 +0000)]
am
f45e5dbf: Merge "NoMan: Initialize filter value reported to listeners." into lmp-mr1-dev
* commit '
f45e5dbf599a0043d7f6576f20eafb2c1c157204':
NoMan: Initialize filter value reported to listeners.
John Spurlock [Thu, 12 Feb 2015 22:52:12 +0000 (22:52 +0000)]
Merge "NoMan: Initialize filter value reported to listeners." into lmp-mr1-dev
Jim Miller [Thu, 12 Feb 2015 21:55:32 +0000 (21:55 +0000)]
am
b2ff8d9a: Merge "Fix accessibility focus bug in statusbar" into lmp-mr1-dev
* commit '
b2ff8d9a3e5f279e7a60a12f9192e43081e2eef9':
Fix accessibility focus bug in statusbar
Jim Miller [Thu, 12 Feb 2015 21:48:10 +0000 (21:48 +0000)]
Merge "Fix accessibility focus bug in statusbar" into lmp-mr1-dev
Ruben Brunk [Thu, 12 Feb 2015 20:16:44 +0000 (12:16 -0800)]
camera2: Fix legacy scaling factor application.
Bug:
19359916
Change-Id: I22204c50ac918b9be97b5d43efa73c7e87444cea
Luan Nguyen [Thu, 12 Feb 2015 19:13:47 +0000 (19:13 +0000)]
am
2ea209ab: am
8d0df9b8: Merge "docs: Update device art generator to include Wear generic devices." into lmp-docs
* commit '
2ea209ab4c0883696be9a34aee5f4c4bf39c1a23':
docs: Update device art generator to include Wear generic devices.
Luan Nguyen [Thu, 12 Feb 2015 19:07:47 +0000 (19:07 +0000)]
am
8d0df9b8: Merge "docs: Update device art generator to include Wear generic devices." into lmp-docs
* commit '
8d0df9b891aca1b4f9ec2e3002ec628807f31fdb':
docs: Update device art generator to include Wear generic devices.
Luan Nguyen [Thu, 12 Feb 2015 19:01:02 +0000 (19:01 +0000)]
Merge "docs: Update device art generator to include Wear generic devices." into lmp-docs
Jeremy Joslin [Thu, 12 Feb 2015 18:40:23 +0000 (18:40 +0000)]
am
20be0e25: Merge "Update Javadoc for EXTRA_NETWORK." into lmp-mr1-dev
* commit '
20be0e25ba660a7555577988cefcfa36d84e7e2f':
Update Javadoc for EXTRA_NETWORK.
Jeremy Joslin [Thu, 12 Feb 2015 18:34:01 +0000 (18:34 +0000)]
Merge "Update Javadoc for EXTRA_NETWORK." into lmp-mr1-dev
John Spurlock [Thu, 12 Feb 2015 18:29:37 +0000 (13:29 -0500)]
NoMan: Initialize filter value reported to listeners.
In addition to relying on change callbacks.
Bug:
19288429
Change-Id: Id54473e5fbb4eac3778781a2052ba0103076f8d1
Luan Nguyen [Thu, 12 Feb 2015 17:35:43 +0000 (17:35 +0000)]
am
e726495a: am
fe5e7e92: Merge "docs: Fix issue with onCreate() method declaration in file backup section" into lmp-docs
* commit '
e726495a269b48f9b94fa9e545f84e79d587a282':
docs: Fix issue with onCreate() method declaration in file backup section
Luan Nguyen [Thu, 12 Feb 2015 17:35:38 +0000 (17:35 +0000)]
am
b6de0316: am
e1f90b4e: Merge "docs: Fix notification api guide issues (
7461154,
12765600)" into lmp-docs
* commit '
b6de0316a8f77b4425057eb4e75f7375c47fad65':
docs: Fix notification api guide issues (
7461154,
12765600)
Luan Nguyen [Thu, 12 Feb 2015 17:17:04 +0000 (17:17 +0000)]
am
fe5e7e92: Merge "docs: Fix issue with onCreate() method declaration in file backup section" into lmp-docs
* commit '
fe5e7e92a1e4cf173c787e0ffe6d84d6f1e4c703':
docs: Fix issue with onCreate() method declaration in file backup section
Luan Nguyen [Thu, 12 Feb 2015 17:16:59 +0000 (17:16 +0000)]
am
e1f90b4e: Merge "docs: Fix notification api guide issues (
7461154,
12765600)" into lmp-docs
* commit '
e1f90b4e1e438c0086409ae0253a6452f2befbac':
docs: Fix notification api guide issues (
7461154,
12765600)
Luan Nguyen [Thu, 12 Feb 2015 17:11:27 +0000 (17:11 +0000)]
Merge "docs: Fix issue with onCreate() method declaration in file backup section" into lmp-docs
Luan Nguyen [Thu, 12 Feb 2015 17:10:49 +0000 (17:10 +0000)]
Merge "docs: Fix notification api guide issues (
7461154,
12765600)" into lmp-docs
Benjamin Franz [Thu, 12 Feb 2015 16:46:50 +0000 (16:46 +0000)]
am
c70d0e71: Fix the javadocs for lock task mode intents.
* commit '
c70d0e71c09da0292958d748cedaa5fbacbec74a':
Fix the javadocs for lock task mode intents.
Benjamin Franz [Thu, 12 Feb 2015 16:12:58 +0000 (16:12 +0000)]
Fix the javadocs for lock task mode intents.
Bug:
19363651
Change-Id: Ia0da3ddad587ea842aad19818a62540889d6a9dd
Eino-Ville Talvala [Thu, 12 Feb 2015 05:41:31 +0000 (05:41 +0000)]
am
a5f301c7: Merge "Legacy: Only set user surface dimensions on output surfaces" into lmp-mr1-dev
* commit '
a5f301c7fb048461197a6032f66b35772a3157f9':
Legacy: Only set user surface dimensions on output surfaces
Eino-Ville Talvala [Thu, 12 Feb 2015 05:33:27 +0000 (05:33 +0000)]
Merge "Legacy: Only set user surface dimensions on output surfaces" into lmp-mr1-dev
Jim Miller [Thu, 12 Feb 2015 03:51:05 +0000 (19:51 -0800)]
Fix accessibility focus bug in statusbar
The root view of the new uber statusbar should not be focusable.
Based on history, it looks like this was an oversight when this view
was refactored.
Fixes bug
19296202
Change-Id: Ib7f6908c30ab37384aa50f4fa4198c15593a96a4
Lorenzo Colitti [Thu, 12 Feb 2015 02:43:45 +0000 (02:43 +0000)]
am
c7ccc393: Merge "Make reportInetCondition revalidate if the report differs from our state" into lmp-mr1-dev
* commit '
c7ccc393b470220710f566d447412d93f7f8d21b':
Make reportInetCondition revalidate if the report differs from our state
Lorenzo Colitti [Thu, 12 Feb 2015 02:30:55 +0000 (02:30 +0000)]
Merge "Make reportInetCondition revalidate if the report differs from our state" into lmp-mr1-dev
Jeremy Joslin [Thu, 12 Feb 2015 00:51:13 +0000 (16:51 -0800)]
Update Javadoc for EXTRA_NETWORK.
Bug:
19352840
Change-Id: Ib668bee0fb2c6f5bcd01a7908ebd20b9ec8a40ef
Adam Powell [Thu, 12 Feb 2015 02:13:40 +0000 (02:13 +0000)]
am
0ec652cf: Merge "Add DENSITY_280" into lmp-mr1-dev
* commit '
0ec652cf72bd8b7f619462f172ac0152d4d6c83d':
Add DENSITY_280
Adam Powell [Thu, 12 Feb 2015 02:08:03 +0000 (02:08 +0000)]
Merge "Add DENSITY_280" into lmp-mr1-dev
Eino-Ville Talvala [Wed, 11 Feb 2015 23:41:12 +0000 (15:41 -0800)]
Legacy: Only set user surface dimensions on output surfaces
The GL layer gets exclusive use of the direct producer dimensions;
we should only set the user dimensions.
Bug:
16404608
Change-Id: Ie5b720104bdbee6b096b62520baa1c6b518c6c1c
Adam Powell [Wed, 11 Feb 2015 21:34:43 +0000 (13:34 -0800)]
Add DENSITY_280
Bug
19350604
Change-Id: I94f5162c31f9c8853908d7c4699974c236cc7fe7
Michael Wright [Wed, 11 Feb 2015 20:09:35 +0000 (20:09 +0000)]
am
3292c0e2: Merge "Stop active media projections on user switch." into lmp-mr1-dev
* commit '
3292c0e2640667e5ef78896653a41c85e7de06c5':
Stop active media projections on user switch.
Luan Nguyen [Tue, 10 Feb 2015 21:10:39 +0000 (13:10 -0800)]
docs: Fix issue with onCreate() method declaration in file backup section
bug:
3180881
Change-Id: I9616ec0d559bfbce669c5afc5b1742f6f5271fa5
Luan Nguyen [Mon, 2 Feb 2015 20:17:40 +0000 (12:17 -0800)]
docs: Update device art generator to include Wear generic devices.
bug:
14617426
Change-Id: I1f693a908c6e8c8cf8cf612fefd8553754978639
Michael Wright [Wed, 11 Feb 2015 18:23:54 +0000 (18:23 +0000)]
Merge "Stop active media projections on user switch." into lmp-mr1-dev
Jeff Davidson [Wed, 11 Feb 2015 08:32:01 +0000 (08:32 +0000)]
am
50996a12: Merge "Do not enforce CONTROL_VPN for calls from lockdown VPN." into lmp-mr1-dev
* commit '
50996a12a8e859346d5eb3c4569c4e81c9b52a05':
Do not enforce CONTROL_VPN for calls from lockdown VPN.
Jeff Davidson [Wed, 11 Feb 2015 08:25:26 +0000 (08:25 +0000)]
Merge "Do not enforce CONTROL_VPN for calls from lockdown VPN." into lmp-mr1-dev
Jeff Davidson [Tue, 10 Feb 2015 18:02:11 +0000 (10:02 -0800)]
Do not enforce CONTROL_VPN for calls from lockdown VPN.
Clearly document which methods in Vpn.java are designed to be used to
service a Binder call, and which must therefore check permissions and
clear the calling identity, and which methods are designed for
internal use only and which therefore need not check permission.
Add a new startLegacyVpnPrivileged method which bypasses the
permission checks, to be used by lockdown VPN which is a trusted
system service. Ensure that the existing startLegacyVpn method checks
permissions as this is used whenever we respond to a binder call.
Bug:
19311172
Change-Id: I34f13258ee7481f1356bc523124cf5db068b4972
Lorenzo Colitti [Wed, 11 Feb 2015 07:24:37 +0000 (07:24 +0000)]
am
c38b90bb: Merge "Make getNetworkInfo() take into account VPN underlying networks." into lmp-mr1-dev
* commit '
c38b90bb6bc5efc5f07e69b86d10f76a1eaa9eb4':
Make getNetworkInfo() take into account VPN underlying networks.
Lorenzo Colitti [Wed, 11 Feb 2015 07:18:16 +0000 (07:18 +0000)]
Merge "Make getNetworkInfo() take into account VPN underlying networks." into lmp-mr1-dev
Shishir Agrawal [Wed, 11 Feb 2015 03:38:07 +0000 (03:38 +0000)]
am
64ce5f8f: GpsLocationProvider: Read data enabled status from TelephonyManager.
* commit '
64ce5f8fab077e4792737f86502d0e77ad6cbb0b':
GpsLocationProvider: Read data enabled status from TelephonyManager.
Shishir Agrawal [Wed, 11 Feb 2015 03:02:38 +0000 (19:02 -0800)]
GpsLocationProvider: Read data enabled status from TelephonyManager.
Bug:
18814559
Change-Id: I0333050d2a5b8d484466e1b1914dcfb9965398c9
Lorenzo Colitti [Tue, 10 Feb 2015 22:39:20 +0000 (07:39 +0900)]
Make reportInetCondition revalidate if the report differs from our state
1. If reportInetCondition says the network is not working, and
the network is already marked not validated, don't revalidate
it. This was superfluous and should save battery.
2. If reportInetCondition says the network is working, and the
network is not marked as validated, revalidated. This will
allow us to get out of a validated state quickly based on app
input (e.g., allowing GCM's exponential backoff timer to drive
revalidation instead of our 10-minute timer).
Bug:
19258761
Bug:
19209043
Change-Id: Iaa4bac82d117ed1f4088dab106e6f6ce46b34bc3
Lorenzo Colitti [Thu, 5 Feb 2015 04:57:17 +0000 (13:57 +0900)]
Make getNetworkInfo() take into account VPN underlying networks.
If a user is subject to a VPN, getActiveNetworkInfo() will return
the VPN's underlying network (e.g., TYPE_WIFI), so that apps that
call getActiveNetworkInfo to answer questions like "is the device
connected to wifi?" will continue to work. Make getNetworkInfo
do this as well: if the query is for a network type that is
underlying the current user's VPN, then return that network.
Bug:
19196545
Change-Id: Ic5a651735b927c758594a26d26a03fbd704b52e6
Leon Scroggins III [Tue, 10 Feb 2015 22:07:18 +0000 (22:07 +0000)]
am
3bb5fdc7: (-s ours) Merge "Check that bitmap\'s size does not exceed 32 bits. DO NOT MERGE" into lmp-mr1-dev
* commit '
3bb5fdc7e607febaad3bd41ed7a36b596b7286af':
Check that bitmap's size does not exceed 32 bits. DO NOT MERGE
Leon Scroggins III [Tue, 10 Feb 2015 22:03:43 +0000 (22:03 +0000)]
Merge "Check that bitmap's size does not exceed 32 bits. DO NOT MERGE" into lmp-mr1-dev
Leon Scroggins III [Mon, 9 Feb 2015 20:42:19 +0000 (15:42 -0500)]
Check that bitmap's size does not exceed 32 bits. DO NOT MERGE
BUG:
19270126
Change-Id: I075d1cefcd3208305a72b4fa629a262e92eb60ea
Shanea King-Roberson [Tue, 10 Feb 2015 20:29:02 +0000 (20:29 +0000)]
am
696b68c4: am
24513bc5: am
31622894: am
c86ac21f: Merge "Adding videos for 5.0 changes and watch face development." into lmp-docs
* commit '
696b68c4fc65b671a00cfa82e6bc29a7d665828e':
Adding videos for 5.0 changes and watch face development.
Shanea King-Roberson [Tue, 10 Feb 2015 20:17:53 +0000 (20:17 +0000)]
am
24513bc5: am
31622894: am
c86ac21f: Merge "Adding videos for 5.0 changes and watch face development." into lmp-docs
* commit '
24513bc580024a8a90c1ceab6746c0abb452d678':
Adding videos for 5.0 changes and watch face development.
Shanea King-Roberson [Tue, 10 Feb 2015 20:10:38 +0000 (20:10 +0000)]
am
31622894: am
c86ac21f: Merge "Adding videos for 5.0 changes and watch face development." into lmp-docs
* commit '
3162289445ebade804c422162578d328c4762372':
Adding videos for 5.0 changes and watch face development.
Luan Nguyen [Tue, 3 Feb 2015 17:58:34 +0000 (09:58 -0800)]
docs: Fix notification api guide issues (
7461154,
12765600)
bug:
7461154
bug:
12765600
Change-Id: Ib4aff7f6481a514bf01894cad4984fed09f015e2
Shanea King-Roberson [Tue, 10 Feb 2015 20:04:17 +0000 (20:04 +0000)]
am
c86ac21f: Merge "Adding videos for 5.0 changes and watch face development." into lmp-docs
* commit '
c86ac21f7393e579ad1585396ce3c212bf7d3bfb':
Adding videos for 5.0 changes and watch face development.
Chris Warrington [Tue, 10 Feb 2015 20:00:27 +0000 (20:00 +0000)]
am
510c24e8: Merge "Fix AAPT daemon mode with paths containg spaces." into lmp-mr1-dev
* commit '
510c24e8930447811f6725cbf7f3cefec2194a5d':
Fix AAPT daemon mode with paths containg spaces.
Shanea King-Roberson [Tue, 10 Feb 2015 19:57:29 +0000 (19:57 +0000)]
Merge "Adding videos for 5.0 changes and watch face development." into lmp-docs
Chris Warrington [Tue, 10 Feb 2015 19:56:31 +0000 (19:56 +0000)]
Merge "Fix AAPT daemon mode with paths containg spaces." into lmp-mr1-dev
Luan Nguyen [Tue, 10 Feb 2015 19:02:49 +0000 (19:02 +0000)]
am
18fc7b85: am
ba795593: am
9b432bbe: am
e49fbfa2: Merge "docs: Fix various issues with incorrect code samples." into lmp-docs
* commit '
18fc7b85543cd21317475962521606038cd44383':
docs: Fix various issues with incorrect code samples.
Luan Nguyen [Tue, 10 Feb 2015 18:56:32 +0000 (18:56 +0000)]
am
ba795593: am
9b432bbe: am
e49fbfa2: Merge "docs: Fix various issues with incorrect code samples." into lmp-docs
* commit '
ba795593e5941d89a861bb848c3f98800a0be3d6':
docs: Fix various issues with incorrect code samples.
Luan Nguyen [Tue, 10 Feb 2015 18:47:38 +0000 (18:47 +0000)]
am
9b432bbe: am
e49fbfa2: Merge "docs: Fix various issues with incorrect code samples." into lmp-docs
* commit '
9b432bbece3cca6316b2638a947983e21c65917f':
docs: Fix various issues with incorrect code samples.
Luan Nguyen [Tue, 10 Feb 2015 18:40:34 +0000 (18:40 +0000)]
am
e49fbfa2: Merge "docs: Fix various issues with incorrect code samples." into lmp-docs
* commit '
e49fbfa21ccdeba56001b48604524794acea119e':
docs: Fix various issues with incorrect code samples.
Luan Nguyen [Tue, 10 Feb 2015 18:31:29 +0000 (18:31 +0000)]
Merge "docs: Fix various issues with incorrect code samples." into lmp-docs
Eric Gilmore [Tue, 10 Feb 2015 18:29:36 +0000 (10:29 -0800)]
Adding videos for 5.0 changes and watch face development.
On branch pilot-videos
Changes to be committed:
modified: docs/html/about/versions/android-5.0-changes.jd
modified: docs/html/training/wearables/watch-faces/index.jd
Change-Id: I2dd852f3af8ae39f91ec08aadd5c03ff9996b46b
Eric Gilmore [Tue, 10 Feb 2015 18:12:14 +0000 (18:12 +0000)]
am
f35e8159: am
99b91b2f: am
c9dbaf04: Merge "Doc change: refactor GCM docs to be platform-agnostic." into lmp-docs automerge:
2b36779
* commit '
f35e815939d60863ec84fdd906d96279b652e33c':
Doc change: refactor GCM docs to be platform-agnostic.
Eric Gilmore [Tue, 10 Feb 2015 18:05:23 +0000 (18:05 +0000)]
am
99b91b2f: am
c9dbaf04: Merge "Doc change: refactor GCM docs to be platform-agnostic." into lmp-docs
automerge:
2b36779
* commit '
2b36779f30a511cc4439a519c95963280a779fdc':
Doc change: refactor GCM docs to be platform-agnostic.
Eric Gilmore [Tue, 10 Feb 2015 17:56:51 +0000 (17:56 +0000)]
am
99b91b2f: am
c9dbaf04: Merge "Doc change: refactor GCM docs to be platform-agnostic." into lmp-docs
* commit '
99b91b2fd28888b20511316cb6f81b510b05cdf5':
Doc change: refactor GCM docs to be platform-agnostic.
Eric Gilmore [Tue, 10 Feb 2015 17:45:47 +0000 (17:45 +0000)]
am
c9dbaf04: Merge "Doc change: refactor GCM docs to be platform-agnostic." into lmp-docs
* commit '
c9dbaf0483b0274879164806297180d260689f1f':
Doc change: refactor GCM docs to be platform-agnostic.
Luan Nguyen [Wed, 28 Jan 2015 17:30:28 +0000 (09:30 -0800)]
docs: Fix various issues with incorrect code samples.
bug:
15671968
Change-Id: I3219f9c5e492ee95257439d9f284120dadd277ac
John Spurlock [Tue, 10 Feb 2015 17:32:54 +0000 (17:32 +0000)]
am
618e420a: Doze: pulse less often.
* commit '
618e420adf2ab2478f62891738320bb9cc5260ec':
Doze: pulse less often.
John Spurlock [Tue, 10 Feb 2015 14:10:21 +0000 (09:10 -0500)]
Doze: pulse less often.
Remove the trailing pulse @ 2 minutes, and only allow 2 schedule resets.
Bug:
19330195
Change-Id: I492581c081fafd2a1e5e09f7cce08d7a14da6d6b
Chris Warrington [Tue, 10 Feb 2015 05:04:46 +0000 (21:04 -0800)]
Fix AAPT daemon mode with paths containg spaces.
Use new line as a delimiter rather than space.
Fixes: https://code.google.com/p/android/issues/detail?id=135757
Gradle CL: https://android-review.googlesource.com/130423
Change-Id: I7c73e680b0417b0e7cff9e0110822675c53ae20f
Svetoslav [Tue, 10 Feb 2015 02:51:21 +0000 (02:51 +0000)]
am
c73cfa0f: Accessibiltiy: missed update to the previous patch.
* commit '
c73cfa0ffba344a83d61e2f4eb9715152a2807b8':
Accessibiltiy: missed update to the previous patch.
Svetoslav [Tue, 10 Feb 2015 01:14:28 +0000 (17:14 -0800)]
Accessibiltiy: missed update to the previous patch.
Change-Id: I4c47d38f5e137dcc1c6db0561b3824a26572027d
Eric Gilmore [Tue, 10 Feb 2015 01:13:01 +0000 (01:13 +0000)]
Merge "Doc change: refactor GCM docs to be platform-agnostic." into lmp-docs
Baligh Uddin [Tue, 10 Feb 2015 01:05:27 +0000 (01:05 +0000)]
am
b2ba6dfc: Merge "Accessibility: Handle a missed case when clicking focused views." into lmp-mr1-dev
* commit '
b2ba6dfc7b33ec9e58d9f556206440a26069e264':
Accessibility: Handle a missed case when clicking focused views.
Baligh Uddin [Tue, 10 Feb 2015 00:57:19 +0000 (00:57 +0000)]
Merge "Accessibility: Handle a missed case when clicking focused views." into lmp-mr1-dev
kmccormick [Fri, 12 Dec 2014 23:00:37 +0000 (15:00 -0800)]
Doc change: refactor GCM docs to be platform-agnostic.
Fix for:
b/
17733410
Change-Id: I6dabe6d0985dac7cf280c780140339c6250ac6e2
Andre Eisenbach [Tue, 10 Feb 2015 00:26:58 +0000 (00:26 +0000)]
am
455502b7: Merge "Add API to check if a Bluetooth connection is encrypted (1/2)" into lmp-mr1-dev
* commit '
455502b7501bdbc55a739083878431c3ba7ef81a':
Add API to check if a Bluetooth connection is encrypted (1/2)
Andre Eisenbach [Tue, 10 Feb 2015 00:21:35 +0000 (00:21 +0000)]
Merge "Add API to check if a Bluetooth connection is encrypted (1/2)" into lmp-mr1-dev
Matthew Xie [Mon, 9 Feb 2015 21:58:26 +0000 (21:58 +0000)]
am
a63ba428: Merge "Separate the protection of mProxyServiceStateCallbacks from that of mService" into lmp-mr1-dev
* commit '
a63ba4287e5c87f41cd7d4b43111fd18f3ec499b':
Separate the protection of mProxyServiceStateCallbacks from that of mService
Matthew Xie [Mon, 9 Feb 2015 21:50:56 +0000 (21:50 +0000)]
Merge "Separate the protection of mProxyServiceStateCallbacks from that of mService" into lmp-mr1-dev
Daniel Sandler [Mon, 9 Feb 2015 20:48:59 +0000 (20:48 +0000)]
am
6e3de6a1: Merge "Added TEXT_CHANGED event to PasswordTextView" into lmp-mr1-dev
* commit '
6e3de6a19af1533a0661975b5440b7c922211d0a':
Added TEXT_CHANGED event to PasswordTextView
Daniel Sandler [Mon, 9 Feb 2015 20:43:37 +0000 (20:43 +0000)]
Merge "Added TEXT_CHANGED event to PasswordTextView" into lmp-mr1-dev
Amith Yamasani [Mon, 9 Feb 2015 20:04:43 +0000 (20:04 +0000)]
am
61333d1b: Merge "Limit cache update to packages that have changed" into lmp-mr1-dev
* commit '
61333d1b51ae36c9e5b1f4ea95bd00731c5e991a':
Limit cache update to packages that have changed
Amith Yamasani [Mon, 9 Feb 2015 19:59:26 +0000 (19:59 +0000)]
Merge "Limit cache update to packages that have changed" into lmp-mr1-dev
Rubin Xu [Mon, 9 Feb 2015 19:33:48 +0000 (19:33 +0000)]
am
3d521c0a: Merge "Perform post installation operations directly if backup manager is disabled" into lmp-mr1-dev
* commit '
3d521c0a0165dfef53e3c9d3d562bc0ec45405a8':
Perform post installation operations directly if backup manager is disabled
Andre Eisenbach [Fri, 6 Feb 2015 04:06:33 +0000 (20:06 -0800)]
Add API to check if a Bluetooth connection is encrypted (1/2)
Bug:
19186961
Change-Id: I24656a07ee23ebfe067a9dfb9c1bc4041c782d8c
Rubin Xu [Mon, 9 Feb 2015 19:25:18 +0000 (19:25 +0000)]
Merge "Perform post installation operations directly if backup manager is disabled" into lmp-mr1-dev