OSDN Git Service
Tim Kilbourn [Tue, 27 Jan 2015 22:15:42 +0000 (22:15 +0000)]
am
a8a4ce97: am
597bb696: Merge "Add a config for whether to start in touch mode." into lmp-mr1-dev
* commit '
a8a4ce97b3dd901d047a436943e9f80e0e8be820':
Add a config for whether to start in touch mode.
Tim Kilbourn [Tue, 27 Jan 2015 22:09:21 +0000 (22:09 +0000)]
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.
Jeff Davidson [Tue, 27 Jan 2015 22:09:08 +0000 (22:09 +0000)]
am
9490c597: am
bae051f6: Merge "Use consistent logic for data icon overlays." into lmp-mr1-dev
* commit '
9490c597460a2fcaaf0d510576f4f752b7a725ce':
Use consistent logic for data icon overlays.
Tim Kilbourn [Tue, 27 Jan 2015 22:03:49 +0000 (22:03 +0000)]
Merge "Add a config for whether to start in touch mode." into lmp-mr1-dev
Jeff Davidson [Tue, 27 Jan 2015 22:03:24 +0000 (22:03 +0000)]
am
bae051f6: Merge "Use consistent logic for data icon overlays." into lmp-mr1-dev
* commit '
bae051f6bd8ae4f103d8067ed96accbced173664':
Use consistent logic for data icon overlays.
Jeff Davidson [Tue, 27 Jan 2015 21:57:05 +0000 (21:57 +0000)]
Merge "Use consistent logic for data icon overlays." into lmp-mr1-dev
Tim Kilbourn [Wed, 21 Jan 2015 23:43:07 +0000 (15:43 -0800)]
Add a config for whether to start in touch mode.
Bug:
18925810
Change-Id: Ic9b956cde380cffcad7ca229f1669692b1743e6d
Ricardo Cervera [Tue, 27 Jan 2015 21:43:26 +0000 (21:43 +0000)]
am
8ff85c5e: am
be3731f0: am
f5386a9a: am
8ec3eb4e: am
de113066: docs: Transitions training class.
* commit '
8ff85c5ecb09f297d8926bae5ad09f0423594ed0':
docs: Transitions training class.
Ricardo Cervera [Tue, 27 Jan 2015 21:34:45 +0000 (21:34 +0000)]
am
be3731f0: am
f5386a9a: am
8ec3eb4e: am
de113066: docs: Transitions training class.
* commit '
be3731f028cf815d51e7c49b7415d7d1e8ac3639':
docs: Transitions training class.
Ricardo Cervera [Tue, 27 Jan 2015 21:28:14 +0000 (21:28 +0000)]
am
f5386a9a: am
8ec3eb4e: am
de113066: docs: Transitions training class.
* commit '
f5386a9a949297be1321cce7eed5d0975c7b64ad':
docs: Transitions training class.
Ricardo Cervera [Tue, 27 Jan 2015 21:23:19 +0000 (21:23 +0000)]
am
8ec3eb4e: am
de113066: docs: Transitions training class.
* commit '
8ec3eb4e7c38c3c368c62bc47805d802df15f2a8':
docs: Transitions training class.
Ricardo Cervera [Tue, 27 Jan 2015 21:16:53 +0000 (21:16 +0000)]
am
de113066: docs: Transitions training class.
* commit '
de113066d80c3f19979eb531484af73f64640de9':
docs: Transitions training class.
Craig Mautner [Tue, 27 Jan 2015 21:00:29 +0000 (21:00 +0000)]
am
604a9e28: am
5426e7ae: Merge "Defer tap outside stack until multiwindows" into lmp-mr1-dev
* commit '
604a9e280e8273f6ed1f1a50724c0d510cf09bb0':
Defer tap outside stack until multiwindows
Craig Mautner [Tue, 27 Jan 2015 20:54:42 +0000 (20:54 +0000)]
am
5426e7ae: Merge "Defer tap outside stack until multiwindows" into lmp-mr1-dev
* commit '
5426e7ae93e0e728e0e12bc98a02c957d464cfe0':
Defer tap outside stack until multiwindows
Jason Sams [Tue, 27 Jan 2015 20:54:08 +0000 (20:54 +0000)]
am
02236295: am
4dd0cf42: Merge "Initialize clipping structure"
* commit '
02236295a43380b21e4cae10b13da3398d607627':
Initialize clipping structure
Craig Mautner [Tue, 27 Jan 2015 20:48:55 +0000 (20:48 +0000)]
Merge "Defer tap outside stack until multiwindows" into lmp-mr1-dev
Jason Sams [Tue, 27 Jan 2015 20:48:04 +0000 (20:48 +0000)]
am
4dd0cf42: Merge "Initialize clipping structure"
* commit '
4dd0cf42f5941d9e25aa042bf75fa003b1f5ec76':
Initialize clipping structure
Jason Sams [Tue, 27 Jan 2015 20:41:42 +0000 (20:41 +0000)]
Merge "Initialize clipping structure"
Marco Nelissen [Tue, 27 Jan 2015 20:33:09 +0000 (20:33 +0000)]
am
3ea395dd: am
4e853598: Merge "Fix printf format"
* commit '
3ea395ddc7785bf8fb6df1e5e6ed142c9336a7eb':
Fix printf format
Marco Nelissen [Tue, 27 Jan 2015 20:25:59 +0000 (20:25 +0000)]
am
4e853598: Merge "Fix printf format"
* commit '
4e85359879cb417f0540a5cfbf91242ebd9546c7':
Fix printf format
Marco Nelissen [Tue, 27 Jan 2015 20:19:46 +0000 (20:19 +0000)]
Merge "Fix printf format"
Marco Nelissen [Tue, 27 Jan 2015 20:17:48 +0000 (12:17 -0800)]
Fix printf format
Change-Id: Ied2f10bb59fe0e13b23bf1f9913ab3b081348a28
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
Ricardo Cervera [Mon, 12 Jan 2015 20:45:54 +0000 (12:45 -0800)]
docs: Transitions training class.
Change-Id: Ib41b42a890c44fdc001242bc356442ef9201b591
Leon Scroggins III [Tue, 27 Jan 2015 18:33:46 +0000 (18:33 +0000)]
am
3523e4fc: am
efe085ff: Merge "Handle bad ninepatch data." into lmp-mr1-dev
* commit '
3523e4fcb3c74a5dee2f4497e2b8ec7b9e2b5e57':
Handle bad ninepatch data.
Marco Nelissen [Tue, 27 Jan 2015 18:28:53 +0000 (18:28 +0000)]
am
99985d98: am
e74da38e: Merge "Make SoundPool use MediaCodec"
* commit '
99985d98c23b32acc0014031d7b88ee4eed21a4b':
Make SoundPool use MediaCodec
Leon Scroggins III [Tue, 27 Jan 2015 18:27:18 +0000 (18:27 +0000)]
am
efe085ff: Merge "Handle bad ninepatch data." into lmp-mr1-dev
* commit '
efe085ffbd97b6f9d1460a9642084a6d3be11797':
Handle bad ninepatch data.
Matthew Xie [Tue, 27 Jan 2015 18:22:57 +0000 (18:22 +0000)]
am
46c3304a: am
485813a0: Merge "Delay the second message for 30ms more than the last message for a2dp" into lmp-mr1-dev
* commit '
46c3304aed2cabb592e499b0b3de56a312e1d67f':
Delay the second message for 30ms more than the last message for a2dp
Leon Scroggins III [Tue, 27 Jan 2015 18:22:41 +0000 (18:22 +0000)]
Merge "Handle bad ninepatch data." into lmp-mr1-dev
Matthew Xie [Tue, 27 Jan 2015 18:17:00 +0000 (18:17 +0000)]
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
Matthew Xie [Tue, 27 Jan 2015 18:13:39 +0000 (18:13 +0000)]
Merge "Delay the second message for 30ms more than the last message for a2dp" into lmp-mr1-dev
Marco Nelissen [Tue, 27 Jan 2015 17:53:03 +0000 (17:53 +0000)]
am
e74da38e: Merge "Make SoundPool use MediaCodec"
* commit '
e74da38e21a320528d0c94d076e59bd503c37623':
Make SoundPool use MediaCodec
Marco Nelissen [Tue, 27 Jan 2015 17:49:01 +0000 (17:49 +0000)]
Merge "Make SoundPool use MediaCodec"
Leon Scroggins III [Tue, 27 Jan 2015 16:12:02 +0000 (11:12 -0500)]
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
George Mount [Tue, 27 Jan 2015 15:21:23 +0000 (15:21 +0000)]
am
fff84a23: Merge "Activity Transition: fix quick back after enter." into lmp-mr1-dev automerge:
aa6945a
* commit '
fff84a232a964a8587eabee4e34cc38344309593':
Activity Transition: fix quick back after enter.
George Mount [Tue, 27 Jan 2015 15:15:38 +0000 (15:15 +0000)]
Merge "Activity Transition: fix quick back after enter." into lmp-mr1-dev
automerge:
aa6945a
* commit '
aa6945ac7904611499ae4ad33799d1f1fe434d32':
Activity Transition: fix quick back after enter.
George Mount [Tue, 27 Jan 2015 15:13:29 +0000 (15:13 +0000)]
Merge "Activity Transition: fix quick back after enter." into lmp-mr1-dev
Lorenzo Colitti [Tue, 27 Jan 2015 11:55:51 +0000 (11:55 +0000)]
am
b84e0040: am
525588c5: Merge "Make NetworkMonitor less aggressive on broken networks." into lmp-mr1-dev
* commit '
b84e0040d8c2f44790e7ceeda8cddf3524f33d29':
Make NetworkMonitor less aggressive on broken networks.
Lorenzo Colitti [Tue, 27 Jan 2015 11:46:31 +0000 (11:46 +0000)]
am
525588c5: Merge "Make NetworkMonitor less aggressive on broken networks." into lmp-mr1-dev
* commit '
525588c593794cf52d93665e9cf55f06abd3d1b7':
Make NetworkMonitor less aggressive on broken networks.
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
Yabin Cui [Tue, 27 Jan 2015 07:04:55 +0000 (07:04 +0000)]
am
f7049289: am
3812e68e: Merge "kill HAVE_PTHREADS."
* commit '
f70492898b3efa3c5f480f195062fa6f293bc764':
kill HAVE_PTHREADS.
Yabin Cui [Tue, 27 Jan 2015 06:54:06 +0000 (06:54 +0000)]
am
3812e68e: Merge "kill HAVE_PTHREADS."
* commit '
3812e68ea788782c54c27f69d08bcc1419066cb2':
kill HAVE_PTHREADS.
Yabin Cui [Tue, 27 Jan 2015 06:49:16 +0000 (06:49 +0000)]
Merge "kill HAVE_PTHREADS."
Yabin Cui [Tue, 27 Jan 2015 03:43:58 +0000 (19:43 -0800)]
kill HAVE_PTHREADS.
Bug:
19083585
Change-Id: Ib466949bb6cd6d1bbc4680e989f0f9fae62ca564
Svetoslav [Tue, 27 Jan 2015 04:36:37 +0000 (04:36 +0000)]
am
fcecdccc: am
369f1ec6: Merge "Add a missing file to print spooler resources" into lmp-mr1-dev
* commit '
fcecdccc0f24b9c9447fe5bd69c31ca29c35d5c8':
Add a missing file to print spooler resources
Svetoslav [Tue, 27 Jan 2015 04:36:31 +0000 (04:36 +0000)]
am
55120a0f: am
197adec3: Merge "Accessibility: Ignore overlapping siblings when computing a click location" into lmp-mr1-dev
* commit '
55120a0f1acb9a46dc56bbdab877bc2c635f1356':
Accessibility: Ignore overlapping siblings when computing a click location
Svetoslav [Tue, 27 Jan 2015 04:26:55 +0000 (04:26 +0000)]
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
Svetoslav [Tue, 27 Jan 2015 04:26:51 +0000 (04:26 +0000)]
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
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 03:10:28 +0000 (03:10 +0000)]
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
Jose Lima [Tue, 27 Jan 2015 02:58:44 +0000 (02:58 +0000)]
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
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
Jeff Davidson [Tue, 27 Jan 2015 02:23:24 +0000 (18:23 -0800)]
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
Jason Sams [Tue, 27 Jan 2015 02:14:36 +0000 (18:14 -0800)]
Initialize clipping structure
placeholder until array clipping is added to the API.
Change-Id: Ib20dbd71989c559c0669385a5088ec261596913c
Craig Mautner [Tue, 27 Jan 2015 01:47:16 +0000 (01:47 +0000)]
am
603d30b1: Merge "Stop logging service starts and stops." into lmp-mr1-dev automerge:
49880ee
* commit '
603d30b1cfe7be61e4e352b58342b86e5cfb7612':
Stop logging service starts and stops.
Wonsik Kim [Tue, 27 Jan 2015 01:47:11 +0000 (01:47 +0000)]
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
Craig Mautner [Tue, 27 Jan 2015 01:41:15 +0000 (01:41 +0000)]
Merge "Stop logging service starts and stops." into lmp-mr1-dev
automerge:
49880ee
* commit '
49880eeb00c71a2287db65717fd8a7ff5e87279d':
Stop logging service starts and stops.
Wonsik Kim [Tue, 27 Jan 2015 01:39:56 +0000 (01:39 +0000)]
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
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
Chris Craik [Tue, 27 Jan 2015 01:37:09 +0000 (01:37 +0000)]
am
00c53d66: am
cdd8b7f8: Merge "Invalidate outline on padding update" into lmp-mr1-dev
* commit '
00c53d66dd56384aff834ec2c59de9f3c3913579':
Invalidate outline on padding update
Alan Viverette [Tue, 27 Jan 2015 01:37:03 +0000 (01:37 +0000)]
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
Craig Mautner [Tue, 27 Jan 2015 01:15:34 +0000 (01:15 +0000)]
Merge "Stop logging service starts and stops." into lmp-mr1-dev
Chris Craik [Tue, 27 Jan 2015 01:13:00 +0000 (01:13 +0000)]
am
cdd8b7f8: Merge "Invalidate outline on padding update" into lmp-mr1-dev
* commit '
cdd8b7f8199eb94ca133c8cebddf86adb0f9bb11':
Invalidate outline on padding update
Alan Viverette [Tue, 27 Jan 2015 01:12:56 +0000 (01:12 +0000)]
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
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
George Mount [Mon, 26 Jan 2015 22:38:19 +0000 (14:38 -0800)]
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
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
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:22:27 +0000 (22:22 +0000)]
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.
Lorenzo Colitti [Mon, 26 Jan 2015 22:16:03 +0000 (22:16 +0000)]
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.
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:57:35 +0000 (21:57 +0000)]
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.
Yorke Lee [Mon, 26 Jan 2015 21:52:24 +0000 (21:52 +0000)]
Merge "Update system-api for new getLine1Number() method." into lmp-mr1-dev
automerge:
8df7f43
* commit '
8df7f4368425f24f46bb8605dd3d1e3d3b97e6ad':
Update system-api for new getLine1Number() method.
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
Sarah Maddox [Mon, 26 Jan 2015 20:42:57 +0000 (20:42 +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 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.
Sarah Maddox [Mon, 26 Jan 2015 20:39:27 +0000 (20:39 +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
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.
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:11:58 +0000 (20:11 +0000)]
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
Craig Mautner [Mon, 26 Jan 2015 20:09:48 +0000 (20:09 +0000)]
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
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 20:04:03 +0000 (20:04 +0000)]
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
Ricardo Cervera [Mon, 26 Jan 2015 19:57:37 +0000 (19:57 +0000)]
am
9c9dc80a: am
df07000e: am
d064ce7e: am
edb7a442: Merge "docs: Wear DataItem listener improvements" into lmp-docs
* commit '
9c9dc80a08d7a9c9f8b6619b7b856c113a94b938':
docs: Wear DataItem listener improvements
Nancy Chen [Mon, 26 Jan 2015 19:54:32 +0000 (19:54 +0000)]
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.
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
Nancy Chen [Mon, 26 Jan 2015 19:51:14 +0000 (19:51 +0000)]
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.
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:29:31 +0000 (19:29 +0000)]
am
e1eff7aa: am
de8d2840: Merge "Prevent drag-to-open from cycling pressed state, propagate hotspot" into lmp-mr1-dev
* commit '
e1eff7aadeb0c9f6cc51f07166accd63710ea2c5':
Prevent drag-to-open from cycling pressed state, propagate hotspot
Alan Viverette [Mon, 26 Jan 2015 19:23:27 +0000 (19:23 +0000)]
am
de8d2840: Merge "Prevent drag-to-open from cycling pressed state, propagate hotspot" into lmp-mr1-dev
* commit '
de8d28405538128fad55e34dc7c74fd49a909ae6':
Prevent drag-to-open from cycling pressed state, propagate hotspot