OSDN Git Service

android-x86/frameworks-base.git
9 years agoVolume: Allow dialog to query "muteable" streams.
John Spurlock [Tue, 17 Feb 2015 16:01:51 +0000 (11:01 -0500)]
Volume: Allow dialog to query "muteable" streams.

Similar to the existing ability to query streams affected
by ringer mode.

Bug:19260237
Change-Id: I76eb5ab6b7c7e3a4d73ac1909289c560194d4fe8

9 years agoMerge "Allow sysui-managed remote volume controllers."
John Spurlock [Fri, 13 Feb 2015 14:50:49 +0000 (14:50 +0000)]
Merge "Allow sysui-managed remote volume controllers."

9 years agoMerge "Remove code that sets user.* system properties."
Narayan Kamath [Fri, 13 Feb 2015 12:33:51 +0000 (12:33 +0000)]
Merge "Remove code that sets user.* system properties."

9 years agoam a511eea8: (-s ours) am aee7f64c: am b4a5c04c: Merge "Remove code that sets user...
Narayan Kamath [Fri, 13 Feb 2015 12:19:13 +0000 (12:19 +0000)]
am a511eea8: (-s ours) am aee7f64c: am b4a5c04c: Merge "Remove code that sets user.* system properties."

* commit 'a511eea83b0209729e4b42e219f233f818a6d9e7':
  Remove code that sets user.* system properties.

9 years agoam aee7f64c: am b4a5c04c: Merge "Remove code that sets user.* system properties."
Narayan Kamath [Fri, 13 Feb 2015 12:09:31 +0000 (12:09 +0000)]
am aee7f64c: am b4a5c04c: Merge "Remove code that sets user.* system properties."

* commit 'aee7f64c10ffd2135dc98f7a540836ad7a32438b':
  Remove code that sets user.* system properties.

9 years agoam b4a5c04c: Merge "Remove code that sets user.* system properties."
Narayan Kamath [Fri, 13 Feb 2015 12:04:36 +0000 (12:04 +0000)]
am b4a5c04c: Merge "Remove code that sets user.* system properties."

* commit 'b4a5c04c305a04a876728397dec7cc809e26b823':
  Remove code that sets user.* system properties.

9 years agoRemove code that sets user.* system properties.
Narayan Kamath [Thu, 12 Feb 2015 17:50:24 +0000 (17:50 +0000)]
Remove code that sets user.* system properties.

This has been disallowed by the SELinux for several years now,
so can safely be removed. Given that saveLocaleLocked is
simplified quite a bit, we can now inline into its only caller.

bug: 18910417

(cherry picked from commit 70e8f6600de8a2b9cbb17cd919b14a4609fc68bd)

Change-Id: Ib2888ea22ffca6f4b402efd5780f89c924cd1570

9 years agoMerge "Remove code that sets user.* system properties."
Narayan Kamath [Fri, 13 Feb 2015 11:57:38 +0000 (11:57 +0000)]
Merge "Remove code that sets user.* system properties."

9 years agoRemove code that sets user.* system properties.
Narayan Kamath [Thu, 12 Feb 2015 17:50:24 +0000 (17:50 +0000)]
Remove code that sets user.* system properties.

This has been disallowed by the SELinux for several years now,
so can safely be removed. Given that saveLocaleLocked is
simplified quite a bit, we can now inline into its only caller.

bug: 18910417

Change-Id: I18251f77e4a25a0e7ecda8e85a9b3fcdc2dc7b05

9 years agoMerge "Move apache specific portions of android.net.http to external/apache-http."
Narayan Kamath [Fri, 13 Feb 2015 09:51:41 +0000 (09:51 +0000)]
Merge "Move apache specific portions of android.net.http to external/apache-http."

9 years agoam 04057e5d: am 5136791b: am 599c1042: Accessibility: Ensure fresh accessilbity focus...
Svetoslav [Fri, 13 Feb 2015 03:57:05 +0000 (03:57 +0000)]
am 04057e5d: am 5136791b: am 599c1042: Accessibility: Ensure fresh accessilbity focused and input focused nodes. automerge: 27ad2e9

