summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "MidiManager API tweaks:"Mike Lockwood2015-02-136-12/+14
|\
| * MidiManager API tweaks:Mike Lockwood2015-02-126-12/+14
| | | | | | | | | | | | | | | | Rename MidiReceiver.onPost() to post() Change MidiManager.DeviceCallback from an interface to a class Change-Id: I939ba7a7d82e721b90a3d80252a88e7a650c9396
* | Merge "Increase visibility of Transition.areValuesChanged() to protected to ↵Todd Volkert2015-02-124-3/+15
|\ \ | | | | | | | | | allow subclasses outside the android.transition package to override it."
| * | Increase visibility of Transition.areValuesChanged() to protected to allowTodd Volkert2015-02-124-3/+15
| | | | | | | | | | | | | | | | | | subclasses outside the android.transition package to override it. Change-Id: Ib6a5502827e734de7494958b510afc9ddb80dffe
* | | am 6f2dd8a9: Merge "Support circular magnification frame on circular ↵Casey Burkhardt2015-02-123-5/+23
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | devices" into lmp-mr1-modular-dev automerge: d1a5b5d * commit 'd1a5b5dc07dc3798ae13a5a9538b5e5bbbeb8058': Support circular magnification frame on circular devices
| * \ \ am 6f2dd8a9: Merge "Support circular magnification frame on circular ↵Casey Burkhardt2015-02-123-5/+23
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | devices" into lmp-mr1-modular-dev * commit '6f2dd8a9b195a2bc8538820d8685a4a0576964f9': Support circular magnification frame on circular devices
| | * \ \ Merge "Support circular magnification frame on circular devices" into ↵Casey Burkhardt2015-02-123-5/+23
| | |\ \ \ | | | | | | | | | | | | | | | | | | lmp-mr1-modular-dev
| | | * | | Support circular magnification frame on circular devicesCasey Burkhardt2015-02-123-5/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | am 77c5de0d: (-s ours) Merge "Import translations. DO NOT MERGE" into ↵Geoff Mendal2015-02-120-0/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-modular-dev automerge: 6c02d92 -s ours * commit '6c02d9239885a529d4b160aa3938b14c61fbc3fd': Import translations. DO NOT MERGE
| * | | | | am 77c5de0d: (-s ours) Merge "Import translations. DO NOT MERGE" into ↵Geoff Mendal2015-02-120-0/+0
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-modular-dev * commit '77c5de0d68fb1e40e01082cf97758b2d35bfca91': Import translations. DO NOT MERGE
| | * | | | Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-devGeoff Mendal2015-02-122-3/+3
| | |\ \ \ \
| | | * | | | Import translations. DO NOT MERGEGeoff Mendal2015-02-122-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I536dd9e059bc42c5c399539e62d8aed02c9e446a Auto-generated-cl: translation import
* | | | | | | am fabfcfd9: (-s ours) Merge "Import translations. DO NOT MERGE" into ↵Geoff Mendal2015-02-120-0/+0
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-modular-dev automerge: f6ee5db -s ours * commit 'f6ee5dbc5efc90467dd46c5317807676fdaf8ae6': Import translations. DO NOT MERGE
| * | | | | | am fabfcfd9: (-s ours) Merge "Import translations. DO NOT MERGE" into ↵Geoff Mendal2015-02-120-0/+0
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-modular-dev * commit 'fabfcfd97e37b1cc194fa0e9f6db3268e1a2ae43': Import translations. DO NOT MERGE
| | * | | | | Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-devGeoff Mendal2015-02-129-14/+14
| | |\ \ \ \ \
| | | * | | | | Import translations. DO NOT MERGEGeoff Mendal2015-02-129-14/+14
| | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I57a4ac857f18a1e365e79198ac5de60748847add Auto-generated-cl: translation import
* | | | | | | am 1be4b702: am 7e7c91ec: am e4049b6d: am f45e5dbf: Merge "NoMan: Initialize ↵John Spurlock2015-02-121-0/+2
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | / / | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | filter value reported to listeners." into lmp-mr1-dev * commit '1be4b702f531363903b46a88fc3d1603fb19c3ef': NoMan: Initialize filter value reported to listeners.
| * | | | | am 7e7c91ec: am e4049b6d: am f45e5dbf: Merge "NoMan: Initialize filter value ↵John Spurlock2015-02-121-0/+2
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | reported to listeners." into lmp-mr1-dev * commit '7e7c91ec95eca5e1089ede9953f27d8c3d3b8bea': NoMan: Initialize filter value reported to listeners.
| | * | | | am e4049b6d: am f45e5dbf: Merge "NoMan: Initialize filter value reported to ↵John Spurlock2015-02-121-0/+2
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | listeners." into lmp-mr1-dev * commit 'e4049b6d36ded6ec808be5f884248772a4059a72': NoMan: Initialize filter value reported to listeners.
| | | * \ \ \ am f45e5dbf: Merge "NoMan: Initialize filter value reported to listeners." ↵John Spurlock2015-02-121-0/+2
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-mr1-dev * commit 'f45e5dbf599a0043d7f6576f20eafb2c1c157204': NoMan: Initialize filter value reported to listeners.
| | | | * \ \ \ Merge "NoMan: Initialize filter value reported to listeners." into lmp-mr1-devJohn Spurlock2015-02-121-0/+2
| | | | |\ \ \ \
| | | | | * | | | NoMan: Initialize filter value reported to listeners.John Spurlock2015-02-121-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In addition to relying on change callbacks. Bug: 19288429 Change-Id: Id54473e5fbb4eac3778781a2052ba0103076f8d1
* | | | | | | | | am 5a2b966a: (-s ours) am e22cd0f9: (-s ours) Merge "Import translations. DO ↵Geoff Mendal2015-02-120-0/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NOT MERGE" into lmp-mr1-modular-dev * commit '5a2b966ac490e59d0285934ac652dbaa02764f6b': Import translations. DO NOT MERGE
| * | | | | | | | am e22cd0f9: (-s ours) Merge "Import translations. DO NOT MERGE" into ↵Geoff Mendal2015-02-120-0/+0
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-modular-dev * commit 'e22cd0f9e6da18fe6827a481774e2998efbb5f46': Import translations. DO NOT MERGE
| | * | | | | | | Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-devGeoff Mendal2015-02-129-13/+13
| | |\ \ \ \ \ \ \
| | | * | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-02-129-13/+13
| | | | |_|_|/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I592c996ee5bd1d20bcd4ea595b3e6cbba08a4d0c Auto-generated-cl: translation import
* | | | | | | | | am cd15d997: (-s ours) am dfe8fe3f: (-s ours) Merge "Import translations. DO ↵Geoff Mendal2015-02-120-0/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NOT MERGE" into lmp-mr1-modular-dev * commit 'cd15d99721b514d6b104302217805ded5e194e43': Import translations. DO NOT MERGE
| * | | | | | | | am dfe8fe3f: (-s ours) Merge "Import translations. DO NOT MERGE" into ↵Geoff Mendal2015-02-120-0/+0
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-modular-dev * commit 'dfe8fe3fcf551386d6107b67bc348d88207979c3': Import translations. DO NOT MERGE
| | * | | | | | | Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-devGeoff Mendal2015-02-1221-5/+141
| | |\ \ \ \ \ \ \
| | | * | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-02-1221-5/+141
| | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia9e245c983da6b04f3098269e611d1e193899be8 Auto-generated-cl: translation import
* | | | | | | | | am 682cec12: (-s ours) am 39b03e76: (-s ours) Merge "Import translations. DO ↵Geoff Mendal2015-02-120-0/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NOT MERGE" into lmp-mr1-modular-dev * commit '682cec120ee73d8e831e4d04c478712dc408cf02': Import translations. DO NOT MERGE
| * | | | | | | | am 39b03e76: (-s ours) Merge "Import translations. DO NOT MERGE" into ↵Geoff Mendal2015-02-120-0/+0
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-modular-dev * commit '39b03e76365d1da92de51da3bd9f7677c7b16af8': Import translations. DO NOT MERGE
| | * | | | | | | Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-devGeoff Mendal2015-02-121-1/+1
| | |\ \ \ \ \ \ \
| | | * | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-02-121-1/+1
| | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I44a5695c1b18476df2114f16e35fbcbf2a0d99c1 Auto-generated-cl: translation import
* | | | | | | | | am 8a18ac3d: (-s ours) am 7c958e2d: (-s ours) Merge "Import translations. DO ↵Geoff Mendal2015-02-120-0/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NOT MERGE" into lmp-mr1-modular-dev * commit '8a18ac3d858262b93ba7270e99e25c261892bc80': Import translations. DO NOT MERGE
| * | | | | | | | am 7c958e2d: (-s ours) Merge "Import translations. DO NOT MERGE" into ↵Geoff Mendal2015-02-120-0/+0
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-modular-dev * commit '7c958e2df0375761a1851cd02ca3aac3ee95f1c5': Import translations. DO NOT MERGE
| | * | | | | | | Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-devGeoff Mendal2015-02-122-2/+2
| | |\ \ \ \ \ \ \
| | | * | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-02-122-2/+2
| | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic17d83f48e83832042cd417f1196e6f108ad1724 Auto-generated-cl: translation import
* | | | | | | | | am f23a517a: (-s ours) am dc43cc88: (-s ours) Merge "Import translations. DO ↵Geoff Mendal2015-02-120-0/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NOT MERGE" into lmp-mr1-modular-dev * commit 'f23a517add2ad6c587bcfa691a1ac048818a39de': Import translations. DO NOT MERGE
| * | | | | | | | am dc43cc88: (-s ours) Merge "Import translations. DO NOT MERGE" into ↵Geoff Mendal2015-02-120-0/+0
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-modular-dev * commit 'dc43cc88f02bde0917525e9fe274453bc000eb0a': Import translations. DO NOT MERGE
| | * | | | | | | Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-devGeoff Mendal2015-02-122-3/+3
| | |\ \ \ \ \ \ \
| | | * | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-02-122-3/+3
| | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8cdc3195ba20c25fab9de6c0063667f5250e6e51 Auto-generated-cl: translation import
* | | | | | | | | am df45d644: (-s ours) am 5c7e4d99: (-s ours) Merge "Import translations. DO ↵Geoff Mendal2015-02-120-0/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NOT MERGE" into lmp-mr1-modular-dev * commit 'df45d644b6fd4dda8d2e2b650ce262a2c5b3fe79': Import translations. DO NOT MERGE
| * | | | | | | | am 5c7e4d99: (-s ours) Merge "Import translations. DO NOT MERGE" into ↵Geoff Mendal2015-02-120-0/+0
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-modular-dev * commit '5c7e4d99402bf0440ebd6713b6680f8abea175a3': Import translations. DO NOT MERGE
| | * | | | | | | Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-devGeoff Mendal2015-02-125-12/+12
| | |\ \ \ \ \ \ \
| | | * | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-02-125-12/+12
| | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia8018b29159267ee751a6eb84713409f17fca2b8 Auto-generated-cl: translation import
* | | | | | | | | am a01f5457: (-s ours) am be5aa9dd: (-s ours) Merge "Import translations. DO ↵Geoff Mendal2015-02-120-0/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NOT MERGE" into lmp-mr1-modular-dev * commit 'a01f5457bc819fcb48ba1bae1849f54138510ea7': Import translations. DO NOT MERGE
| * | | | | | | | am be5aa9dd: (-s ours) Merge "Import translations. DO NOT MERGE" into ↵Geoff Mendal2015-02-120-0/+0
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-modular-dev * commit 'be5aa9dda325a29c3f34cb9a97958c63f120f15e': Import translations. DO NOT MERGE
| | * | | | | | | Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-devGeoff Mendal2015-02-128-19/+13
| | |\ \ \ \ \ \ \
| | | * | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-02-128-19/+13
| | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9c7b354d532f6631e9e1e1500e0c544379f08b2e Auto-generated-cl: translation import
generated by cgit v1.1 at 2025-02-05 07:37:23 +0000