OSDN Git Service
Craig Mautner [Tue, 27 Jan 2015 19:44:59 +0000 (11:44 -0800)]
Defer tap outside stack until multiwindows
Taps outside of the stack boundary were causing the current app to
lose focus. This led to timeouts waiting for the app to respond.
Disabling the tap recognition keeps the focus from changing. It will
be reenabled for multiwindows.
Fixes bug
17721767.
Change-Id: Iad854b19979390e73b97239e489ad7ef82e03d47
Matthew Xie [Fri, 23 Jan 2015 04:13:17 +0000 (20:13 -0800)]
Delay the second message for 30ms more than the last message for a2dp
In function setBluetoothA2dpDeviceConnectionState, current code calculate
the delay of the second state update message to be exactly the same as the
last delayed messages. This causes a problem that the sequence of the
messages may be altered.
Bug:
19036411
Change-Id: I35762873fd3341ec098dd229ac96bd42d6f34195
The Android Automerger [Tue, 27 Jan 2015 14:10:03 +0000 (06:10 -0800)]
merge in lmp-mr1-release history after reset to lmp-mr1-dev
Lorenzo Colitti [Tue, 27 Jan 2015 11:41:08 +0000 (11:41 +0000)]
Merge "Make NetworkMonitor less aggressive on broken networks." into lmp-mr1-dev
Svetoslav [Tue, 27 Jan 2015 04:24:07 +0000 (04:24 +0000)]
Merge "Add a missing file to print spooler resources" into lmp-mr1-dev
Svetoslav [Tue, 27 Jan 2015 04:23:43 +0000 (04:23 +0000)]
Merge "Accessibility: Ignore overlapping siblings when computing a click location" into lmp-mr1-dev
Jose Lima [Tue, 27 Jan 2015 02:53:21 +0000 (02:53 +0000)]
Merge "Allow disabling the Options Pannel feature for TVs" into lmp-mr1-dev
Jose Lima [Sat, 24 Jan 2015 01:24:22 +0000 (17:24 -0800)]
Allow disabling the Options Pannel feature for TVs
- Added a config entry in velues-television to disable the options panel
feature for TVs.
- Fixed parts of the code in PhoneWindow that assumed this feature is supposed
to always be available, which was causing exceptions when it was turned off.
Bug:
18780696
Change-Id: I923bd4b5019d634e5352a6e893005133edb475f6
Craig Mautner [Tue, 27 Jan 2015 01:15:34 +0000 (01:15 +0000)]
Merge "Stop logging service starts and stops." into lmp-mr1-dev
Wonsik Kim [Tue, 27 Jan 2015 01:12:32 +0000 (01:12 +0000)]
Merge "TIF: fix loud volume after input switch when volume is 0" into lmp-mr1-dev
Chris Craik [Tue, 27 Jan 2015 01:08:53 +0000 (01:08 +0000)]
Merge "Invalidate outline on padding update" into lmp-mr1-dev
Wonsik Kim [Mon, 26 Jan 2015 08:28:55 +0000 (17:28 +0900)]
TIF: fix loud volume after input switch when volume is 0
Bug:
19134440
Change-Id: I6291f299a27315e79b505ea36bf96c79437e6b53
Alan Viverette [Tue, 27 Jan 2015 01:01:55 +0000 (01:01 +0000)]
Merge "Convert getHourForDegrees result to 12-hour format when needed" into lmp-mr1-dev
Alan Viverette [Mon, 26 Jan 2015 23:34:56 +0000 (15:34 -0800)]
Convert getHourForDegrees result to 12-hour format when needed
Also prevents the selector from jumping between the inner and outer
circle during touch exploration in 24-hour mode.
Bug:
19101918
Change-Id: If342056b378927397f8651dad5e8d806bcda03a6
Craig Mautner [Mon, 26 Jan 2015 17:47:33 +0000 (09:47 -0800)]
Add reason string for bringing stack to front
Additional debug and useful information.
Also removed am_resume_activity verbosity and refactored method to
eliminate unused parameter.
For bug
17721767.
Change-Id: Ie1c0652a38a0c6ae6db27a52a9e5da29e252e300
Chris Craik [Mon, 26 Jan 2015 22:39:11 +0000 (14:39 -0800)]
Invalidate outline on padding update
bug:
19113359
Ensures that ViewOutlineProvider#PADDED_BOUNDS is always kept up to
date with the view's padding.
Change-Id: I5e090bd8272e89d6b8b9055dbe95ef3d45333fcb
Craig Mautner [Mon, 26 Jan 2015 22:33:39 +0000 (14:33 -0800)]
Stop logging service starts and stops.
Completes work on bug
18201239.
Change-Id: I80686351ac91e48bf113976a000b351b423d8dd2
Lorenzo Colitti [Mon, 26 Jan 2015 22:08:16 +0000 (22:08 +0000)]
Merge "Only try to fetch time from NTP if there is a network connection." into lmp-mr1-dev
Yorke Lee [Mon, 26 Jan 2015 21:47:55 +0000 (21:47 +0000)]
Merge "Update system-api for new getLine1Number() method." into lmp-mr1-dev
Nancy Chen [Mon, 26 Jan 2015 20:35:35 +0000 (12:35 -0800)]
Update system-api for new getLine1Number() method.
Add new method in TelecomManager to system-current.txt.
Bug:
19087382
Change-Id: Id6db61fed45301cc1a15ded6e362d7858f24a273
Sarah Maddox [Mon, 26 Jan 2015 20:35:06 +0000 (20:35 +0000)]
am
83f40802: am
95226c98: am
912cacde: Merge "docs: Adds new geocoding sample to Location API training. Uses GoogleApiClient to connect to Play services. Uses the latest Fused Location Provider API." into lmp-docs
* commit '
83f40802148e922d78222ffc56377534b8ee92be':
docs: Adds new geocoding sample to Location API training. Uses GoogleApiClient to connect to Play services. Uses the latest Fused Location Provider API.
Sarah Maddox [Mon, 26 Jan 2015 20:30:14 +0000 (20:30 +0000)]
am
95226c98: am
912cacde: Merge "docs: Adds new geocoding sample to Location API training. Uses GoogleApiClient to connect to Play services. Uses the latest Fused Location Provider API." into lmp-docs
* commit '
95226c981b4e14a900f7c4224534d370aeb1ca60':
docs: Adds new geocoding sample to Location API training. Uses GoogleApiClient to connect to Play services. Uses the latest Fused Location Provider API.
Sarah Maddox [Mon, 26 Jan 2015 20:23:25 +0000 (20:23 +0000)]
am
912cacde: Merge "docs: Adds new geocoding sample to Location API training. Uses GoogleApiClient to connect to Play services. Uses the latest Fused Location Provider API." into lmp-docs
* commit '
912cacde8619d28ea1d4a3f6ebf30be1c8a5d47a':
docs: Adds new geocoding sample to Location API training. Uses GoogleApiClient to connect to Play services. Uses the latest Fused Location Provider API.
Sarah Maddox [Mon, 26 Jan 2015 20:12:21 +0000 (20:12 +0000)]
Merge "docs: Adds new geocoding sample to Location API training. Uses GoogleApiClient to connect to Play services. Uses the latest Fused Location Provider API." into lmp-docs
Craig Mautner [Mon, 26 Jan 2015 20:05:44 +0000 (20:05 +0000)]
Merge "Add reason string for bringing stack to front" into lmp-mr1-dev
Ricardo Cervera [Mon, 26 Jan 2015 19:51:53 +0000 (19:51 +0000)]
am
df07000e: am
d064ce7e: am
edb7a442: Merge "docs: Wear DataItem listener improvements" into lmp-docs
* commit '
df07000e356dee84de9f4dcdd22a15e26e32f684':
docs: Wear DataItem listener improvements
Ricardo Cervera [Mon, 26 Jan 2015 19:45:33 +0000 (19:45 +0000)]
am
d064ce7e: am
edb7a442: Merge "docs: Wear DataItem listener improvements" into lmp-docs
* commit '
d064ce7e8b4ef75c07b99d466c85ea55ef2f4163':
docs: Wear DataItem listener improvements
Nancy Chen [Mon, 26 Jan 2015 19:44:53 +0000 (19:44 +0000)]
Merge "Add method in TelecomManager to return line1Number for a PhoneAccount." into lmp-mr1-dev
Ricardo Cervera [Mon, 26 Jan 2015 19:39:48 +0000 (19:39 +0000)]
am
edb7a442: Merge "docs: Wear DataItem listener improvements" into lmp-docs
* commit '
edb7a4420bfbf3e7f9efc06718b45c56bbd3dc2d':
docs: Wear DataItem listener improvements
Ricardo Cervera [Mon, 26 Jan 2015 19:32:12 +0000 (19:32 +0000)]
Merge "docs: Wear DataItem listener improvements" into lmp-docs
Alan Viverette [Mon, 26 Jan 2015 19:16:39 +0000 (19:16 +0000)]
Merge "Prevent drag-to-open from cycling pressed state, propagate hotspot" into lmp-mr1-dev
Sarah Maddox [Sun, 30 Nov 2014 22:08:26 +0000 (09:08 +1100)]
docs: Adds new geocoding sample to Location API training.
Uses GoogleApiClient to connect to Play services.
Uses the latest Fused Location Provider API.
Bug:
17109822
Change-Id: I96dbf348e9ae41dbbeb075e6540620afc304d3b6
Craig Mautner [Mon, 26 Jan 2015 17:47:33 +0000 (09:47 -0800)]
Add reason string for bringing stack to front
Additional debug and useful information.
Also removed am_resume_activity verbosity and refactored method to
eliminate unused parameter.
For bug
17721767.
Change-Id: Ie1c0652a38a0c6ae6db27a52a9e5da29e252e300
Mike Lockwood [Mon, 26 Jan 2015 18:52:38 +0000 (18:52 +0000)]
Merge "MTP: Fix partial implementation of 5 new audio specific properties" into lmp-mr1-dev
Alan Viverette [Mon, 26 Jan 2015 18:24:08 +0000 (10:24 -0800)]
Prevent drag-to-open from cycling pressed state, propagate hotspot
Avoids unnecessary changes to pressed state. Ensures hotspot propagates
to both the list view and the list item view since both receive the
pressed state.
Bug:
19134424
Change-Id: If2496ce2042e43fe1c1efd527eeca10dc53e1f4a
Geoff Mendal [Mon, 26 Jan 2015 14:16:38 +0000 (08:16 -0600)]
Import translations. DO NOT MERGE
Change-Id: If6bad1c33638d232a6f320637ac0e13c8a67adfb
Auto-generated-cl: translation import
The Android Automerger [Mon, 26 Jan 2015 14:11:00 +0000 (06:11 -0800)]
merge in lmp-mr1-release history after reset to lmp-mr1-dev
Alexandra Gherghina [Mon, 26 Jan 2015 11:59:20 +0000 (11:59 +0000)]
Merge "Update badge assets" into lmp-mr1-dev
Benjamin Franz [Mon, 26 Jan 2015 10:49:47 +0000 (10:49 +0000)]
Merge "Avoid NullPointerException if createUser returns null" into lmp-mr1-dev
Alexandra Gherghina [Mon, 26 Jan 2015 09:36:48 +0000 (09:36 +0000)]
Update badge assets
Bug:
18829152
Change-Id: I26936dc528b8d56e37eb02fa04177ad3f225b007
Zoltan Szatmary-Ban [Mon, 26 Jan 2015 10:36:12 +0000 (10:36 +0000)]
Merge "Ensure notifications are sent when locking/unlocking location share" into lmp-mr1-dev
Lorenzo Colitti [Thu, 22 Jan 2015 13:36:50 +0000 (22:36 +0900)]
Make NetworkMonitor less aggressive on broken networks.
1. Retry validation 3 times instead of 10.
Reducing the number of retries speeds up dead network detection
and saves battery on networks that are don't have Internet access
(or block our connectivity checks).
Retrying 10 times is overkill. Each attempt sends 5-10 DNS
requests, waits 10 seconds to transfer only 3 or 4 packets, and
can last up to tens of seconds. Also, in MR1 we now retry every
10 minutes.
2. Make periodic revalidation only try once.
When validating periodically to see if a non-working connection
is working again, only make one attempt every 10 minutes, not
three.
3. Rename "retries" to "attempts" to make things a bit clearer.
Bug:
18922569
Bug:
18869302
Change-Id: I5f70b420c4f1bac0c33bb9ab6afb322902cdac4b
Lorenzo Colitti [Thu, 22 Jan 2015 13:35:33 +0000 (22:35 +0900)]
Only try to fetch time from NTP if there is a network connection.
Bug:
19046107
Change-Id: Iff647ee33fe0eb9b530d7baad636d32b386e4fa7
Nancy Chen [Sun, 25 Jan 2015 07:30:27 +0000 (23:30 -0800)]
Add method in TelecomManager to return line1Number for a PhoneAccount.
Since we do not want to expose SubIds in the app layer, we need a
wrapper to extra the subId from a PhoneAccount and return the
value of TelephonyManager#line1Number.
Also update error strings to be more consistent.
Bug:
19087382
Change-Id: Ie5a474d45336921d1007b36a4d26cd4da68f8b91
Svetoslav [Sat, 24 Jan 2015 01:50:28 +0000 (17:50 -0800)]
Add a missing file to print spooler resources
bug:
19120603
Change-Id: Id33c77696a47ef48b0095fd8289f92d7bba71f19
Svetoslav [Sat, 24 Jan 2015 00:06:43 +0000 (16:06 -0800)]
Accessibility: Ignore overlapping siblings when computing a click location
To click a view we were computing a click location by ignoring overlapping
views that are actionable. However, detection whether a view is actionable
is not always possible as the view may handle touch events directly. This
leads to unhandled edge cases. We are taking a conservative approach and
ignore all overlapping siblings regardless if clickable. This is also has
limitations but hopefully less frequent edge cases.
bug:
18889611
Change-Id: Icea0b7b3e2d4ed53e50e01cb6a99b880be560b14
Sanket Padawe [Fri, 23 Jan 2015 23:54:46 +0000 (23:54 +0000)]
Merge "Remove entries from config_tether_apndata for some carriers." into lmp-mr1-dev
Svetoslav [Fri, 23 Jan 2015 22:40:52 +0000 (14:40 -0800)]
Accessibility: Sometimes cannot interact with nav bar items.
If there is a window with the accessibility focus we want to click
on the accessibility focused view in this window. The logic to
compute the bounds of the window was using the wrong window id,
hence getting an incorrect result. As a consequence in some cases
the user could not click on accessiiblity focused controls in the
nav bar.
bug:
18889611
Change-Id: I89aee3ae2ffe27fe29819049c287a7155154c65b
Svetoslav [Fri, 23 Jan 2015 22:22:17 +0000 (22:22 +0000)]
Merge "Accessibilty: Cannot click on views in a scrollable container covered by the toolbar." into lmp-mr1-dev
Jinsuk Kim [Fri, 23 Jan 2015 21:10:37 +0000 (21:10 +0000)]
Merge "CEC: Handles initiation of press-and-hold correctly" into lmp-mr1-dev
John Reck [Fri, 23 Jan 2015 20:24:56 +0000 (20:24 +0000)]
Merge "Prevent memory corruption from use-after-free" into lmp-mr1-dev
Miao Wang [Fri, 23 Jan 2015 17:41:04 +0000 (09:41 -0800)]
[RenderScript] Allow U8_2 & U8_3 input allocation for Histogram
Intrinsic
Bug:
19035242
Bug:
19124958
Change-Id: I9e806d7a0786e728c5f23607dc67ca5d755e12ed
Miao Wang [Fri, 23 Jan 2015 19:17:11 +0000 (19:17 +0000)]
Merge "[RenderScript] Allow U8_2 & U8_3 input allocation for Histogram Intrinsic" into lmp-mr1-dev
Miao Wang [Fri, 23 Jan 2015 17:41:04 +0000 (09:41 -0800)]
[RenderScript] Allow U8_2 & U8_3 input allocation for Histogram
Intrinsic
Bug:
19035242
Bug:
19124958
Change-Id: I9e806d7a0786e728c5f23607dc67ca5d755e12ed
John Reck [Fri, 23 Jan 2015 18:57:15 +0000 (10:57 -0800)]
Prevent memory corruption from use-after-free
Bug:
19035637
If an app tries to call recycle() on a Bitmap that has
already been finalized it will result in use-after-frees. This is
bad. Avoid this by setting the pointer to 0 and checking for this
Change-Id: I12d73703a0f95b05fe4c2fd8e9c01b6a3f2f023b
Mike Lockwood [Fri, 23 Jan 2015 18:50:08 +0000 (10:50 -0800)]
MTP: Fix partial implementation of 5 new audio specific properties
In change Ic5b3fb75309893caae1a4f4b56068a543847f1f7, we added partial
support for the MTP properties:
MTP_PROPERTY_AUDIO_WAVE_CODE,
MTP_PROPERTY_BITRATE_TYPE
MTP_PROPERTY_AUDIO_BITRATE
MTP_PROPERTY_NUMBER_OF_CHANNELS
MTP_PROPERTY_SAMPLE_RATE
However we were not returning any values for these properties in the result
of the MTP GetObjectPropList command. Strangely, this triggers a nasty bug
in Windows 7 that results in data loss. When copying a directory containing
several MP3 files from one location on the device to another, Windows will
copy only some of the files to the new location, but delete all of the originals.
Finishing the implementation of these new object properties for some unknown
reason stops this bad behavior in Windows 7.
Bug:
19018427
Change-Id: I5fd3b91a89b31827d3100686445cef6795fe0f3f
Chet Haase [Fri, 23 Jan 2015 17:56:57 +0000 (17:56 +0000)]
Merge "Allow infinite-repeat zero-duration animators to continue repeating" into lmp-mr1-dev
Prerepa Viswanadham [Fri, 16 Jan 2015 18:40:11 +0000 (10:40 -0800)]
Don't compute flags length for scan response
Bug
19041626
Change-Id: I7d8aa12e133477fc60d12b474f57313961021975
Benjamin Franz [Fri, 23 Jan 2015 15:32:30 +0000 (15:32 +0000)]
Avoid NullPointerException if createUser returns null
If createUser returns null, we run into a NullPointerException
in createAndInitializeUser. This can happen when the policy
DISALLOW_ADD_USER is set.
Bug:
19121141
Change-Id: Id4bda832a243fa42c31eb5a176ecaa248aee68f5
Christoph Studer [Fri, 23 Jan 2015 16:51:45 +0000 (16:51 +0000)]
Merge "SysUI: Don't drop HUN notification when clicked" into lmp-mr1-dev
Benjamin Franz [Fri, 23 Jan 2015 14:33:04 +0000 (14:33 +0000)]
Merge "Avoid SecurityException when calling getUserData" into lmp-mr1-dev
Zoltan Szatmary-Ban [Fri, 16 Jan 2015 12:36:29 +0000 (12:36 +0000)]
Ensure notifications are sent when locking/unlocking location share
When the restriction 'DISALLOW_SHARE_LOCATION' is applied or removed on a user
it is important to send out notifications to content observers of
LOCATION_PROVIDERS_ALLOWED.
Bug:
18995405
Change-Id: I8b3910a423a012ea9d15470eec101723c9f0eaf7
Lorenzo Colitti [Fri, 23 Jan 2015 12:50:31 +0000 (12:50 +0000)]
Merge "Support connecting to networks with misconfigured subnet masks." into lmp-mr1-dev
Lorenzo Colitti [Tue, 20 Jan 2015 06:53:02 +0000 (15:53 +0900)]
Support connecting to networks with misconfigured subnet masks.
In K and earlier, we would connect to a network where the gateway
was not covered by the subnet mask of the IP address. This is an
invalid configuration, but it used to work, and other OSes appear
to accept it too, so support it.
Bug:
19067207
Change-Id: I822e1d754b336691b675438eefa959a3d75fd07b
Jinsuk Kim [Fri, 23 Jan 2015 06:39:00 +0000 (15:39 +0900)]
CEC: Handles initiation of press-and-hold correctly
Previously the time gap between the first and the second key event
for repeated keys(press-and-hold) can be bigger than the threshold,
which violates CEC spec. This CL rectifies it by managing its own
state rather than relying on Android key handler.
Bug:
19117830
Change-Id: Iedfa48f9ab826252e8616d1c3b7491e8b8333c81
Jinsuk Kim [Fri, 23 Jan 2015 08:13:28 +0000 (17:13 +0900)]
Fix broken build
Updated system-current.txt
Change-Id: I1f80d5543f0a828cf59d50d1271916a1210674d3
Jinsuk Kim [Fri, 23 Jan 2015 06:51:57 +0000 (06:51 +0000)]
Merge "CEC: Add logic to return to internal source" into lmp-mr1-dev
Lorenzo Colitti [Fri, 23 Jan 2015 05:57:37 +0000 (05:57 +0000)]
Merge "Use the proper IpPrefix and LinkAddress constructors in VPN code." into lmp-mr1-dev
Craig Mautner [Thu, 22 Jan 2015 22:28:03 +0000 (14:28 -0800)]
Even more debug for bug
17721767.
This time adding events for stack movement and focus change.
Change-Id: Icdff9763ac2daf85c615992fa2c8e418e907908c
Lorenzo Colitti [Tue, 20 Jan 2015 04:40:58 +0000 (13:40 +0900)]
Use the proper IpPrefix and LinkAddress constructors in VPN code.
This simplifies the code, and also makes it possible for
users to point multicast routes at the VPN. The LinkAddress
objects we were previously using to construct the RouteInfo do
not accept these, but IpPrefix objects do.
Bug:
18485968
Change-Id: Ie914a2eb359b78161810ee473df725059f944f4e
Svetoslav [Fri, 23 Jan 2015 02:49:13 +0000 (18:49 -0800)]
Accessibilty: Cannot click on views in a scrollable container covered by the toolbar.
In accessibility mode we calculate a point where to click in the accessibility
focused view as a bridge-gap solution before switching to accessibility click
actions. We cannot detect whether a view is covered by another one that consumes
all touch events, and therefore we may click on the wrong target. This was the
case with the toolbar. As a result a partially scrolled view in a scrollable
container covered by a toolbar cannot be activated and this is not an edge case.
bug:
18986806
Change-Id: Ib41470c39806cec13e9b00b319879cd7f3412ab5
Adam Lesinski [Fri, 23 Jan 2015 02:29:49 +0000 (02:29 +0000)]
Merge "AAPT: Use the right enum when checking for density configurations" into lmp-mr1-dev
Adam Lesinski [Fri, 23 Jan 2015 02:19:44 +0000 (18:19 -0800)]
AAPT: Use the right enum when checking for density configurations
Bug:
19116675
Change-Id: I2322d8d6bdf890005c80014273e5d07df735ed50
Chet Haase [Fri, 23 Jan 2015 01:57:37 +0000 (17:57 -0800)]
Allow infinite-repeat zero-duration animators to continue repeating
A recent change to ValueAnimator caused infinitely repeating animators with
duration 0 to be ended immediately. BatterySaver mode can cause animators
to have 0 duration, which means that apps depending on animator update events
no longer receive those events due to this behavior change.
The fix is to restore the previous behavior of allowing repeating animators
to continue, regardless of duration.
Issue #
19113776 Fix infinite-repeating, zero-duration animator behavior
Change-Id: I4d1c7afb6d06ca45ef41db73c160f6a6d5754e24
Sanket Padawe [Fri, 23 Jan 2015 01:43:08 +0000 (17:43 -0800)]
Remove entries from config_tether_apndata for some carriers.
+ Remove entries from config_tether_apndata when primary carrier requires
DUN apn and the mvno does not.
Bug:
19006861
Change-Id: Idf93fe2302662ce2b25e72277080bbc9d410b2de
Eino-Ville Talvala [Fri, 23 Jan 2015 00:05:25 +0000 (00:05 +0000)]
Merge "Camera2: StreamConfigurationMap#isOutputSupportedFor(Surface)" into lmp-mr1-dev
Craig Mautner [Thu, 22 Jan 2015 23:17:46 +0000 (23:17 +0000)]
Merge "Even more debug for bug
17721767." into lmp-mr1-dev
Craig Mautner [Thu, 22 Jan 2015 22:28:03 +0000 (14:28 -0800)]
Even more debug for bug
17721767.
This time adding events for stack movement and focus change.
Change-Id: Icdff9763ac2daf85c615992fa2c8e418e907908c
Ying Wang [Thu, 22 Jan 2015 20:36:05 +0000 (20:36 +0000)]
Merge "Check in "current" system API files." into lmp-mr1-dev
Ricardo Cervera [Thu, 22 Jan 2015 18:27:57 +0000 (18:27 +0000)]
am
02d093ca: am
bdfcd56e: Merge "docs: Fixes to the watch faces design guidelines" into lmp-docs
automerge:
65ab86c
* commit '
65ab86cf1ad414612ac57e14f581e0ffb1819e14':
docs: Fixes to the watch faces design guidelines
Ricardo Cervera [Thu, 22 Jan 2015 18:02:30 +0000 (18:02 +0000)]
am
02d093ca: am
bdfcd56e: Merge "docs: Fixes to the watch faces design guidelines" into lmp-docs
* commit '
02d093ca675535f1a7f702a9fffd277123cea8ca':
docs: Fixes to the watch faces design guidelines
Ricardo Cervera [Thu, 22 Jan 2015 17:56:54 +0000 (17:56 +0000)]
am
bdfcd56e: Merge "docs: Fixes to the watch faces design guidelines" into lmp-docs
* commit '
bdfcd56e7f01b7bb1f50c932792b9528c67892e5':
docs: Fixes to the watch faces design guidelines
Ricardo Cervera [Thu, 22 Jan 2015 17:50:47 +0000 (17:50 +0000)]
Merge "docs: Fixes to the watch faces design guidelines" into lmp-docs
Jason Monk [Thu, 22 Jan 2015 17:49:04 +0000 (17:49 +0000)]
Merge "QS: Fix second line in dual tiles" into lmp-mr1-dev
Ricardo Cervera [Wed, 14 Jan 2015 16:29:38 +0000 (08:29 -0800)]
docs: Fixes to the watch faces design guidelines
Bug:
19001253
Change-Id: I356b887de71710afa27acc7544d0efdc3a857e91
Luan Nguyen [Thu, 22 Jan 2015 17:44:45 +0000 (17:44 +0000)]
am
edb9ba54: am
1dd76ea2: docs: Fix companion configuration (
18864041) Fix declaration of var and incorrect method call (
18617393)
automerge:
6117147
* commit '
61171477918ea55c70c706f062019f5cd2194043':
docs: Fix companion configuration (
18864041) Fix declaration of var and incorrect method call (
18617393)
Luan Nguyen [Thu, 22 Jan 2015 17:35:31 +0000 (17:35 +0000)]
am
edb9ba54: am
1dd76ea2: docs: Fix companion configuration (
18864041) Fix declaration of var and incorrect method call (
18617393)
* commit '
edb9ba54f7be81faacda4ee36824c6f8cd314fb3':
docs: Fix companion configuration (
18864041) Fix declaration of var and incorrect method call (
18617393)
Luan Nguyen [Thu, 22 Jan 2015 17:29:30 +0000 (17:29 +0000)]
am
1dd76ea2: docs: Fix companion configuration (
18864041) Fix declaration of var and incorrect method call (
18617393)
* commit '
1dd76ea2760f84496a5b82435fc35d7c28a6dd6d':
docs: Fix companion configuration (
18864041) Fix declaration of var and incorrect method call (
18617393)
Christoph Studer [Thu, 22 Jan 2015 14:02:49 +0000 (15:02 +0100)]
SysUI: Don't drop HUN notification when clicked
A clicked notification is not guaranteed to be removed,
so instead of dropping a clicked HUN notification we have
to release it to the shade.
Bug:
19093631
Change-Id: I73b88af774e49e89c8a601873c48cc5f5eed0224
Benjamin Franz [Wed, 14 Jan 2015 18:22:42 +0000 (18:22 +0000)]
Avoid SecurityException when calling getUserData
Currently we risk getting a SecurityException in a number of places,
where getUserData is called for a different user than the calling user.
To avoid this, the caller is cleared in a helper function.
Bug:
18662452
Change-Id: Ibc131c602e52d9f013fe739a9c18e693181ded67
Luan Nguyen [Wed, 21 Jan 2015 23:16:36 +0000 (15:16 -0800)]
docs: Fix companion configuration (
18864041)
Fix declaration of var and incorrect method call (
18617393)
bug:
18864041
bug:
18617393
Change-Id: Ic31e44acfe7338f56acdbbd97ba8cc1e87042b53
Jason Monk [Thu, 22 Jan 2015 15:39:37 +0000 (10:39 -0500)]
QS: Fix second line in dual tiles
QSDualTileLabel is no longer a FrameLayout (now a LinearLayout),
so it does not need the top padding based on the caret size
anymore.
Bug:
18725348
Change-Id: Ibd3aaa20e7cdb35ba585cc5c8981c64efb5c66fe
Jason Monk [Thu, 22 Jan 2015 14:11:52 +0000 (14:11 +0000)]
Merge "Show connect dialog when selecting secure QS wifi" into lmp-mr1-dev
The Android Automerger [Thu, 22 Jan 2015 14:09:58 +0000 (06:09 -0800)]
merge in lmp-mr1-release history after reset to lmp-mr1-dev
Nicolas Prevot [Thu, 22 Jan 2015 10:22:05 +0000 (10:22 +0000)]
Merge "Never set "Work" or "Personal apps" as prefered activities." into lmp-mr1-dev
Jinsuk Kim [Mon, 19 Jan 2015 03:39:06 +0000 (12:39 +0900)]
CEC: Add logic to return to internal source
This CL introduces a logic that, upon receiving <Inactive Source>
from the active source or a corresponding MHL subcommand, lets
the service return to one of internal inputs.
Introduced to handle it is a new type for HdmiDevice (INACTIVE)
that will be passed to input change listeners. The callback
is expected to transform to other mechanism such as intent,
to let TV app to decide which input to switch to, which will
be one of non-HDMI input that was viewed previously.
Bug:
19008579
Change-Id: I1922f4cd20e9220411061bb9d9fbe5fbc5676d48
Erik Kline [Thu, 22 Jan 2015 07:07:35 +0000 (07:07 +0000)]
Merge "Log interface name and uid when filtering a blocked network." into lmp-mr1-dev
Jim Miller [Thu, 22 Jan 2015 02:37:38 +0000 (02:37 +0000)]
Merge "Clarify getTrustAgentConfiguration() documentation." into lmp-mr1-dev
Jinsuk Kim [Thu, 22 Jan 2015 02:19:36 +0000 (02:19 +0000)]
Merge "CEC: Let playback device switch TV input after bootup" into lmp-mr1-dev
Wonsik Kim [Thu, 22 Jan 2015 01:52:06 +0000 (01:52 +0000)]
Merge "TIF: TvInputHardwareManager puts multiple sink ports into audio patch" into lmp-mr1-dev