* commit '04057e5d14030ef54c522b2372019cf2858083e9':
  Accessibility: Ensure fresh accessilbity focused and input focused nodes.

9 years agoam 5136791b: am 599c1042: Accessibility: Ensure fresh accessilbity focused and input...
Svetoslav [Fri, 13 Feb 2015 03:49:40 +0000 (03:49 +0000)]
am 5136791b: am 599c1042: Accessibility: Ensure fresh accessilbity focused and input focused nodes. automerge: 27ad2e9

* commit '5136791b3429d1964b9202fb7caad52719408a61':
  Accessibility: Ensure fresh accessilbity focused and input focused nodes.

9 years agoAllow sysui-managed remote volume controllers.
John Spurlock [Thu, 12 Feb 2015 00:04:11 +0000 (19:04 -0500)]
Allow sysui-managed remote volume controllers.

- Relax restriction on audio service calls that assume the volume
  ui is systemui, allow calls from a blessed component app.
- Blessed component app service saved in secure settings.
- SystemUI mediates requests to replace the volume dialog, prompts
  the user on activation.
- Show a low pri ongoing notification when the volume dialog is
  being replaced, to allow user restoration at any time.
- Replace the controller management code in VolumeUI to use a
  ServiceMonitor, backed by the new blessed app component setting.
- Add proper zen-related noman client wrappers, make avail to the
  registered volume controller.
- Everything is still @hidden, no api impact.

Bug: 19260237
Change-Id: Ie1383f57659090318a7eda737fdad5b8f88737d4

9 years agoam 599c1042: Accessibility: Ensure fresh accessilbity focused and input focused nodes...
Svetoslav [Fri, 13 Feb 2015 03:43:29 +0000 (03:43 +0000)]
am 599c1042: Accessibility: Ensure fresh accessilbity focused and input focused nodes. automerge: 27ad2e9

* commit '599c1042896564906935bc688bbb85515a6dfa45':
  Accessibility: Ensure fresh accessilbity focused and input focused nodes.

9 years agoAccessibility: Ensure fresh accessilbity focused and input focused nodes.
Svetoslav [Fri, 13 Feb 2015 03:37:00 +0000 (03:37 +0000)]
Accessibility: Ensure fresh accessilbity focused and input focused nodes.
automerge: 27ad2e9

* commit '27ad2e95b40fd0ca76de384695498ea114d627ca':
  Accessibility: Ensure fresh accessilbity focused and input focused nodes.

9 years agoam f80fa0b5: am 6c477a29: am ec403e8f: Merge "Call startInput on return from sleep...
Jeff Brown [Fri, 13 Feb 2015 02:17:56 +0000 (02:17 +0000)]
am f80fa0b5: am 6c477a29: am ec403e8f: Merge "Call startInput on return from sleep mode"

* commit 'f80fa0b5d9b5567731dc19b4b5fc73816c131910':
  Call startInput on return from sleep mode

9 years agoam 6c477a29: am ec403e8f: Merge "Call startInput on return from sleep mode"
Jeff Brown [Fri, 13 Feb 2015 02:11:43 +0000 (02:11 +0000)]
am 6c477a29: am ec403e8f: Merge "Call startInput on return from sleep mode"

* commit '6c477a29bfc604f6dbf90e0d4ac5c99bc0ed2ff7':
  Call startInput on return from sleep mode

9 years agoam ec403e8f: Merge "Call startInput on return from sleep mode"
Jeff Brown [Fri, 13 Feb 2015 02:06:01 +0000 (02:06 +0000)]
am ec403e8f: Merge "Call startInput on return from sleep mode"

* commit 'ec403e8f476c817b87c0ef9297fdb548e8b1e4e4':
  Call startInput on return from sleep mode

9 years agoMerge "Call startInput on return from sleep mode"
Jeff Brown [Fri, 13 Feb 2015 02:00:00 +0000 (02:00 +0000)]
Merge "Call startInput on return from sleep mode"

