OSDN Git Service
Michael Wright [Wed, 11 Feb 2015 19:50:56 +0000 (19:50 +0000)]
am
40bd8f41: Merge "Stop active media projections on user switch." into lmp-mr1-dev automerge:
3292c0e
* commit '
40bd8f416b30b7b0eae244aa0c5aabd0be0d1c55':
Stop active media projections on user switch.
Michael Wright [Wed, 11 Feb 2015 18:33:00 +0000 (18:33 +0000)]
Merge "Stop active media projections on user switch." into lmp-mr1-dev
automerge:
3292c0e
* commit '
3292c0e2640667e5ef78896653a41c85e7de06c5':
Stop active media projections on user switch.
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:37:30 +0000 (08:37 +0000)]
am
46dbb5be: am
50996a12: Merge "Do not enforce CONTROL_VPN for calls from lockdown VPN." into lmp-mr1-dev
* commit '
46dbb5be4c56e8af603514a3cf2bd7daf0191724':
Do not enforce CONTROL_VPN for calls from lockdown VPN.
Jeff Davidson [Wed, 11 Feb 2015 08:30:44 +0000 (08:30 +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:33:10 +0000 (07:33 +0000)]
am
00c8450d: Merge "Make getNetworkInfo() take into account VPN underlying networks." into lmp-mr1-dev automerge:
c38b90b
* commit '
00c8450d2711de57ee45f66cae1050dbca98d1f5':
Make getNetworkInfo() take into account VPN underlying networks.
Lorenzo Colitti [Wed, 11 Feb 2015 07:24:50 +0000 (07:24 +0000)]
Merge "Make getNetworkInfo() take into account VPN underlying networks." into lmp-mr1-dev
automerge:
c38b90b
* 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:41:38 +0000 (03:41 +0000)]
am
6b274720: GpsLocationProvider: Read data enabled status from TelephonyManager. automerge:
64ce5f8
* commit '
6b274720c5a210c07256e5b9fc11a1e9aca59017':
GpsLocationProvider: Read data enabled status from TelephonyManager.
Shishir Agrawal [Wed, 11 Feb 2015 03:35:42 +0000 (03:35 +0000)]
GpsLocationProvider: Read data enabled status from TelephonyManager.
automerge:
64ce5f8
* 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 [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
Nick Vaccaro [Wed, 11 Feb 2015 00:15:15 +0000 (00:15 +0000)]
Merge "Update API to contain new wrist tilt sensor type and string." into lmp-mr1-modular-dev
Leon Scroggins III [Tue, 10 Feb 2015 22:13:43 +0000 (22:13 +0000)]
am
dc77ec59: am
3bb5fdc7: Merge "Check that bitmap\'s size does not exceed 32 bits. DO NOT MERGE" into lmp-mr1-dev
* commit '
dc77ec59beb23a2ff300d5048633687c0d68a0ac':
Check that bitmap's size does not exceed 32 bits. DO NOT MERGE
Leon Scroggins III [Tue, 10 Feb 2015 22:08:00 +0000 (22:08 +0000)]
am
3bb5fdc7: 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
Nick Vaccaro [Fri, 23 Jan 2015 23:09:45 +0000 (15:09 -0800)]
Update API to contain new wrist tilt sensor type and string.
Convert the wrist tilt sensor from being a vendor-defined sensor
type to being an official android sensor type.
Change-Id: I39807bdca4f4c853fa0f7e88e6d98c02245f2a8b
Shanea King-Roberson [Tue, 10 Feb 2015 20:37:39 +0000 (20:37 +0000)]
am
accf0770: am
24513bc5: am
31622894: am
c86ac21f: Merge "Adding videos for 5.0 changes and watch face development." into lmp-docs automerge:
696b68c
* commit '
accf0770306419773c3119eb32ca912077894b11':
Adding videos for 5.0 changes and watch face development.
Shanea King-Roberson [Tue, 10 Feb 2015 20:25:34 +0000 (20:25 +0000)]
am
24513bc5: am
31622894: am
c86ac21f: Merge "Adding videos for 5.0 changes and watch face development." into lmp-docs
automerge:
696b68c
* 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.
Chris Warrington [Tue, 10 Feb 2015 20:07:28 +0000 (20:07 +0000)]
am
44998887: am
510c24e8: Merge "Fix AAPT daemon mode with paths containg spaces." into lmp-mr1-dev
* commit '
449988872be61f273c91db13069d5b7172429032':
Fix AAPT daemon mode with paths containg spaces.
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:01:00 +0000 (20:01 +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:09:14 +0000 (19:09 +0000)]
am
6ee90183: am
18fc7b85: am
ba795593: am
9b432bbe: am
e49fbfa2: Merge "docs: Fix various issues with incorrect code samples." into lmp-docs
* commit '
6ee90183ab79f9c3b5216a9b0b6518de7679734a':
docs: Fix various issues with incorrect code samples.
Luan Nguyen [Tue, 10 Feb 2015 19:02:50 +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:20:44 +0000 (18:20 +0000)]
am
2b7f0cff: am
f35e8159: am
99b91b2f: am
c9dbaf04: Merge "Doc change: refactor GCM docs to be platform-agnostic." into lmp-docs automerge:
2b36779
* commit '
2b7f0cff1eebdb56a0c09bf5aec712df45147e25':
Doc change: refactor GCM docs to be platform-agnostic.
Eric Gilmore [Tue, 10 Feb 2015 18:12:47 +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.
John Spurlock [Tue, 10 Feb 2015 17:40:40 +0000 (17:40 +0000)]
am
43c7741c: Doze: pulse less often. automerge:
618e420
* commit '
43c7741c28c39aa4f5be1252af67c8b1e7bd84c3':
Doze: pulse less often.
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:27 +0000 (17:32 +0000)]
Doze: pulse less often.
automerge:
618e420
* 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 03:01:50 +0000 (03:01 +0000)]
am
5521f39f: am
c73cfa0f: Accessibiltiy: missed update to the previous patch.
* commit '
5521f39ff75d2af909061581e27810afaa9ed242':
Accessibiltiy: missed update to the previous patch.
Svetoslav [Tue, 10 Feb 2015 02:51:30 +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
Baligh Uddin [Tue, 10 Feb 2015 01:17:42 +0000 (01:17 +0000)]
am
fbf9666f: am
b2ba6dfc: Merge "Accessibility: Handle a missed case when clicking focused views." into lmp-mr1-dev
* commit '
fbf9666f846284ee1d4d09e2d36f0d2b92120656':
Accessibility: Handle a missed case when clicking focused views.
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:07:08 +0000 (01:07 +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
Andre Eisenbach [Tue, 10 Feb 2015 00:34:43 +0000 (00:34 +0000)]
am
3ca77ccf: am
455502b7: Merge "Add API to check if a Bluetooth connection is encrypted (1/2)" into lmp-mr1-dev
* commit '
3ca77ccf873f12e116a66d1c1a417fe89f75af85':
Add API to check if a Bluetooth connection is encrypted (1/2)
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:51 +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 22:07:50 +0000 (22:07 +0000)]
am
d67aff68: am
a63ba428: Merge "Separate the protection of mProxyServiceStateCallbacks from that of mService" into lmp-mr1-dev
* commit '
d67aff686d467c439970aef4a57a29838bf005c2':
Separate the protection of mProxyServiceStateCallbacks from that of mService
Matthew Xie [Mon, 9 Feb 2015 21:59:13 +0000 (21:59 +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:55:51 +0000 (20:55 +0000)]
am
96ac73c3: am
6e3de6a1: Merge "Added TEXT_CHANGED event to PasswordTextView" into lmp-mr1-dev
* commit '
96ac73c357a55cada4f22d9a0a4a406c0cb624d2':
Added TEXT_CHANGED event to PasswordTextView
Daniel Sandler [Mon, 9 Feb 2015 20:49:43 +0000 (20:49 +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:29:39 +0000 (20:29 +0000)]
am
d09878c1: am
61333d1b: Merge "Limit cache update to packages that have changed" into lmp-mr1-dev
* commit '
d09878c13c392b81633f4f748a85718cebd9f325':
Limit cache update to packages that have changed
Amith Yamasani [Mon, 9 Feb 2015 20:05:32 +0000 (20:05 +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:41:19 +0000 (19:41 +0000)]
am
df608e39: am
3d521c0a: Merge "Perform post installation operations directly if backup manager is disabled" into lmp-mr1-dev
* commit '
df608e39b35e37490f8752b0902d9894f8d8940b':
Perform post installation operations directly if backup manager is disabled
Rubin Xu [Mon, 9 Feb 2015 19:33:19 +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
Amith Yamasani [Fri, 6 Feb 2015 22:41:40 +0000 (14:41 -0800)]
Limit cache update to packages that have changed
When updating the RegisteredServicesCache, don't remove any packages
that are not in the list of modified packages.
Bug:
19228972
Change-Id: Id4f264403b7ceca9005854dfbbc25abfd7b54889
Adrian Roos [Mon, 9 Feb 2015 16:30:40 +0000 (16:30 +0000)]
am
4e4c37a2: am
991db77a: Only request IME if password view is showing
* commit '
4e4c37a2da064cf0d4bbd508a186a6c44563d966':
Only request IME if password view is showing
Adrian Roos [Mon, 9 Feb 2015 16:07:32 +0000 (16:07 +0000)]
am
991db77a: Only request IME if password view is showing
* commit '
991db77a44f3352a8cf6351f79cad67bf955e4e4':
Only request IME if password view is showing
Geoff Mendal [Mon, 9 Feb 2015 16:07:09 +0000 (16:07 +0000)]
am
fba2dcc0: (-s ours) Import translations. DO NOT MERGE
* commit '
fba2dcc023c9fb5d215fb66528d7d9d69ba80971':
Import translations. DO NOT MERGE
Adrian Roos [Thu, 15 Jan 2015 18:57:51 +0000 (19:57 +0100)]
Added TEXT_CHANGED event to PasswordTextView
Also creates a TextView-like accessibility node
and populates accessibility events with text if
required.
Bug:
18528774
Change-Id: I4a918a092b1e97879c31f54604cf957e01f4bc86
Rubin Xu [Mon, 9 Feb 2015 11:29:37 +0000 (11:29 +0000)]
Perform post installation operations directly if backup manager is disabled
bug:
19312753
Change-Id: I4acdd1e3af6a6be0c51affc42de167993c736b2f
Geoff Mendal [Mon, 9 Feb 2015 14:53:05 +0000 (06:53 -0800)]
Import translations. DO NOT MERGE
Change-Id: I37f95c49e5696a1aed7c2eb5ff75798571116c8a
Auto-generated-cl: translation import
Adrian Roos [Fri, 6 Feb 2015 13:30:46 +0000 (14:30 +0100)]
Only request IME if password view is showing
Bug:
19250277
Change-Id: I881b08ebc6900ba43289b772ed0d039dbb62149c
Zhijun He [Sun, 8 Feb 2015 21:12:44 +0000 (21:12 +0000)]
am
f7f13110: Merge "camera-metadata: clarify the AE precapture trigger spec" into lmp-mr1-dev automerge:
07c745b
* commit '
f7f131105d479d30b53b2366e29278fd09f36065':
camera-metadata: clarify the AE precapture trigger spec
Zhijun He [Sun, 8 Feb 2015 21:04:38 +0000 (21:04 +0000)]
Merge "camera-metadata: clarify the AE precapture trigger spec" into lmp-mr1-dev
automerge:
07c745b
* commit '
07c745b525d39309a9ea93605fb5f85c295502f1':
camera-metadata: clarify the AE precapture trigger spec
Zhijun He [Sun, 8 Feb 2015 17:38:02 +0000 (17:38 +0000)]
Merge "camera-metadata: clarify the AE precapture trigger spec" into lmp-mr1-dev
Svet Ganov [Sat, 7 Feb 2015 03:23:31 +0000 (19:23 -0800)]
Accessibility: Handle a missed case when clicking focused views.
The special logic for clicking on views in accessibility mode should not
prevent event interception and if a view interceptes the gesture we must
clear the special flag and do normal event dispatch. Also once we have a
view handling the touch gesture we do not need the special flag as we
know what will handle the event. This tightly follows standard event
dispatching.
bug:
19252492
Change-Id: I0c9764c5050ec73f5f7980f3f0340dd9509a725a
Zhijun He [Fri, 6 Feb 2015 21:49:51 +0000 (13:49 -0800)]
camera-metadata: clarify the AE precapture trigger spec
Doc only change.
Bug:
19301706
Change-Id: I8f94ee5ace6dd3040ee2f350d589e24e53694f1b
Joe Fernandez [Sat, 7 Feb 2015 01:47:32 +0000 (01:47 +0000)]
am
a8b341cd: am
5ac30e10: am
66c06cf9: am
d224fb8a: am
ba20f98c: Merge "docs: remove + annotations in version references" into lmp-docs
* commit '
a8b341cdf00e169beb944c0205c98977f835424e':
docs: remove + annotations in version references
Joe Fernandez [Sat, 7 Feb 2015 01:22:13 +0000 (01:22 +0000)]
am
5ac30e10: am
66c06cf9: am
d224fb8a: am
ba20f98c: Merge "docs: remove + annotations in version references" into lmp-docs
* commit '
5ac30e10ab484fdb7ba3c56b8c162a9061601f8e':
docs: remove + annotations in version references
Joe Fernandez [Sat, 7 Feb 2015 01:13:52 +0000 (01:13 +0000)]
am
66c06cf9: am
d224fb8a: am
ba20f98c: Merge "docs: remove + annotations in version references" into lmp-docs
* commit '
66c06cf9bb4fa3ba1477e120843e8fdb8a360e4e':
docs: remove + annotations in version references
Joe Fernandez [Sat, 7 Feb 2015 01:08:46 +0000 (01:08 +0000)]
am
d224fb8a: am
ba20f98c: Merge "docs: remove + annotations in version references" into lmp-docs
* commit '
d224fb8a6c86b0c26c5db570cead5f19ff7133bd':
docs: remove + annotations in version references
Joe Fernandez [Sat, 7 Feb 2015 01:00:53 +0000 (01:00 +0000)]
am
ba20f98c: Merge "docs: remove + annotations in version references" into lmp-docs
* commit '
ba20f98c88b754b3a69d55963275e20ab2fba6bf':
docs: remove + annotations in version references
Joe Fernandez [Sat, 7 Feb 2015 00:55:16 +0000 (00:55 +0000)]
Merge "docs: remove + annotations in version references" into lmp-docs
Bryce Lee [Sat, 7 Feb 2015 00:32:25 +0000 (00:32 +0000)]
Merge "Allow single press of physical button to go home without sleeping." into lmp-mr1-modular-dev
Svet Ganov [Fri, 6 Feb 2015 23:58:52 +0000 (23:58 +0000)]
am
ff9b2525: am
34123f1c: Merge "Accessibility: ignore children of a view with node provider." into lmp-mr1-dev
* commit '
ff9b2525db61d4c175d9d61a0847586001cd4a11':
Accessibility: ignore children of a view with node provider.
Svet Ganov [Fri, 6 Feb 2015 23:58:49 +0000 (23:58 +0000)]
am
41daba00: am
060bca74: Merge "Accessibility: Handle a missed case when clicking focused views." into lmp-mr1-dev
* commit '
41daba0052f4a9146aad4977da9eccf3c72450ce':
Accessibility: Handle a missed case when clicking focused views.
Bryce Lee [Fri, 6 Feb 2015 23:05:04 +0000 (23:05 +0000)]
Merge "Add voice assist action for global actions." into lmp-mr1-modular-dev
Matthew Xie [Fri, 6 Feb 2015 22:09:54 +0000 (14:09 -0800)]
Separate the protection of mProxyServiceStateCallbacks from that of mService
The overuse of mManagerCallback caused a deaklock.
Bug:
19264190
Change-Id: Iff20019ff0c99bb5f36435feb15e43e280a8e102
Michael Wright [Fri, 6 Feb 2015 22:08:13 +0000 (14:08 -0800)]
Stop active media projections on user switch.
Bug:
19278080
Change-Id: I63cc8aa12954d4de257b793967d3845a6f86dc3f
Svet Ganov [Fri, 6 Feb 2015 21:51:15 +0000 (21:51 +0000)]
am
34123f1c: Merge "Accessibility: ignore children of a view with node provider." into lmp-mr1-dev
* commit '
34123f1ce83e39a5a6045b1a90a148cd4c514e7e':
Accessibility: ignore children of a view with node provider.
Svet Ganov [Fri, 6 Feb 2015 21:51:11 +0000 (21:51 +0000)]
am
060bca74: Merge "Accessibility: Handle a missed case when clicking focused views." into lmp-mr1-dev
* commit '
060bca7444b8bf34fa95a6a71daf72fa8a85d78e':
Accessibility: Handle a missed case when clicking focused views.
Svet Ganov [Fri, 6 Feb 2015 21:48:05 +0000 (21:48 +0000)]
Merge "Accessibility: ignore children of a view with node provider." into lmp-mr1-dev
Svet Ganov [Fri, 6 Feb 2015 21:46:24 +0000 (21:46 +0000)]
Merge "Accessibility: Handle a missed case when clicking focused views." into lmp-mr1-dev
Svet Ganov [Fri, 6 Feb 2015 20:41:17 +0000 (12:41 -0800)]
Accessibility: ignore children of a view with node provider.
A view that has an accessibility node provider should not have real children
since the provider is responsible to generate the node infos for the subtree
rooted at its hosting view. This is how the APIs are designed to work. However,
it is a common mistake and if this occurs the accessibility services
introspecting the screen get into an infinite loop.
The framework now does not add the real children of a view with a node provider
to the list of accessibility children. If the developer wants them exposed they
have to do that via the provider APIs as per contract.
bug:
19297093
Change-Id: I1b01b1e4a85e1c397886fcd2506b434beb063687
OSDN Git Service
