OSDN Git Service
Luan Nguyen [Fri, 13 Feb 2015 00:40:48 +0000 (00:40 +0000)]
am
968db361: am
b8f9e048: am
e88f3522: am
b14aec1b: am
b6de0316: am
e1f90b4e: Merge "docs: Fix notification api guide issues (
7461154,
12765600)" into lmp-docs automerge:
946bf2d
* commit '
968db3619a0abc26d486544e17acd168941312c8':
docs: Fix notification api guide issues (
7461154,
12765600)
Luan Nguyen [Fri, 13 Feb 2015 00:33:18 +0000 (00:33 +0000)]
am
b8f9e048: am
e88f3522: am
b14aec1b: am
b6de0316: am
e1f90b4e: Merge "docs: Fix notification api guide issues (
7461154,
12765600)" into lmp-docs automerge:
946bf2d
* commit '
b8f9e04867aefe3b2f8fba05664c652f12bedc18':
docs: Fix notification api guide issues (
7461154,
12765600)
Luan Nguyen [Fri, 13 Feb 2015 00:25:19 +0000 (00:25 +0000)]
am
e88f3522: am
b14aec1b: am
b6de0316: am
e1f90b4e: Merge "docs: Fix notification api guide issues (
7461154,
12765600)" into lmp-docs automerge:
946bf2d
* commit '
e88f352264714dd394731a01dcadbb67c1665be6':
docs: Fix notification api guide issues (
7461154,
12765600)
Luan Nguyen [Fri, 13 Feb 2015 00:19:20 +0000 (00:19 +0000)]
am
b14aec1b: am
b6de0316: am
e1f90b4e: Merge "docs: Fix notification api guide issues (
7461154,
12765600)" into lmp-docs automerge:
946bf2d
* commit '
b14aec1b954f6fea5fc3ead9a289c8896f372096':
docs: Fix notification api guide issues (
7461154,
12765600)
Chris Craik [Thu, 12 Feb 2015 18:41:39 +0000 (10:41 -0800)]
Glop path texture support
Change-Id: I505eb05991ca4c9b2e01e49988b8f962fad51462
Luan Nguyen [Fri, 13 Feb 2015 00:13:35 +0000 (00:13 +0000)]
am
b6de0316: am
e1f90b4e: Merge "docs: Fix notification api guide issues (
7461154,
12765600)" into lmp-docs
automerge:
946bf2d
* commit '
946bf2de30545a548022b8b8ba1b0ebc890ab08e':
docs: Fix notification api guide issues (
7461154,
12765600)
Mike Lockwood [Fri, 13 Feb 2015 00:01:43 +0000 (00:01 +0000)]
Merge "MidiManager API tweaks:"
Todd Volkert [Thu, 12 Feb 2015 23:35:57 +0000 (23:35 +0000)]
Merge "Increase visibility of Transition.areValuesChanged() to protected to allow subclasses outside the android.transition package to override it."
Casey Burkhardt [Thu, 12 Feb 2015 23:31:15 +0000 (23:31 +0000)]
am
6f2dd8a9: Merge "Support circular magnification frame on circular devices" into lmp-mr1-modular-dev
automerge:
d1a5b5d
* commit '
d1a5b5dc07dc3798ae13a5a9538b5e5bbbeb8058':
Support circular magnification frame on circular devices
Casey Burkhardt [Thu, 12 Feb 2015 23:28:30 +0000 (23:28 +0000)]
am
6f2dd8a9: Merge "Support circular magnification frame on circular devices" into lmp-mr1-modular-dev
* commit '
6f2dd8a9b195a2bc8538820d8685a4a0576964f9':
Support circular magnification frame on circular devices
Todd Volkert [Thu, 12 Feb 2015 23:27:57 +0000 (15:27 -0800)]
Increase visibility of Transition.areValuesChanged() to protected to allow
subclasses outside the android.transition package to override it.
Change-Id: Ib6a5502827e734de7494958b510afc9ddb80dffe
Geoff Mendal [Thu, 12 Feb 2015 23:25:38 +0000 (23:25 +0000)]
am
77c5de0d: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
automerge:
6c02d92 -s ours
* commit '
6c02d9239885a529d4b160aa3938b14c61fbc3fd':
Import translations. DO NOT MERGE
Geoff Mendal [Thu, 12 Feb 2015 23:24:19 +0000 (23:24 +0000)]
am
fabfcfd9: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
automerge:
f6ee5db -s ours
* commit '
f6ee5dbc5efc90467dd46c5317807676fdaf8ae6':
Import translations. DO NOT MERGE
Casey Burkhardt [Thu, 12 Feb 2015 23:23:44 +0000 (23:23 +0000)]
Merge "Support circular magnification frame on circular devices" into lmp-mr1-modular-dev
Geoff Mendal [Thu, 12 Feb 2015 23:22:42 +0000 (23:22 +0000)]
am
77c5de0d: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
* commit '
77c5de0d68fb1e40e01082cf97758b2d35bfca91':
Import translations. DO NOT MERGE
Geoff Mendal [Thu, 12 Feb 2015 23:22:38 +0000 (23:22 +0000)]
am
fabfcfd9: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
* commit '
fabfcfd97e37b1cc194fa0e9f6db3268e1a2ae43':
Import translations. DO NOT MERGE
John Spurlock [Thu, 12 Feb 2015 23:19:03 +0000 (23:19 +0000)]
am
1be4b702: am
7e7c91ec: am
e4049b6d: am
f45e5dbf: Merge "NoMan: Initialize filter value reported to listeners." into lmp-mr1-dev
* commit '
1be4b702f531363903b46a88fc3d1603fb19c3ef':
NoMan: Initialize filter value reported to listeners.
Geoff Mendal [Thu, 12 Feb 2015 23:16:47 +0000 (23:16 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
Geoff Mendal [Thu, 12 Feb 2015 23:16:35 +0000 (23:16 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
Geoff Mendal [Thu, 12 Feb 2015 23:12:18 +0000 (23:12 +0000)]
am
5a2b966a: (-s ours) am
e22cd0f9: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
* commit '
5a2b966ac490e59d0285934ac652dbaa02764f6b':
Import translations. DO NOT MERGE
Geoff Mendal [Thu, 12 Feb 2015 23:12:13 +0000 (23:12 +0000)]
am
cd15d997: (-s ours) am
dfe8fe3f: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
* commit '
cd15d99721b514d6b104302217805ded5e194e43':
Import translations. DO NOT MERGE
Geoff Mendal [Thu, 12 Feb 2015 23:12:09 +0000 (23:12 +0000)]
am
682cec12: (-s ours) am
39b03e76: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
* commit '
682cec120ee73d8e831e4d04c478712dc408cf02':
Import translations. DO NOT MERGE
Geoff Mendal [Thu, 12 Feb 2015 23:12:05 +0000 (23:12 +0000)]
am
8a18ac3d: (-s ours) am
7c958e2d: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
* commit '
8a18ac3d858262b93ba7270e99e25c261892bc80':
Import translations. DO NOT MERGE
Geoff Mendal [Thu, 12 Feb 2015 23:12:00 +0000 (23:12 +0000)]
am
f23a517a: (-s ours) am
dc43cc88: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
* commit '
f23a517add2ad6c587bcfa691a1ac048818a39de':
Import translations. DO NOT MERGE
Geoff Mendal [Thu, 12 Feb 2015 23:11:56 +0000 (23:11 +0000)]
am
df45d644: (-s ours) am
5c7e4d99: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
* commit '
df45d644b6fd4dda8d2e2b650ce262a2c5b3fe79':
Import translations. DO NOT MERGE
Geoff Mendal [Thu, 12 Feb 2015 23:11:52 +0000 (23:11 +0000)]
am
a01f5457: (-s ours) am
be5aa9dd: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
* commit '
a01f5457bc819fcb48ba1bae1849f54138510ea7':
Import translations. DO NOT MERGE
John Spurlock [Thu, 12 Feb 2015 23:11:36 +0000 (23:11 +0000)]
am
7e7c91ec: am
e4049b6d: am
f45e5dbf: Merge "NoMan: Initialize filter value reported to listeners." into lmp-mr1-dev
* commit '
7e7c91ec95eca5e1089ede9953f27d8c3d3b8bea':
NoMan: Initialize filter value reported to listeners.
Todd Volkert [Thu, 12 Feb 2015 23:11:14 +0000 (23:11 +0000)]
Merge "Revert "Increase visibility of Transition.areValuesChanged() to protected to allow subclasses outside the android.transition package to override it.""
Todd Volkert [Thu, 12 Feb 2015 23:09:19 +0000 (23:09 +0000)]
Revert "Increase visibility of Transition.areValuesChanged() to protected to allow subclasses outside the android.transition package to override it."
This reverts commit
d23391eafe9f46ff01d5dc936126a4d6ae1c53d3.
Change-Id: Id7211a0fd08b9bc8ad092501de3c3efa57bf8264
Geoff Mendal [Thu, 12 Feb 2015 23:09:01 +0000 (23:09 +0000)]
am
6113edf5: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
automerge:
14720e7 -s ours
* commit '
14720e7a38e8eccf289de6a6da7ea42c41d87a04':
Import translations. DO NOT MERGE
Geoff Mendal [Thu, 12 Feb 2015 23:06:15 +0000 (15:06 -0800)]
Import translations. DO NOT MERGE
Change-Id: I536dd9e059bc42c5c399539e62d8aed02c9e446a
Auto-generated-cl: translation import
Geoff Mendal [Thu, 12 Feb 2015 23:05:28 +0000 (23:05 +0000)]
am
e22cd0f9: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
* commit '
e22cd0f9e6da18fe6827a481774e2998efbb5f46':
Import translations. DO NOT MERGE
John Spurlock [Thu, 12 Feb 2015 23:05:25 +0000 (23:05 +0000)]
am
e4049b6d: am
f45e5dbf: Merge "NoMan: Initialize filter value reported to listeners." into lmp-mr1-dev
* commit '
e4049b6d36ded6ec808be5f884248772a4059a72':
NoMan: Initialize filter value reported to listeners.
Geoff Mendal [Thu, 12 Feb 2015 23:05:23 +0000 (23:05 +0000)]
am
dfe8fe3f: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
* commit '
dfe8fe3fcf551386d6107b67bc348d88207979c3':
Import translations. DO NOT MERGE
Geoff Mendal [Thu, 12 Feb 2015 23:05:18 +0000 (23:05 +0000)]
am
39b03e76: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
* commit '
39b03e76365d1da92de51da3bd9f7677c7b16af8':
Import translations. DO NOT MERGE
Geoff Mendal [Thu, 12 Feb 2015 23:05:13 +0000 (23:05 +0000)]
am
7c958e2d: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
* commit '
7c958e2df0375761a1851cd02ca3aac3ee95f1c5':
Import translations. DO NOT MERGE
Geoff Mendal [Thu, 12 Feb 2015 23:05:08 +0000 (23:05 +0000)]
am
dc43cc88: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
* commit '
dc43cc88f02bde0917525e9fe274453bc000eb0a':
Import translations. DO NOT MERGE
Geoff Mendal [Thu, 12 Feb 2015 23:05:04 +0000 (23:05 +0000)]
am
5c7e4d99: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
* commit '
5c7e4d99402bf0440ebd6713b6680f8abea175a3':
Import translations. DO NOT MERGE
Geoff Mendal [Thu, 12 Feb 2015 23:04:59 +0000 (23:04 +0000)]
am
be5aa9dd: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
* commit '
be5aa9dda325a29c3f34cb9a97958c63f120f15e':
Import translations. DO NOT MERGE
Geoff Mendal [Thu, 12 Feb 2015 23:04:54 +0000 (23:04 +0000)]
am
6113edf5: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
* commit '
6113edf578bba44de85698624026b4f48652fef9':
Import translations. DO NOT MERGE
Geoff Mendal [Thu, 12 Feb 2015 23:04:27 +0000 (15:04 -0800)]
Import translations. DO NOT MERGE
Change-Id: I57a4ac857f18a1e365e79198ac5de60748847add
Auto-generated-cl: translation import
Geoff Mendal [Thu, 12 Feb 2015 23:01:28 +0000 (23:01 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
Geoff Mendal [Thu, 12 Feb 2015 23:01:17 +0000 (23:01 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
Geoff Mendal [Thu, 12 Feb 2015 23:00:57 +0000 (23:00 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
Geoff Mendal [Thu, 12 Feb 2015 23:00:44 +0000 (23:00 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
Geoff Mendal [Thu, 12 Feb 2015 23:00:16 +0000 (23:00 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
Geoff Mendal [Thu, 12 Feb 2015 22:59:57 +0000 (22:59 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
Geoff Mendal [Thu, 12 Feb 2015 22:59:23 +0000 (22:59 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
Geoff Mendal [Thu, 12 Feb 2015 22:58:45 +0000 (22:58 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
John Spurlock [Thu, 12 Feb 2015 22:58:44 +0000 (22:58 +0000)]
am
f45e5dbf: Merge "NoMan: Initialize filter value reported to listeners." into lmp-mr1-dev
* commit '
f45e5dbf599a0043d7f6576f20eafb2c1c157204':
NoMan: Initialize filter value reported to listeners.
Geoff Mendal [Thu, 12 Feb 2015 22:55:57 +0000 (14:55 -0800)]
Import translations. DO NOT MERGE
Change-Id: I592c996ee5bd1d20bcd4ea595b3e6cbba08a4d0c
Auto-generated-cl: translation import
Geoff Mendal [Thu, 12 Feb 2015 22:53:58 +0000 (14:53 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ia9e245c983da6b04f3098269e611d1e193899be8
Auto-generated-cl: translation import
Todd Volkert [Thu, 12 Feb 2015 22:52:20 +0000 (22:52 +0000)]
Merge "Increase visibility of Transition.areValuesChanged() to protected to allow subclasses outside the android.transition package to override it."
John Spurlock [Thu, 12 Feb 2015 22:52:12 +0000 (22:52 +0000)]
Merge "NoMan: Initialize filter value reported to listeners." into lmp-mr1-dev
Geoff Mendal [Thu, 12 Feb 2015 22:51:47 +0000 (14:51 -0800)]
Import translations. DO NOT MERGE
Change-Id: I44a5695c1b18476df2114f16e35fbcbf2a0d99c1
Auto-generated-cl: translation import
Todd Volkert [Thu, 12 Feb 2015 21:34:29 +0000 (13:34 -0800)]
Increase visibility of Transition.areValuesChanged() to protected to allow
subclasses outside the android.transition package to override it.
Change-Id: Ife5de79b339b6d7598411ad851858f4c52a89f5c
Geoff Mendal [Thu, 12 Feb 2015 22:46:15 +0000 (14:46 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ic17d83f48e83832042cd417f1196e6f108ad1724
Auto-generated-cl: translation import
Svetoslav [Thu, 12 Feb 2015 22:44:07 +0000 (22:44 +0000)]
Merge "Handle a missed case in query the settings provider"
Svetoslav [Thu, 12 Feb 2015 22:11:42 +0000 (14:11 -0800)]
Handle a missed case in query the settings provider
bug:
19361521
Change-Id: Ibf4731b5d665563bb87ef93a4cf63e4c4d2e46a4
Geoff Mendal [Thu, 12 Feb 2015 22:42:44 +0000 (14:42 -0800)]
Import translations. DO NOT MERGE
Change-Id: I8cdc3195ba20c25fab9de6c0063667f5250e6e51
Auto-generated-cl: translation import
Geoff Mendal [Thu, 12 Feb 2015 22:40:46 +0000 (14:40 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ia8018b29159267ee751a6eb84713409f17fca2b8
Auto-generated-cl: translation import
Geoff Mendal [Thu, 12 Feb 2015 22:35:01 +0000 (14:35 -0800)]
Import translations. DO NOT MERGE
Change-Id: I9c7b354d532f6631e9e1e1500e0c544379f08b2e
Auto-generated-cl: translation import
Geoff Mendal [Thu, 12 Feb 2015 22:32:53 +0000 (14:32 -0800)]
Import translations. DO NOT MERGE
Change-Id: I687ccfbddefdf63cdf6b5ef561dbf8261d66ce73
Auto-generated-cl: translation import
Casey Burkhardt [Thu, 12 Feb 2015 22:07:55 +0000 (14:07 -0800)]
Support circular magnification frame on circular devices
The magnification viewport expects its boundary to be a rectangular region,
and always draws it as such. This change causes the indicator to draw as a
circle on devices with circular displays. This also refactors the width of
the indicator's frame to use a proper dimension resource and updates the
width to 4dip.
Bug:
18242438
Change-Id: I1d86647b6d1ef84f5dd506f4141223ec050a79b5
Jim Miller [Thu, 12 Feb 2015 22:12:30 +0000 (22:12 +0000)]
am
4bbd3cb3: am
b1e80278: am
b2ff8d9a: Merge "Fix accessibility focus bug in statusbar" into lmp-mr1-dev
automerge:
0bb6071
* commit '
0bb60712f736fef0c3509231afed0fff7f8bfd2b':
Fix accessibility focus bug in statusbar
Jim Miller [Thu, 12 Feb 2015 22:10:48 +0000 (22:10 +0000)]
am
4bbd3cb3: am
b1e80278: am
b2ff8d9a: Merge "Fix accessibility focus bug in statusbar" into lmp-mr1-dev
* commit '
4bbd3cb3e8494de71ac5ac2aed49e6c56c3b9f68':
Fix accessibility focus bug in statusbar
Jim Miller [Thu, 12 Feb 2015 22:04:28 +0000 (22:04 +0000)]
am
b1e80278: am
b2ff8d9a: Merge "Fix accessibility focus bug in statusbar" into lmp-mr1-dev
* commit '
b1e80278f80585a1c3f46dbc578bbbafbcbd80c1':
Fix accessibility focus bug in statusbar
Jim Miller [Thu, 12 Feb 2015 21:55:06 +0000 (21:55 +0000)]
am
b2ff8d9a: Merge "Fix accessibility focus bug in statusbar" into lmp-mr1-dev
* commit '
b2ff8d9a3e5f279e7a60a12f9192e43081e2eef9':
Fix accessibility focus bug in statusbar
Jim Miller [Thu, 12 Feb 2015 21:48:10 +0000 (21:48 +0000)]
Merge "Fix accessibility focus bug in statusbar" into lmp-mr1-dev
Tor Norbye [Thu, 12 Feb 2015 21:40:35 +0000 (21:40 +0000)]
Merge "Update the @ServiceName annotation"
Raph Levien [Thu, 12 Feb 2015 20:34:44 +0000 (20:34 +0000)]
Merge "Interval tree for SpannableStringBuilder"
Chris Craik [Thu, 12 Feb 2015 20:32:56 +0000 (20:32 +0000)]
Merge "Glop Bitmap and RoundRect clipping support"
Chris Craik [Wed, 11 Feb 2015 21:17:06 +0000 (13:17 -0800)]
Glop Bitmap and RoundRect clipping support
Change-Id: I4577546a5d2e5f084cc03f39a89db9231b8111ee
Raph Levien [Thu, 5 Feb 2015 04:09:03 +0000 (20:09 -0800)]
Interval tree for SpannableStringBuilder
This CL greatly improves the speed of SpannableStringBuilder by storing
the spans as an interval tree with binary search.
Bug:
7404182
Change-Id: I2540b2cfe8aef128337e63829479660ba51e62b5
destradaa [Thu, 12 Feb 2015 20:30:05 +0000 (20:30 +0000)]
Merge "Intern strings used in Sensor information."
Tor Norbye [Thu, 12 Feb 2015 19:47:32 +0000 (11:47 -0800)]
Update the @ServiceName annotation
It was missing some recently added services (and some unhidden
services). For completeness also include newly added hidden services
as comments such that if they get unhidden in the future it's more
likely that a search and replace update will discover the annotation
reference as well.
Change-Id: I04ff5e1cf7b14b19c3650a49403771ef4f14c862
Geoff Mendal [Thu, 12 Feb 2015 19:40:59 +0000 (19:40 +0000)]
am
615adb8b: (-s ours) am
a673af77: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
* commit '
615adb8bc80efa8c4b6d45387a500e8ab77bc692':
Import translations. DO NOT MERGE
Jeremy Joslin [Thu, 12 Feb 2015 19:40:58 +0000 (19:40 +0000)]
Merge branch 'master' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base
Jeremy Joslin [Thu, 12 Feb 2015 19:40:48 +0000 (19:40 +0000)]
am
f69f3737: am
1267462c: am
f456d4dc: am
20be0e25: Merge "Update Javadoc for EXTRA_NETWORK." into lmp-mr1-dev
* commit '
f69f3737ba8cb2acb481dc78de3c5275bae112e7':
Update Javadoc for EXTRA_NETWORK.
Jeremy Joslin [Thu, 12 Feb 2015 19:39:20 +0000 (19:39 +0000)]
am
1267462c: am
f456d4dc: am
20be0e25: Merge "Update Javadoc for EXTRA_NETWORK." into lmp-mr1-dev
automerge:
f69f373
* commit '
f69f3737ba8cb2acb481dc78de3c5275bae112e7':
Update Javadoc for EXTRA_NETWORK.
Benjamin Franz [Thu, 12 Feb 2015 19:37:50 +0000 (19:37 +0000)]
am
dd0027cf: am
40ab8bb2: am
c70d0e71: Fix the javadocs for lock task mode intents.
automerge:
6076ef9
* commit '
6076ef9355fec90c40d84abaf2c71345f32badfb':
Fix the javadocs for lock task mode intents.
Narayan Kamath [Thu, 12 Feb 2015 19:36:35 +0000 (19:36 +0000)]
am
c7e48719: Merge "Remove references to persist.sys.language/country." automerge:
8be3724
automerge:
00e821a
* commit '
00e821a8608efdc19041bdda1e832d3d4b3c29e2':
Remove references to persist.sys.language/country.
Svetoslav [Thu, 12 Feb 2015 19:32:21 +0000 (19:32 +0000)]
Merge "Fix a reversed condition in the next alarm validator"
Svetoslav [Thu, 12 Feb 2015 19:30:36 +0000 (11:30 -0800)]
Fix a reversed condition in the next alarm validator
bug:
19361375
Change-Id: Ib5ac90503842aafd994423632fd1f463e49088a0
Neil Fuller [Thu, 12 Feb 2015 19:29:45 +0000 (19:29 +0000)]
Merge "Remove usages of FloatMath" automerge:
a8e8cdb automerge:
27316a9
automerge:
c1a5e82
* commit '
c1a5e82c25dba954cf1c06729e53bfb67667bcbb':
Remove usages of FloatMath
Tao Bao [Thu, 12 Feb 2015 19:27:33 +0000 (19:27 +0000)]
Merge "resolve merge conflicts of
6d8886a to "
Tao Bao [Thu, 12 Feb 2015 19:09:47 +0000 (11:09 -0800)]
resolve merge conflicts of
6d8886a to master.
Change-Id: If8798a1d87b35e2db56211bf0e7dea94bed91b6a
Geoff Mendal [Thu, 12 Feb 2015 19:20:42 +0000 (19:20 +0000)]
am
a673af77: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
* commit '
a673af77d95f4a3d46e5d71188256b27e06cc442':
Import translations. DO NOT MERGE
Alan Viverette [Thu, 12 Feb 2015 19:15:52 +0000 (19:15 +0000)]
Merge "Add support for user-selectable night mode"
Geoff Mendal [Thu, 12 Feb 2015 19:13:53 +0000 (19:13 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
Alan Viverette [Thu, 12 Feb 2015 19:01:06 +0000 (11:01 -0800)]
Add support for user-selectable night mode
Adds a Material theme that automatically selects light or dark UI based
on the night mode resource qualifier.
Removes restriction that night mode only works when car mode is enabled
or the device is docked, which was applied inconsistently anyway and
only actually worked when in car mode (regardless of docked state).
Night mode is now always applied according to the system preference.
Change-Id: I526807c907eb29a2ab588d15932afe3e6ab180c2
Mike Lockwood [Thu, 12 Feb 2015 18:58:52 +0000 (10:58 -0800)]
MidiManager API tweaks:
Rename MidiReceiver.onPost() to post()
Change MidiManager.DeviceCallback from an interface to a class
Change-Id: I939ba7a7d82e721b90a3d80252a88e7a650c9396
Jeremy Joslin [Thu, 12 Feb 2015 18:56:35 +0000 (18:56 +0000)]
am
1267462c: am
f456d4dc: am
20be0e25: Merge "Update Javadoc for EXTRA_NETWORK." into lmp-mr1-dev
* commit '
1267462c0bf8ef5a0cfaca535847fc962b2cf32e':
Update Javadoc for EXTRA_NETWORK.
Alan Viverette [Thu, 12 Feb 2015 18:51:39 +0000 (18:51 +0000)]
Merge "API for adding layers to LayerDrawable"
Geoff Mendal [Thu, 12 Feb 2015 18:51:28 +0000 (10:51 -0800)]
Import translations. DO NOT MERGE
Change-Id: Idd108e5eb791007b3604c67ce4a0853a368a445e
Auto-generated-cl: translation import
Alan Viverette [Thu, 12 Feb 2015 01:49:54 +0000 (17:49 -0800)]
API for adding layers to LayerDrawable
Change-Id: I859c956a47d95fa1ce65b9eea9bc7be4659486bf
Jeremy Joslin [Thu, 12 Feb 2015 18:47:14 +0000 (18:47 +0000)]
am
f456d4dc: am
20be0e25: Merge "Update Javadoc for EXTRA_NETWORK." into lmp-mr1-dev
* commit '
f456d4dcc042581cb2a3ba540538898f2cc925b7':
Update Javadoc for EXTRA_NETWORK.
Jeremy Joslin [Thu, 12 Feb 2015 18:41:17 +0000 (18:41 +0000)]
am
20be0e25: Merge "Update Javadoc for EXTRA_NETWORK." into lmp-mr1-dev
* commit '
20be0e25ba660a7555577988cefcfa36d84e7e2f':
Update Javadoc for EXTRA_NETWORK.
Jeremy Joslin [Thu, 12 Feb 2015 18:34:01 +0000 (18:34 +0000)]
Merge "Update Javadoc for EXTRA_NETWORK." into lmp-mr1-dev
John Spurlock [Thu, 12 Feb 2015 18:29:37 +0000 (13:29 -0500)]
NoMan: Initialize filter value reported to listeners.
In addition to relying on change callbacks.
Bug:
19288429
Change-Id: Id54473e5fbb4eac3778781a2052ba0103076f8d1
OSDN Git Service