9 years agoAccessibility: Ensure fresh accessilbity focused and input focused nodes.
Svetoslav [Fri, 13 Feb 2015 01:54:15 +0000 (17:54 -0800)]
Accessibility: Ensure fresh accessilbity focused and input focused nodes.

Change-Id: Ia3c84284843a415cdbbc2b6a9b06d9ddffbe0e04

9 years agoam 5cef9f8f: am fb7c14c5: am 41af9d59: Merge "camera2: Fix legacy scaling factor...
Ruben Brunk [Fri, 13 Feb 2015 01:45:49 +0000 (01:45 +0000)]
am 5cef9f8f: am fb7c14c5: am 41af9d59: Merge "camera2: Fix legacy scaling factor application." into lmp-mr1-dev automerge: d2ccbd4

* commit '5cef9f8f3ff26dc91f31ce1c3c1543df64ea1eba':

9 years agoam ff475c0e: Merge "camera2: Fix legacy scaling factor application." into lmp-mr1...
Ruben Brunk [Fri, 13 Feb 2015 01:45:27 +0000 (01:45 +0000)]
am ff475c0e: Merge "camera2: Fix legacy scaling factor application." into lmp-mr1-dev automerge: d2ccbd4 automerge: 41af9d5

* commit 'ff475c0ea71ffd5f015cce1462daf373129ca896':
  camera2: Fix legacy scaling factor application.

9 years agoam fb7c14c5: am 41af9d59: Merge "camera2: Fix legacy scaling factor application....
Ruben Brunk [Fri, 13 Feb 2015 01:39:42 +0000 (01:39 +0000)]
am fb7c14c5: am 41af9d59: Merge "camera2: Fix legacy scaling factor application." into lmp-mr1-dev automerge: d2ccbd4

* commit 'fb7c14c5f974cad8b74e51cc8fab86c276626780':

9 years agoMerge "camera2: Fix legacy scaling factor application." into lmp-mr1-dev automerge...
Ruben Brunk [Fri, 13 Feb 2015 01:36:13 +0000 (01:36 +0000)]
Merge "camera2: Fix legacy scaling factor application." into lmp-mr1-dev automerge: d2ccbd4
automerge: 41af9d5

* commit '41af9d592efbae88ed95ab77a856dd4e8fbab998':
  camera2: Fix legacy scaling factor application.

9 years agoam 41af9d59: Merge "camera2: Fix legacy scaling factor application." into lmp-mr1...
Ruben Brunk [Fri, 13 Feb 2015 01:33:42 +0000 (01:33 +0000)]
am 41af9d59: Merge "camera2: Fix legacy scaling factor application." into lmp-mr1-dev automerge: d2ccbd4

* commit '41af9d592efbae88ed95ab77a856dd4e8fbab998':
  camera2: Fix legacy scaling factor application.

9 years agoMerge "camera2: Fix legacy scaling factor application." into lmp-mr1-dev
Ruben Brunk [Fri, 13 Feb 2015 01:28:23 +0000 (01:28 +0000)]
Merge "camera2: Fix legacy scaling factor application." into lmp-mr1-dev
automerge: d2ccbd4

* commit 'd2ccbd43d24a79122e404206c528995600a6507d':
  camera2: Fix legacy scaling factor application.

9 years agoMerge "camera2: Fix legacy scaling factor application." into lmp-mr1-dev
Ruben Brunk [Fri, 13 Feb 2015 01:22:24 +0000 (01:22 +0000)]
Merge "camera2: Fix legacy scaling factor application." into lmp-mr1-dev

9 years agoMerge "Track line numbers in lint script."
Jeff Sharkey [Fri, 13 Feb 2015 01:07:16 +0000 (01:07 +0000)]
Merge "Track line numbers in lint script."

