Tim Kilbourn
2210594dd0
am 597bb696: Merge "Add a config for whether to start in touch mode." into lmp-mr1-dev
...
* commit '597bb6968be56c1b8b0629ba89fec409084cc112':
Add a config for whether to start in touch mode.
2015-01-27 22:08:28 +00:00
Tim Kilbourn
597bb6968b
Merge "Add a config for whether to start in touch mode." into lmp-mr1-dev
2015-01-27 22:03:50 +00:00
Jeff Davidson
608316a471
am bae051f6: Merge "Use consistent logic for data icon overlays." into lmp-mr1-dev
...
* commit 'bae051f6bd8ae4f103d8067ed96accbced173664':
Use consistent logic for data icon overlays.
2015-01-27 22:02:56 +00:00
Jeff Davidson
bae051f6bd
Merge "Use consistent logic for data icon overlays." into lmp-mr1-dev
2015-01-27 21:57:06 +00:00
Tim Kilbourn
9626854543
Add a config for whether to start in touch mode.
...
Bug: 18925810
Change-Id: Ic9b956cde380cffcad7ca229f1669692b1743e6d
2015-01-27 13:51:58 -08:00
Ricardo Cervera
93ed62d100
am be3731f0: am f5386a9a: am 8ec3eb4e: am de113066: docs: Transitions training class.
...
* commit 'be3731f028cf815d51e7c49b7415d7d1e8ac3639':
docs: Transitions training class.
2015-01-27 21:34:04 +00:00
Ricardo Cervera
be3731f028
am f5386a9a: am 8ec3eb4e: am de113066: docs: Transitions training class.
...
* commit 'f5386a9a949297be1321cce7eed5d0975c7b64ad':
docs: Transitions training class.
2015-01-27 21:28:14 +00:00
Ricardo Cervera
f5386a9a94
am 8ec3eb4e: am de113066: docs: Transitions training class.
...
* commit '8ec3eb4e7c38c3c368c62bc47805d802df15f2a8':
docs: Transitions training class.
2015-01-27 21:23:19 +00:00
Ricardo Cervera
8ec3eb4e7c
am de113066: docs: Transitions training class.
...
* commit 'de113066d80c3f19979eb531484af73f64640de9':
docs: Transitions training class.
2015-01-27 21:16:53 +00:00
Craig Mautner
a0b9d582fa
am 5426e7ae: Merge "Defer tap outside stack until multiwindows" into lmp-mr1-dev
...
* commit '5426e7ae93e0e728e0e12bc98a02c957d464cfe0':
Defer tap outside stack until multiwindows
2015-01-27 20:55:09 +00:00
Craig Mautner
5426e7ae93
Merge "Defer tap outside stack until multiwindows" into lmp-mr1-dev
2015-01-27 20:48:55 +00:00
Craig Mautner
baf6bef001
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
2015-01-27 11:44:59 -08:00
Ricardo Cervera
de113066d8
docs: Transitions training class.
...
Change-Id: Ib41b42a890c44fdc001242bc356442ef9201b591
2015-01-27 11:35:20 -08:00
Leon Scroggins III
5a48d52f9c
am efe085ff: Merge "Handle bad ninepatch data." into lmp-mr1-dev
...
* commit 'efe085ffbd97b6f9d1460a9642084a6d3be11797':
Handle bad ninepatch data.
2015-01-27 18:27:27 +00:00
Leon Scroggins III
efe085ffbd
Merge "Handle bad ninepatch data." into lmp-mr1-dev
2015-01-27 18:22:42 +00:00
Matthew Xie
057bfa74cd
am 485813a0: Merge "Delay the second message for 30ms more than the last message for a2dp" into lmp-mr1-dev
...
* commit '485813a00cfd857fadab30c67cab985835857801':
Delay the second message for 30ms more than the last message for a2dp
2015-01-27 18:17:13 +00:00
Matthew Xie
485813a00c
Merge "Delay the second message for 30ms more than the last message for a2dp" into lmp-mr1-dev
2015-01-27 18:13:40 +00:00
Leon Scroggins III
a730ef3f77
Handle bad ninepatch data.
...
Changes proposed by Ben Hawkes of Google Project Zero.
NinePatchPeeker.cpp:
Instead of asserting, return false for bad data.
ResourceTypes.h:
Store ninepatch values as unsigned.
BUG:19151999
Change-Id: Ibe35e7569f632c6bb8a34a7701e26bb6ed547ec2
2015-01-27 16:41:16 +00:00
George Mount
857bc29e84
am aa6945ac: Merge "Activity Transition: fix quick back after enter." into lmp-mr1-dev
...
* commit 'aa6945ac7904611499ae4ad33799d1f1fe434d32':
Activity Transition: fix quick back after enter.
2015-01-27 15:18:27 +00:00
George Mount
aa6945ac79
Merge "Activity Transition: fix quick back after enter." into lmp-mr1-dev
2015-01-27 15:13:32 +00:00
Lorenzo Colitti
eac588db29
am 525588c5: Merge "Make NetworkMonitor less aggressive on broken networks." into lmp-mr1-dev
...
* commit '525588c593794cf52d93665e9cf55f06abd3d1b7':
Make NetworkMonitor less aggressive on broken networks.
2015-01-27 11:47:47 +00:00
Lorenzo Colitti
525588c593
Merge "Make NetworkMonitor less aggressive on broken networks." into lmp-mr1-dev
2015-01-27 11:41:10 +00:00
Svetoslav
1bea32e4b1
am 369f1ec6: Merge "Add a missing file to print spooler resources" into lmp-mr1-dev
...
* commit '369f1ec6ea78637870f35822456628e7ae8caf95':
Add a missing file to print spooler resources
2015-01-27 04:29:15 +00:00
Svetoslav
a2e8c6f25b
am 197adec3: Merge "Accessibility: Ignore overlapping siblings when computing a click location" into lmp-mr1-dev
...
* commit '197adec3656fc087d4aa56396e601bb8d04aa9fd':
Accessibility: Ignore overlapping siblings when computing a click location
2015-01-27 04:29:11 +00:00
Svetoslav
369f1ec6ea
Merge "Add a missing file to print spooler resources" into lmp-mr1-dev
2015-01-27 04:24:08 +00:00
Svetoslav
197adec365
Merge "Accessibility: Ignore overlapping siblings when computing a click location" into lmp-mr1-dev
2015-01-27 04:23:44 +00:00
Jose Lima
6ea6865486
am 3fd8a433: Merge "Allow disabling the Options Pannel feature for TVs" into lmp-mr1-dev
...
* commit '3fd8a433a918fc9c57b6d7ff12839a1e028d6dad':
Allow disabling the Options Pannel feature for TVs
2015-01-27 03:01:37 +00:00
Jose Lima
3fd8a433a9
Merge "Allow disabling the Options Pannel feature for TVs" into lmp-mr1-dev
2015-01-27 02:53:22 +00:00
Jeff Davidson
ccda996611
Use consistent logic for data icon overlays.
...
Ensure that we always show the data icon in both Quick Settings and
the status bar, or in neither, but never one or the other.
The particular inconsistency this is intended to fix is that in some
circumstances, Wi-Fi may be connected, but the cell radio may be still
be used by certain apps, due to new multinetworking APIs in L. In this
case, we should always show the data icon; currently appears in the
status bar, but not Quick Settings, which was unconditionally dropping
the icon if any Wi-Fi connection was up.
Bug: 19112322
Change-Id: I9942f6b24081e061a72804ef47ad4fe719f32ec2
2015-01-26 18:23:24 -08:00
Craig Mautner
d639d3657f
am 49880eeb: Merge "Stop logging service starts and stops." into lmp-mr1-dev
...
* commit '49880eeb00c71a2287db65717fd8a7ff5e87279d':
Stop logging service starts and stops.
2015-01-27 01:55:44 +00:00
Wonsik Kim
64464f713c
am cd8a80c7: Merge "TIF: fix loud volume after input switch when volume is 0" into lmp-mr1-dev
...
* commit 'cd8a80c7077ee1ef14888e1a735b20c7119c1aac':
TIF: fix loud volume after input switch when volume is 0
2015-01-27 01:55:37 +00:00
Jose Lima
7a22fc62d3
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
2015-01-26 17:39:49 -08:00
Chris Craik
953c9bd46e
am cdd8b7f8: Merge "Invalidate outline on padding update" into lmp-mr1-dev
...
* commit 'cdd8b7f8199eb94ca133c8cebddf86adb0f9bb11':
Invalidate outline on padding update
2015-01-27 01:35:12 +00:00
Alan Viverette
41fb356111
am 5229be05: Merge "Convert getHourForDegrees result to 12-hour format when needed" into lmp-mr1-dev
...
* commit '5229be05b439cf24b7028adbb64d05ecc23184ac':
Convert getHourForDegrees result to 12-hour format when needed
2015-01-27 01:35:08 +00:00
Craig Mautner
49880eeb00
Merge "Stop logging service starts and stops." into lmp-mr1-dev
2015-01-27 01:15:35 +00:00
Wonsik Kim
cd8a80c707
Merge "TIF: fix loud volume after input switch when volume is 0" into lmp-mr1-dev
2015-01-27 01:12:33 +00:00
Chris Craik
cdd8b7f819
Merge "Invalidate outline on padding update" into lmp-mr1-dev
2015-01-27 01:08:54 +00:00
Wonsik Kim
485e7e13f4
TIF: fix loud volume after input switch when volume is 0
...
Bug: 19134440
Change-Id: I6291f299a27315e79b505ea36bf96c79437e6b53
2015-01-27 01:06:37 +00:00
Alan Viverette
5229be05b4
Merge "Convert getHourForDegrees result to 12-hour format when needed" into lmp-mr1-dev
2015-01-27 01:02:00 +00:00
George Mount
fbd459642f
Activity Transition: fix quick back after enter.
...
Bug 19105460
When an Activity Transition was receiving an exit call
immediately after the enter, the transition for the enter
was still in progress. TransitionManager does not allow
multiple transitions to work at once, so the enter transition
would run, but the exit did not. This CL detects when the
enter transition is still pending and tells the
ActivityTransitionState to delay one frame so that the
enter can finish its required work prior to starting the
exit transition.
Change-Id: I1b40f1e41d61a67da3fd672419ea321e7d0496da
2015-01-26 15:59:42 -08:00
Alan Viverette
5efe0d199e
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
2015-01-26 15:34:56 -08:00
Chris Craik
c43a820945
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
2015-01-26 14:40:29 -08:00
Craig Mautner
9851d03819
Stop logging service starts and stops.
...
Completes work on bug 18201239.
Change-Id: I80686351ac91e48bf113976a000b351b423d8dd2
2015-01-26 14:33:39 -08:00
Lorenzo Colitti
8dbcd43497
am 09dff843: Merge "Only try to fetch time from NTP if there is a network connection." into lmp-mr1-dev
...
* commit '09dff843b8ed402564c4c89d7e1cabceb715e458':
Only try to fetch time from NTP if there is a network connection.
2015-01-26 22:23:45 +00:00
Yorke Lee
6d4cc5c816
am 8df7f436: Merge "Update system-api for new getLine1Number() method." into lmp-mr1-dev
...
* commit '8df7f4368425f24f46bb8605dd3d1e3d3b97e6ad':
Update system-api for new getLine1Number() method.
2015-01-26 22:14:45 +00:00
Sarah Maddox
be44afaad7
am f31eb13b: 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 'f31eb13b8ef5dbdf82955ca52eb74cd6fc5cff47':
docs: Adds new geocoding sample to Location API training. Uses GoogleApiClient to connect to Play services. Uses the latest Fused Location Provider API.
2015-01-26 22:14:26 +00:00
Lorenzo Colitti
09dff843b8
Merge "Only try to fetch time from NTP if there is a network connection." into lmp-mr1-dev
2015-01-26 22:08:19 +00:00
Craig Mautner
3c878f26c9
resolved conflicts for merge of 8995e140 to lmp-mr1-wfc-dev
...
Change-Id: I21ffad3247858dc072964a5fa4beb609010c2b1a
2015-01-26 13:57:19 -08:00
Yorke Lee
8df7f43684
Merge "Update system-api for new getLine1Number() method." into lmp-mr1-dev
2015-01-26 21:47:56 +00:00
Nancy Chen
c059271ca4
Update system-api for new getLine1Number() method.
...
Add new method in TelecomManager to system-current.txt.
Bug: 19087382
Change-Id: Id6db61fed45301cc1a15ded6e362d7858f24a273
2015-01-26 12:35:35 -08:00