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
69fbcf1f10
am 445768bd: am 3fd8a433: Merge "Allow disabling the Options Pannel feature for TVs" into lmp-mr1-dev
...
* commit '445768bddf00256195a46b78ed35ea3722df7c92':
Allow disabling the Options Pannel feature for TVs
2015-01-27 03:10:28 +00:00
Jose Lima
445768bddf
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 02:58:44 +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
Jason Sams
14331ab1c3
Initialize clipping structure
...
placeholder until array clipping is added to the API.
Change-Id: Ib20dbd71989c559c0669385a5088ec261596913c
2015-01-26 18:15:05 -08:00
Craig Mautner
8e72aa8a41
am 603d30b1: Merge "Stop logging service starts and stops." into lmp-mr1-dev automerge: 49880ee
...
* commit '603d30b1cfe7be61e4e352b58342b86e5cfb7612':
Stop logging service starts and stops.
2015-01-27 01:47:16 +00:00
Wonsik Kim
ae3e5e82b6
am b3c06e49: Merge "TIF: fix loud volume after input switch when volume is 0" into lmp-mr1-dev automerge: cd8a80c
...
* commit 'b3c06e49c8e286f8960be65c3e96934ea2ab8b49':
TIF: fix loud volume after input switch when volume is 0
2015-01-27 01:47:11 +00:00
Craig Mautner
603d30b1cf
Merge "Stop logging service starts and stops." into lmp-mr1-dev
...
automerge: 49880ee
* commit '49880eeb00c71a2287db65717fd8a7ff5e87279d':
Stop logging service starts and stops.
2015-01-27 01:41:15 +00:00
Wonsik Kim
b3c06e49c8
Merge "TIF: fix loud volume after input switch when volume is 0" into lmp-mr1-dev
...
automerge: cd8a80c
* commit 'cd8a80c7077ee1ef14888e1a735b20c7119c1aac':
TIF: fix loud volume after input switch when volume is 0
2015-01-27 01:39:56 +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
2da67b570c
am 00c53d66: am cdd8b7f8: Merge "Invalidate outline on padding update" into lmp-mr1-dev
...
* commit '00c53d66dd56384aff834ec2c59de9f3c3913579':
Invalidate outline on padding update
2015-01-27 01:37:09 +00:00
Alan Viverette
da9653a263
am 8648dfe5: am 5229be05: Merge "Convert getHourForDegrees result to 12-hour format when needed" into lmp-mr1-dev
...
* commit '8648dfe5f52f131b0af1a17a383ce11d213cedc2':
Convert getHourForDegrees result to 12-hour format when needed
2015-01-27 01:37:03 +00:00
Craig Mautner
49880eeb00
Merge "Stop logging service starts and stops." into lmp-mr1-dev
2015-01-27 01:15:35 +00:00
Chris Craik
00c53d66dd
am cdd8b7f8: Merge "Invalidate outline on padding update" into lmp-mr1-dev
...
* commit 'cdd8b7f8199eb94ca133c8cebddf86adb0f9bb11':
Invalidate outline on padding update
2015-01-27 01:13:00 +00:00
Alan Viverette
8648dfe5f5
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:12:56 +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
John Spurlock
b9fe4e1713
Default "pickup peforms proximity check" to false.
...
Don't assume the pickup sensor will perform a proximity check before
starting to pulse. This will add some latency, but necessary if
we can't trust the sensor.
Bug: 19083596
Change-Id: I51b7daf5ed76b2780ec5c949a75cc1fca247ddad
2015-01-26 18:55:29 -05: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
583dec84d9
am 3d992507: am 09dff843: Merge "Only try to fetch time from NTP if there is a network connection." into lmp-mr1-dev
...
* commit '3d992507a09b4d32c1e961a99d77027db050f01b':
Only try to fetch time from NTP if there is a network connection.
2015-01-26 22:22:27 +00:00
Lorenzo Colitti
3d992507a0
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:16:03 +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
Yorke Lee
bfe3c35704
am 6d4a6845: Merge "Update system-api for new getLine1Number() method." into lmp-mr1-dev automerge: 8df7f43
...
* commit '6d4a68457c957e2c35940dbf630ea47900700e03':
Update system-api for new getLine1Number() method.
2015-01-26 21:57:35 +00:00
Yorke Lee
6d4a68457c
Merge "Update system-api for new getLine1Number() method." into lmp-mr1-dev
...
automerge: 8df7f43
* commit '8df7f4368425f24f46bb8605dd3d1e3d3b97e6ad':
Update system-api for new getLine1Number() method.
2015-01-26 21:52:24 +00:00
Yorke Lee
8df7f43684
Merge "Update system-api for new getLine1Number() method." into lmp-mr1-dev
2015-01-26 21:47:56 +00:00
Sarah Maddox
77a7feac6c
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 automerge: f31eb13
...
automerge: 1c10480
* commit '1c104802f9295afa565e0d62edac5f26b21b9916':
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 20:42:57 +00:00
Sarah Maddox
1c104802f9
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
...
automerge: f31eb13
* 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 20:39:27 +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
Sarah Maddox
f31eb13b8e
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.
2015-01-26 20:35:06 +00:00
Sarah Maddox
83f4080214
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.
2015-01-26 20:30:14 +00:00
Sarah Maddox
95226c981b
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.
2015-01-26 20:23:25 +00:00
Sarah Maddox
912cacde86
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
2015-01-26 20:16:37 +00:00
Craig Mautner
2322ea558e
am 8995e140: Merge "Add reason string for bringing stack to front" into lmp-mr1-dev
...
automerge: afc6d33
* commit 'afc6d332790166943302f051d32ec0874d9280aa':
Add reason string for bringing stack to front
2015-01-26 20:11:58 +00:00
Craig Mautner
afc6d33279
am 8995e140: Merge "Add reason string for bringing stack to front" into lmp-mr1-dev
...
* commit '8995e140ad557c9f3f4667becbaaf0ba4c667638':
Add reason string for bringing stack to front
2015-01-26 20:09:48 +00:00
Craig Mautner
8995e140ad
Merge "Add reason string for bringing stack to front" into lmp-mr1-dev
2015-01-26 20:05:45 +00:00
Ricardo Cervera
16325bda7f
am ba70d548: am 9c9dc80a: am df07000e: am d064ce7e: am edb7a442: Merge "docs: Wear DataItem listener improvements" into lmp-docs
...
* commit 'ba70d548cb3fa700e5d11c4afae7d0e9a5f45bd9':
docs: Wear DataItem listener improvements
2015-01-26 20:04:03 +00:00
Ricardo Cervera
ba70d548cb
am 9c9dc80a: am df07000e: am d064ce7e: am edb7a442: Merge "docs: Wear DataItem listener improvements" into lmp-docs
...
* commit '9c9dc80a08d7a9c9f8b6619b7b856c113a94b938':
docs: Wear DataItem listener improvements
2015-01-26 19:57:37 +00:00
Nancy Chen
885c856e6b
am 42d45bb1: Merge "Add method in TelecomManager to return line1Number for a PhoneAccount." into lmp-mr1-dev
...
automerge: f55d132
* commit 'f55d132ae02529afe962544a1200a91bc3440e12':
Add method in TelecomManager to return line1Number for a PhoneAccount.
2015-01-26 19:54:32 +00:00
Ricardo Cervera
9c9dc80a08
am df07000e: am d064ce7e: am edb7a442: Merge "docs: Wear DataItem listener improvements" into lmp-docs
...
* commit 'df07000e356dee84de9f4dcdd22a15e26e32f684':
docs: Wear DataItem listener improvements
2015-01-26 19:51:53 +00:00
Nancy Chen
f55d132ae0
am 42d45bb1: Merge "Add method in TelecomManager to return line1Number for a PhoneAccount." into lmp-mr1-dev
...
* commit '42d45bb1e3e71c19cd977b799ab0fd983e40647f':
Add method in TelecomManager to return line1Number for a PhoneAccount.
2015-01-26 19:51:14 +00:00
Ricardo Cervera
df07000e35
am d064ce7e: am edb7a442: Merge "docs: Wear DataItem listener improvements" into lmp-docs
...
* commit 'd064ce7e8b4ef75c07b99d466c85ea55ef2f4163':
docs: Wear DataItem listener improvements
2015-01-26 19:45:33 +00:00
Nancy Chen
42d45bb1e3
Merge "Add method in TelecomManager to return line1Number for a PhoneAccount." into lmp-mr1-dev
2015-01-26 19:44:54 +00:00
Ricardo Cervera
d064ce7e8b
am edb7a442: Merge "docs: Wear DataItem listener improvements" into lmp-docs
...
* commit 'edb7a4420bfbf3e7f9efc06718b45c56bbd3dc2d':
docs: Wear DataItem listener improvements
2015-01-26 19:39:48 +00:00
Ricardo Cervera
edb7a4420b
Merge "docs: Wear DataItem listener improvements" into lmp-docs
2015-01-26 19:32:13 +00:00