9 years agoam 15ebb4da: am 96a99bc3: am b9f9408c: am 474746c7: am 2ea209ab: am 8d0df9b8: Merge...
Luan Nguyen [Fri, 13 Feb 2015 00:40:58 +0000 (00:40 +0000)]
am 15ebb4da: am 96a99bc3: am b9f9408c: am 474746c7: am 2ea209ab: am 8d0df9b8: Merge "docs: Update device art generator to include Wear generic devices." into lmp-docs automerge: fe2c687

* commit '15ebb4daab95c5ae85ebe5070099d2ab3be83676':
  docs: Update device art generator to include Wear generic devices.

9 years agoam 4317ab13: am 86391a2f: am b967f720: am 71cf2b6d: am e726495a: am fe5e7e92: Merge...
Luan Nguyen [Fri, 13 Feb 2015 00:40:54 +0000 (00:40 +0000)]
am 4317ab13: am 86391a2f: am b967f720: am 71cf2b6d: am e726495a: am fe5e7e92: Merge "docs: Fix issue with onCreate() method declaration in file backup section" into lmp-docs automerge: e0306bb

* commit '4317ab134b1c46d23429f3a92c4ecd5a4d385b8e':
  docs: Fix issue with onCreate() method declaration in file backup section

9 years agoam 968db361: am b8f9e048: am e88f3522: am b14aec1b: am b6de0316: am e1f90b4e: Merge...
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 (746115412765600)" into lmp-docs automerge: 946bf2d

* commit '968db3619a0abc26d486544e17acd168941312c8':
  docs: Fix notification api guide issues (746115412765600)

9 years agoam 96a99bc3: am b9f9408c: am 474746c7: am 2ea209ab: am 8d0df9b8: Merge "docs: Update...
Luan Nguyen [Fri, 13 Feb 2015 00:33:29 +0000 (00:33 +0000)]
am 96a99bc3: am b9f9408c: am 474746c7: am 2ea209ab: am 8d0df9b8: Merge "docs: Update device art generator to include Wear generic devices." into lmp-docs automerge: fe2c687

* commit '96a99bc3c1f57298c551254fcb8854410ff4e53f':
  docs: Update device art generator to include Wear generic devices.

9 years agoam 86391a2f: am b967f720: am 71cf2b6d: am e726495a: am fe5e7e92: Merge "docs: Fix...
Luan Nguyen [Fri, 13 Feb 2015 00:33:24 +0000 (00:33 +0000)]
am 86391a2f: am b967f720: am 71cf2b6d: am e726495a: am fe5e7e92: Merge "docs: Fix issue with onCreate() method declaration in file backup section" into lmp-docs automerge: e0306bb

* commit '86391a2f63d60513279481e02c7234367cbced85':
  docs: Fix issue with onCreate() method declaration in file backup section

9 years agoam b8f9e048: am e88f3522: am b14aec1b: am b6de0316: am e1f90b4e: Merge "docs: Fix...
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 (746115412765600)" into lmp-docs automerge: 946bf2d

* commit 'b8f9e04867aefe3b2f8fba05664c652f12bedc18':
  docs: Fix notification api guide issues (746115412765600)

9 years agoam b9f9408c: am 474746c7: am 2ea209ab: am 8d0df9b8: Merge "docs: Update device art...
Luan Nguyen [Fri, 13 Feb 2015 00:25:26 +0000 (00:25 +0000)]
am b9f9408c: am 474746c7: am 2ea209ab: am 8d0df9b8: Merge "docs: Update device art generator to include Wear generic devices." into lmp-docs automerge: fe2c687

* commit 'b9f9408c22ca95913643a60bac34bda07aa44173':
  docs: Update device art generator to include Wear generic devices.

9 years agoam b967f720: am 71cf2b6d: am e726495a: am fe5e7e92: Merge "docs: Fix issue with onCre...
Luan Nguyen [Fri, 13 Feb 2015 00:25:23 +0000 (00:25 +0000)]
am b967f720: am 71cf2b6d: am e726495a: am fe5e7e92: Merge "docs: Fix issue with onCreate() method declaration in file backup section" into lmp-docs automerge: e0306bb

* commit 'b967f7201a42227a359412441cadc13b42a348ef':
  docs: Fix issue with onCreate() method declaration in file backup section

9 years agoam e88f3522: am b14aec1b: am b6de0316: am e1f90b4e: Merge "docs: Fix notification...
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 (746115412765600)" into lmp-docs automerge: 946bf2d

* commit 'e88f352264714dd394731a01dcadbb67c1665be6':
  docs: Fix notification api guide issues (746115412765600)

9 years agoam 474746c7: am 2ea209ab: am 8d0df9b8: Merge "docs: Update device art generator to...
Luan Nguyen [Fri, 13 Feb 2015 00:19:29 +0000 (00:19 +0000)]
am 474746c7: am 2ea209ab: am 8d0df9b8: Merge "docs: Update device art generator to include Wear generic devices." into lmp-docs automerge: fe2c687

* commit '474746c7b08842cefecc9c1408c7837d93cff823':
  docs: Update device art generator to include Wear generic devices.

9 years agoam 71cf2b6d: am e726495a: am fe5e7e92: Merge "docs: Fix issue with onCreate() method...
Luan Nguyen [Fri, 13 Feb 2015 00:19:25 +0000 (00:19 +0000)]
am 71cf2b6d: am e726495a: am fe5e7e92: Merge "docs: Fix issue with onCreate() method declaration in file backup section" into lmp-docs automerge: e0306bb

* commit '71cf2b6d5344a45413f0c77691d7e1efb18b398f':
  docs: Fix issue with onCreate() method declaration in file backup section

9 years agoam b14aec1b: am b6de0316: am e1f90b4e: Merge "docs: Fix notification api guide issues...
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 (746115412765600)" into lmp-docs automerge: 946bf2d

* commit 'b14aec1b954f6fea5fc3ead9a289c8896f372096':
  docs: Fix notification api guide issues (746115412765600)

9 years agoGlop path texture support
Chris Craik [Thu, 12 Feb 2015 18:41:39 +0000 (10:41 -0800)]
Glop path texture support

Change-Id: I505eb05991ca4c9b2e01e49988b8f962fad51462

9 years agoam 2ea209ab: am 8d0df9b8: Merge "docs: Update device art generator to include Wear...
Luan Nguyen [Fri, 13 Feb 2015 00:16:48 +0000 (00:16 +0000)]
am 2ea209ab: am 8d0df9b8: Merge "docs: Update device art generator to include Wear generic devices." into lmp-docs
automerge: fe2c687

* commit 'fe2c687b97f21b7dd5471279c1b2b9458dcd22bf':
  docs: Update device art generator to include Wear generic devices.

9 years agoam e726495a: am fe5e7e92: Merge "docs: Fix issue with onCreate() method declaration...
Luan Nguyen [Fri, 13 Feb 2015 00:15:09 +0000 (00:15 +0000)]
am e726495a: am fe5e7e92: Merge "docs: Fix issue with onCreate() method declaration in file backup section" into lmp-docs
automerge: e0306bb

* commit 'e0306bbece4fd32d1e2f837dc515506180e04e8e':
  docs: Fix issue with onCreate() method declaration in file backup section

9 years agoam b6de0316: am e1f90b4e: Merge "docs: Fix notification api guide issues (7461154...
Luan Nguyen [Fri, 13 Feb 2015 00:13:35 +0000 (00:13 +0000)]
am b6de0316: am e1f90b4e: Merge "docs: Fix notification api guide issues (746115412765600)" into lmp-docs
automerge: 946bf2d

* commit '946bf2de30545a548022b8b8ba1b0ebc890ab08e':
  docs: Fix notification api guide issues (746115412765600)

9 years agoMerge "MidiManager API tweaks:"
Mike Lockwood [Fri, 13 Feb 2015 00:01:43 +0000 (00:01 +0000)]
Merge "MidiManager API tweaks:"

9 years agoMerge "Increase visibility of Transition.areValuesChanged() to protected to allow...
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."

9 years agoam 6f2dd8a9: Merge "Support circular magnification frame on circular devices" into...
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

9 years agoam 6f2dd8a9: Merge "Support circular magnification frame on circular devices" into...
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

9 years agoIncrease visibility of Transition.areValuesChanged() to protected to allow
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

9 years agoam 77c5de0d: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
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

9 years agoam fabfcfd9: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
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

9 years agoMerge "Support circular magnification frame on circular devices" into lmp-mr1-modular-dev
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

9 years agoam 77c5de0d: (-s ours) Merge "Import translations. DO NOT MERGE" 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

9 years agoam fabfcfd9: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
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

9 years agoam 1be4b702: am 7e7c91ec: am e4049b6d: am f45e5dbf: Merge "NoMan: Initialize filter...
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.

9 years agoMerge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
Geoff Mendal [Thu, 12 Feb 2015 23:16:47 +0000 (23:16 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev

9 years agoMerge "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

9 years agoam 5a2b966a: (-s ours) am e22cd0f9: (-s ours) Merge "Import translations. DO NOT...
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

9 years agoam cd15d997: (-s ours) am dfe8fe3f: (-s ours) Merge "Import translations. DO NOT...
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

9 years agoam 682cec12: (-s ours) am 39b03e76: (-s ours) Merge "Import translations. DO NOT...
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

9 years agoam 8a18ac3d: (-s ours) am 7c958e2d: (-s ours) Merge "Import translations. DO NOT...
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

9 years agoam f23a517a: (-s ours) am dc43cc88: (-s ours) Merge "Import translations. DO NOT...
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

9 years agoam df45d644: (-s ours) am 5c7e4d99: (-s ours) Merge "Import translations. DO NOT...
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

9 years agoam a01f5457: (-s ours) am be5aa9dd: (-s ours) Merge "Import translations. DO NOT...
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

9 years agoam 7e7c91ec: am e4049b6d: am f45e5dbf: Merge "NoMan: Initialize filter value reported...
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.

9 years agoMerge "Revert "Increase visibility of Transition.areValuesChanged() to protected...
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.""

9 years agoRevert "Increase visibility of Transition.areValuesChanged() to protected to allow...
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

9 years agoam 6113edf5: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
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

9 years agoImport 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

9 years agoam e22cd0f9: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
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

9 years agoam e4049b6d: am f45e5dbf: Merge "NoMan: Initialize filter value reported to listeners...
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.

9 years agoam dfe8fe3f: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
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

9 years agoam 39b03e76: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
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

9 years agoam 7c958e2d: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
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

9 years agoam dc43cc88: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
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

9 years agoam 5c7e4d99: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
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

9 years agoam be5aa9dd: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
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

9 years agoam 6113edf5: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
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

9 years agoImport 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

9 years agoMerge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
Geoff Mendal [Thu, 12 Feb 2015 23:01:28 +0000 (23:01 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev

9 years agoMerge "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

9 years agoMerge "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

9 years agoMerge "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

9 years agoMerge "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

9 years agoMerge "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

9 years agoMerge "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

9 years agoMerge "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

9 years agoam f45e5dbf: Merge "NoMan: Initialize filter value reported to listeners." into lmp...
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.

9 years agoImport translations. DO NOT MERGE
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

9 years agoImport translations. DO NOT MERGE
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

9 years agoMerge "Increase visibility of Transition.areValuesChanged() to protected to allow...
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."

9 years agoMerge "NoMan: Initialize filter value reported to listeners." into lmp-mr1-dev
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

9 years agoImport translations. DO NOT MERGE
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

9 years agoIncrease visibility of Transition.areValuesChanged() to protected to allow
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

9 years agoImport translations. DO NOT MERGE
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

9 years agoMerge "Handle a missed case in query the settings provider"
Svetoslav [Thu, 12 Feb 2015 22:44:07 +0000 (22:44 +0000)]
Merge "Handle a missed case in query the settings provider"

9 years agoHandle 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

9 years agoImport translations. DO NOT MERGE
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

9 years agoImport translations. DO NOT MERGE
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

9 years agoImport translations. DO NOT MERGE
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