OSDN Git Service

android-x86/frameworks-base.git
9 years agoam 72e7217d: am b7121d70: am b78cce6f: Merge "Update autogenerated gl functions."
Dan Albert [Wed, 25 Feb 2015 23:17:44 +0000 (23:17 +0000)]
am 72e7217d: am b7121d70: am b78cce6f: Merge "Update autogenerated gl functions."

* commit '72e7217d0bd1035fc0c947da5d1e802624774a80':
  Update autogenerated gl functions.

9 years agoam b7121d70: am b78cce6f: Merge "Update autogenerated gl functions."
Dan Albert [Wed, 25 Feb 2015 23:07:47 +0000 (23:07 +0000)]
am b7121d70: am b78cce6f: Merge "Update autogenerated gl functions."

* commit 'b7121d703067b440281f27a40b8273b17bef1e62':
  Update autogenerated gl functions.

9 years agoam b78cce6f: Merge "Update autogenerated gl functions."
Dan Albert [Wed, 25 Feb 2015 23:00:52 +0000 (23:00 +0000)]
am b78cce6f: Merge "Update autogenerated gl functions."

* commit 'b78cce6f92e38b57a6a56183cdbafc054c5758fe':
  Update autogenerated gl functions.

9 years agoMerge "Update autogenerated gl functions."
Dan Albert [Wed, 25 Feb 2015 22:50:24 +0000 (22:50 +0000)]
Merge "Update autogenerated gl functions."

9 years agoam 0fbcc708: am 1e74b5d6: Merge "Burn in protection." into lmp-mr1-modular-dev
Filip Gruszczynski [Wed, 25 Feb 2015 21:47:12 +0000 (21:47 +0000)]
am 0fbcc708: am 1e74b5d6: Merge "Burn in protection." into lmp-mr1-modular-dev

* commit '0fbcc7086fe742e641915ed5f097119d01613cb5':
  Burn in protection.

9 years agoMerge "Document the limitations of Linkify addresses"
Roozbeh Pournader [Wed, 25 Feb 2015 21:43:48 +0000 (21:43 +0000)]
Merge "Document the limitations of Linkify addresses"

9 years agoDocument the limitations of Linkify addresses
Roozbeh Pournader [Sat, 14 Feb 2015 01:08:27 +0000 (17:08 -0800)]
Document the limitations of Linkify addresses

Explain that we are using WebView#findAddresses() which is
limited to US addresses at the moment (at least according
to its documentation), among various other limitations.

Bug: 5847264
Change-Id: If86c6d7c11cc080f0fe3401ffb7bce8068c6016f

9 years agoam 1e74b5d6: Merge "Burn in protection." into lmp-mr1-modular-dev
Filip Gruszczynski [Wed, 25 Feb 2015 21:40:38 +0000 (21:40 +0000)]
am 1e74b5d6: Merge "Burn in protection." into lmp-mr1-modular-dev

* commit '1e74b5d6b0e964b7a9e58e64b45f50aec15b1178':
  Burn in protection.

9 years agoMerge "Burn in protection." into lmp-mr1-modular-dev
Filip Gruszczynski [Wed, 25 Feb 2015 21:30:07 +0000 (21:30 +0000)]
Merge "Burn in protection." into lmp-mr1-modular-dev

9 years agoBurn in protection.
Filip Gruszczynski [Thu, 19 Feb 2015 21:05:03 +0000 (13:05 -0800)]
Burn in protection.

Bug: 19373758
Change-Id: I7242f73acadd21bdee03262b4205c8af0734fccb

9 years agoMerge "Allow alternative policy description for secondary users"
Fyodor Kupolov [Wed, 25 Feb 2015 20:17:17 +0000 (20:17 +0000)]
Merge "Allow alternative policy description for secondary users"

9 years agoMerge "Relax Handler lint check slightly."
Jeff Sharkey [Wed, 25 Feb 2015 20:12:30 +0000 (20:12 +0000)]
Merge "Relax Handler lint check slightly."

9 years agoRelax Handler lint check slightly.
Jeff Sharkey [Wed, 25 Feb 2015 19:27:55 +0000 (11:27 -0800)]
Relax Handler lint check slightly.

This way we avoid yelling at support library APIs.

Change-Id: I20bab887fe8b1c7f4d197273ddedbcda48c5a429

9 years agoam 892609ad: am aeffc9ce: Merge "Always draw the circular emulator overlay with squar...
Griff Hazen [Wed, 25 Feb 2015 19:53:09 +0000 (19:53 +0000)]
am 892609ad: am aeffc9ce: Merge "Always draw the circular emulator overlay with square dimensions" into lmp-mr1-modular-dev

* commit '892609ad34145e6418e42c683428f1a880b4c874':
  Always draw the circular emulator overlay with square dimensions

9 years agoam aeffc9ce: Merge "Always draw the circular emulator overlay with square dimensions...
Griff Hazen [Wed, 25 Feb 2015 19:47:12 +0000 (19:47 +0000)]
am aeffc9ce: Merge "Always draw the circular emulator overlay with square dimensions" into lmp-mr1-modular-dev

* commit 'aeffc9cebd4e97889f5b2f61de38c60b83535ffa':
  Always draw the circular emulator overlay with square dimensions

9 years agoMerge "Always draw the circular emulator overlay with square dimensions" into lmp...
Griff Hazen [Wed, 25 Feb 2015 19:39:45 +0000 (19:39 +0000)]
Merge "Always draw the circular emulator overlay with square dimensions" into lmp-mr1-modular-dev

9 years agoam f7b68049: am 533758c1: am 0d8b97a4: Merge "jni: switch to ANDROID_LOG_* mode flags"
Mark Salyzyn [Wed, 25 Feb 2015 19:26:57 +0000 (19:26 +0000)]
am f7b68049: am 533758c1: am 0d8b97a4: Merge "jni: switch to ANDROID_LOG_* mode flags"

* commit 'f7b68049521b5f1c31894f5dad529f719098e987':
  jni: switch to ANDROID_LOG_* mode flags

9 years agoam 533758c1: am 0d8b97a4: Merge "jni: switch to ANDROID_LOG_* mode flags"
Mark Salyzyn [Wed, 25 Feb 2015 19:19:27 +0000 (19:19 +0000)]
am 533758c1: am 0d8b97a4: Merge "jni: switch to ANDROID_LOG_* mode flags"

* commit '533758c1fb2dcf5b50db46b60d26ecae72fc71ee':
  jni: switch to ANDROID_LOG_* mode flags

9 years agoMerge "Create blank state in no-arg RotateDrawable constructor"
Alan Viverette [Wed, 25 Feb 2015 19:15:35 +0000 (19:15 +0000)]
Merge "Create blank state in no-arg RotateDrawable constructor"

9 years agoam 0d8b97a4: Merge "jni: switch to ANDROID_LOG_* mode flags"
Mark Salyzyn [Wed, 25 Feb 2015 19:13:12 +0000 (19:13 +0000)]
am 0d8b97a4: Merge "jni: switch to ANDROID_LOG_* mode flags"

* commit '0d8b97a44e4cb5c5cfffd6421eb2cec1ebc00d2f':
  jni: switch to ANDROID_LOG_* mode flags

9 years agoCreate blank state in no-arg RotateDrawable constructor
Alan Viverette [Wed, 25 Feb 2015 19:12:55 +0000 (11:12 -0800)]
Create blank state in no-arg RotateDrawable constructor

Also removes unnecessary constructor in InsetState so that it matches
the other DrawableWrapper classes.

Bug: 19489698
Change-Id: Ib2e510c6ae90858774970d928e541a9b08cb714a

9 years agoMerge "jni: switch to ANDROID_LOG_* mode flags"
Mark Salyzyn [Wed, 25 Feb 2015 19:04:24 +0000 (19:04 +0000)]
Merge "jni: switch to ANDROID_LOG_* mode flags"

9 years agoam cf8c112e: am 01dd0e86: Merge "Force translucency from windowIsTranslucent on Swipe...
Filip Gruszczynski [Wed, 25 Feb 2015 18:52:02 +0000 (18:52 +0000)]
am cf8c112e: am 01dd0e86: Merge "Force translucency from windowIsTranslucent on SwipeDismissLayout." into lmp-mr1-modular-dev

* commit 'cf8c112ed87752d79a869de9426b5c5a950b5c43':
  Force translucency from windowIsTranslucent on SwipeDismissLayout.

9 years agoam 01dd0e86: Merge "Force translucency from windowIsTranslucent on SwipeDismissLayout...
Filip Gruszczynski [Wed, 25 Feb 2015 18:44:57 +0000 (18:44 +0000)]
am 01dd0e86: Merge "Force translucency from windowIsTranslucent on SwipeDismissLayout." into lmp-mr1-modular-dev

* commit '01dd0e86546a5bf815dd9a6e7cd4b7bf8e8f5719':
  Force translucency from windowIsTranslucent on SwipeDismissLayout.

9 years agoMerge "Force translucency from windowIsTranslucent on SwipeDismissLayout." into lmp...
Filip Gruszczynski [Wed, 25 Feb 2015 18:40:18 +0000 (18:40 +0000)]
Merge "Force translucency from windowIsTranslucent on SwipeDismissLayout." into lmp-mr1-modular-dev

9 years agoam b060f018: am 91aa1bdb: am 19847b07: am b46e4806: Merge "Remove TrustAgent whitelis...
Jim Miller [Wed, 25 Feb 2015 18:30:10 +0000 (18:30 +0000)]
am b060f018: am 91aa1bdb: am 19847b07: am b46e4806: Merge "Remove TrustAgent whitelisting API" into lmp-mr1-dev

* commit 'b060f018effb27a79797e55f9eb6a592db2cb39a':
  Remove TrustAgent whitelisting API

9 years agoam 91aa1bdb: am 19847b07: am b46e4806: Merge "Remove TrustAgent whitelisting API...
Jim Miller [Wed, 25 Feb 2015 18:23:20 +0000 (18:23 +0000)]
am 91aa1bdb: am 19847b07: am b46e4806: Merge "Remove TrustAgent whitelisting API" into lmp-mr1-dev

* commit '91aa1bdb57a82b59401afd88aaeb429ea4c73bac':
  Remove TrustAgent whitelisting API

9 years agoam 19847b07: am b46e4806: Merge "Remove TrustAgent whitelisting API" into lmp-mr1-dev
Jim Miller [Wed, 25 Feb 2015 18:17:13 +0000 (18:17 +0000)]
am 19847b07: am b46e4806: Merge "Remove TrustAgent whitelisting API" into lmp-mr1-dev

* commit '19847b07e81b9b29e3574ce6ab8acf7a958a1a63':
  Remove TrustAgent whitelisting API

9 years agoam b46e4806: Merge "Remove TrustAgent whitelisting API" into lmp-mr1-dev
Jim Miller [Wed, 25 Feb 2015 18:09:54 +0000 (18:09 +0000)]
am b46e4806: Merge "Remove TrustAgent whitelisting API" into lmp-mr1-dev

* commit 'b46e48067fd03b63fa5f5191651ac2a5d009e226':
  Remove TrustAgent whitelisting API

9 years agojni: switch to ANDROID_LOG_* mode flags
Mark Salyzyn [Mon, 26 Jan 2015 20:51:27 +0000 (12:51 -0800)]
jni: switch to ANDROID_LOG_* mode flags

Change-Id: I8aea5bf4faf79a96fa8485f7707e7484cd11d7a3

9 years agoMerge "Remove TrustAgent whitelisting API" into lmp-mr1-dev
Jim Miller [Wed, 25 Feb 2015 18:04:57 +0000 (18:04 +0000)]
Merge "Remove TrustAgent whitelisting API" into lmp-mr1-dev

9 years agoMerge "Allow setting a Device Owner via ADB on unprovisioned device with preinstalled...
Esteban Talavera [Wed, 25 Feb 2015 17:58:15 +0000 (17:58 +0000)]
Merge "Allow setting a Device Owner via ADB on unprovisioned device with preinstalled account"

9 years agoMerge "AudioService: Use the foreground broadcast queue for fired intents."
John Spurlock [Wed, 25 Feb 2015 17:48:38 +0000 (17:48 +0000)]
Merge "AudioService: Use the foreground broadcast queue for fired intents."

9 years agoAllow setting a Device Owner via ADB on unprovisioned device with preinstalled account
Esteban Talavera [Tue, 24 Feb 2015 16:53:52 +0000 (16:53 +0000)]
Allow setting a Device Owner via ADB on unprovisioned device with preinstalled account

Some devices come from carriers with a preinstalled account. This
means that we couldn't set a device owner via "adb shell dpm"
commands, while the regular device owner flow worked (as the
latter just checked whether the device was provisioned).

Bug: 18354022
Change-Id: I9a677de9d34d073e218b9179ec4b0f5b4b82adc9

9 years agoMerge "DND: Add a hidden DND tile to quick settings."
John Spurlock [Wed, 25 Feb 2015 17:47:57 +0000 (17:47 +0000)]
Merge "DND: Add a hidden DND tile to quick settings."

9 years agoDND: Add a hidden DND tile to quick settings.
John Spurlock [Tue, 24 Feb 2015 17:12:25 +0000 (12:12 -0500)]
DND: Add a hidden DND tile to quick settings.

Invisible by default, not activatable when the platform
volume controller is active.

However, when the platform volume controller is not active,
it can be enabled via a broadcast intent.

When enabled, the status bar icon also changes to a single
dnd icon.

Very little more than embedding the existing zen mode panel
into the detail pane of a new QS tile.

Change-Id: I1e0ff6fbb99b00f67b53bceda8cbf121f3ef6b52

9 years agoam c88604bc: (-s ours) am 6715b9dd: (-s ours) am bb463806: (-s ours) Merge "Import...
Geoff Mendal [Wed, 25 Feb 2015 17:27:19 +0000 (17:27 +0000)]
am c88604bc: (-s ours) am 6715b9dd: (-s ours) am bb463806: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev

* commit 'c88604bcb94ce23706767bf10db24ff23a68a4b5':
  Import translations. DO NOT MERGE

9 years agoam d170ff32: (-s ours) am 28e4a357: (-s ours) am c2cbbb89: (-s ours) Merge "Import...
Geoff Mendal [Wed, 25 Feb 2015 17:27:07 +0000 (17:27 +0000)]
am d170ff32: (-s ours) am 28e4a357: (-s ours) am c2cbbb89: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev

* commit 'd170ff32c03cd6c8cf85e9f820342a26d3dbba78':
  Import translations. DO NOT MERGE

9 years agoam ed6db520: (-s ours) am 6d471d04: (-s ours) am a4f54454: (-s ours) Import translati...
Geoff Mendal [Wed, 25 Feb 2015 17:27:00 +0000 (17:27 +0000)]
am ed6db520: (-s ours) am 6d471d04: (-s ours) am a4f54454: (-s ours) Import translations. DO NOT MERGE

* commit 'ed6db520b8a14786b7456e260ed72377f8900e88':
  Import translations. DO NOT MERGE

9 years agoam 336beed4: (-s ours) am aee4a86a: (-s ours) Merge "Import translations. DO NOT...
Geoff Mendal [Wed, 25 Feb 2015 17:26:53 +0000 (17:26 +0000)]
am 336beed4: (-s ours) am aee4a86a: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev

* commit '336beed4d1006211139ab0b8e34227b364f17899':
  Import translations. DO NOT MERGE

9 years agoam 9d695da8: (-s ours) am ce64b99e: (-s ours) Merge "Import translations. DO NOT...
Geoff Mendal [Wed, 25 Feb 2015 17:26:47 +0000 (17:26 +0000)]
am 9d695da8: (-s ours) am ce64b99e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev

* commit '9d695da8851298858c1280bf7fb7b44f78b501a2':
  Import translations. DO NOT MERGE

9 years agoam dd535604: (-s ours) am 53ddd69e: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Wed, 25 Feb 2015 17:26:40 +0000 (17:26 +0000)]
am dd535604: (-s ours) am 53ddd69e: (-s ours) Import translations. DO NOT MERGE

* commit 'dd535604fc1e77da28a259a9e9e073efa5618f17':
  Import translations. DO NOT MERGE

9 years agoam 20928cae: am 4e3e6fb1: am 9afbbb2e: am 8ffb574a: am f7224396: am c427b721: am...
Joe Fernandez [Wed, 25 Feb 2015 17:26:33 +0000 (17:26 +0000)]
am 20928cae: am 4e3e6fb1: am 9afbbb2e: am 8ffb574a: am f7224396: am c427b721: am 41418826: Merge "docs: Android for Work developer landing page" into lmp-docs

* commit '20928caef4c4f90793408afc91e6d48f0551b4a5':
  docs: Android for Work developer landing page

9 years agoam 3999d0fd: am 2557fb07: am d7cddbd2: am 7391b0a1: am e64301e6: am 790b1bc8: am...
Andrew Solovay [Wed, 25 Feb 2015 17:26:25 +0000 (17:26 +0000)]
am 3999d0fd: am 2557fb07: am d7cddbd2: am 7391b0a1: am e64301e6: am 790b1bc8: am d3cd0948: docs: New doc for creating an AfW Work Policy Controller

* commit '3999d0fdd7eb6d4ffea6deb35c4b840aef74a135':
  docs: New doc for creating an AfW Work Policy Controller

9 years agoam 79d543eb: am d6f1fbe0: am 9ac09b6c: am 93df7f07: am 032e931a: am 6ffe1058: am...
Andrew Solovay [Wed, 25 Feb 2015 17:26:17 +0000 (17:26 +0000)]
am 79d543eb: am d6f1fbe0: am 9ac09b6c: am 93df7f07: am 032e931a: am 6ffe1058: am a2ae6c9d: Merge "docs: New "implementing app restrictions" doc" into lmp-docs

* commit '79d543eb26e841c2d18a972adfcc4ad3fc1e8d75':
  docs: New "implementing app restrictions" doc

9 years agoam 40d8cd6f: am 7914fa5c: am 661b54ae: am 7fc5b5a1: am a9ad0fc7: am f2525ed3: am...
Chris Craik [Wed, 25 Feb 2015 17:26:07 +0000 (17:26 +0000)]
am 40d8cd6f: am 7914fa5c: am 661b54ae: am 7fc5b5a1: am a9ad0fc7: am f2525ed3: am ea2a0648: Explain behavior of boundless ripple projection

* commit '40d8cd6ffa8febc6eab8a8690ace34a03b78e33a':
  Explain behavior of boundless ripple projection

9 years agoam 6715b9dd: (-s ours) am bb463806: (-s ours) Merge "Import translations. DO NOT...
Geoff Mendal [Wed, 25 Feb 2015 17:12:34 +0000 (17:12 +0000)]
am 6715b9dd: (-s ours) am bb463806: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev

* commit '6715b9dda1ada0a71ddc8215bc9c050c76fb309d':
  Import translations. DO NOT MERGE

9 years agoam 28e4a357: (-s ours) am c2cbbb89: (-s ours) Merge "Import translations. DO NOT...
Geoff Mendal [Wed, 25 Feb 2015 17:12:28 +0000 (17:12 +0000)]
am 28e4a357: (-s ours) am c2cbbb89: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev

* commit '28e4a357ce341ccb535352708f241a098f22bbf5':
  Import translations. DO NOT MERGE

9 years agoam 6d471d04: (-s ours) am a4f54454: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Wed, 25 Feb 2015 17:12:23 +0000 (17:12 +0000)]
am 6d471d04: (-s ours) am a4f54454: (-s ours) Import translations. DO NOT MERGE

* commit '6d471d04b086d6d21b2e01f2368ec02af36d9970':
  Import translations. DO NOT MERGE

9 years agoam aee4a86a: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
Geoff Mendal [Wed, 25 Feb 2015 17:12:00 +0000 (17:12 +0000)]
am aee4a86a: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev

* commit 'aee4a86a049c8c427a5b5f2d0d8ab0e6be520f00':
  Import translations. DO NOT MERGE

9 years agoam ce64b99e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
Geoff Mendal [Wed, 25 Feb 2015 17:11:54 +0000 (17:11 +0000)]
am ce64b99e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev

* commit 'ce64b99e4478f047ff871078e2ad64d4c4818529':
  Import translations. DO NOT MERGE

9 years agoam 53ddd69e: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Wed, 25 Feb 2015 17:11:49 +0000 (17:11 +0000)]
am 53ddd69e: (-s ours) Import translations. DO NOT MERGE

* commit '53ddd69ea737a20541735bce28b950feeab2d0a8':
  Import translations. DO NOT MERGE

9 years agoam 4e3e6fb1: am 9afbbb2e: am 8ffb574a: am f7224396: am c427b721: am 41418826: Merge...
Joe Fernandez [Wed, 25 Feb 2015 17:11:17 +0000 (17:11 +0000)]
am 4e3e6fb1: am 9afbbb2e: am 8ffb574a: am f7224396: am c427b721: am 41418826: Merge "docs: Android for Work developer landing page" into lmp-docs

* commit '4e3e6fb16e091815bee4a0be657f462a9f0e4229':
  docs: Android for Work developer landing page

9 years agoam 2557fb07: am d7cddbd2: am 7391b0a1: am e64301e6: am 790b1bc8: am d3cd0948: docs...
Andrew Solovay [Wed, 25 Feb 2015 17:11:11 +0000 (17:11 +0000)]
am 2557fb07: am d7cddbd2: am 7391b0a1: am e64301e6: am 790b1bc8: am d3cd0948: docs: New doc for creating an AfW Work Policy Controller

* commit '2557fb070a54a65277c320f20cedde828febb1e2':
  docs: New doc for creating an AfW Work Policy Controller

9 years agoam d6f1fbe0: am 9ac09b6c: am 93df7f07: am 032e931a: am 6ffe1058: am a2ae6c9d: Merge...
Andrew Solovay [Wed, 25 Feb 2015 17:11:05 +0000 (17:11 +0000)]
am d6f1fbe0: am 9ac09b6c: am 93df7f07: am 032e931a: am 6ffe1058: am a2ae6c9d: Merge "docs: New "implementing app restrictions" doc" into lmp-docs

* commit 'd6f1fbe04cd7e099c1fa95967c1b7ddfad8669d3':
  docs: New "implementing app restrictions" doc

9 years agoam 7914fa5c: am 661b54ae: am 7fc5b5a1: am a9ad0fc7: am f2525ed3: am ea2a0648: Explain...
Chris Craik [Wed, 25 Feb 2015 17:10:59 +0000 (17:10 +0000)]
am 7914fa5c: am 661b54ae: am 7fc5b5a1: am a9ad0fc7: am f2525ed3: am ea2a0648: Explain behavior of boundless ripple projection

* commit '7914fa5ce6c521d4aa7b16a37a2f2df9263b123b':
  Explain behavior of boundless ripple projection

9 years agoAudioService: Use the foreground broadcast queue for fired intents.
John Spurlock [Wed, 25 Feb 2015 16:22:52 +0000 (11:22 -0500)]
AudioService: Use the foreground broadcast queue for fired intents.

Minimize delay for receivers, assume they are providing volume UI.

Change-Id: I054bac4292ad7c608cd46543409595dcea6a7731

9 years agoam bb463806: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
Geoff Mendal [Wed, 25 Feb 2015 15:47:38 +0000 (15:47 +0000)]
am bb463806: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev

* commit 'bb463806aa9a83d10cfff5f565eebd71d500ae4e':
  Import translations. DO NOT MERGE

9 years agoMerge "Revert "Have AMS.setFocusedActivityLocked() move the focus stack to the front""
Wale Ogunwale [Wed, 25 Feb 2015 15:41:52 +0000 (15:41 +0000)]
Merge "Revert "Have AMS.setFocusedActivityLocked() move the focus stack to the front""

9 years agoMerge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
Geoff Mendal [Wed, 25 Feb 2015 15:41:21 +0000 (15:41 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 25 Feb 2015 15:39:28 +0000 (07:39 -0800)]
Import translations. DO NOT MERGE

Change-Id: I4e5b922995cf7eff9c984735209e2fe073fb5d83
Auto-generated-cl: translation import

9 years agoRevert "Have AMS.setFocusedActivityLocked() move the focus stack to the front"
Wale Ogunwale [Wed, 25 Feb 2015 15:28:55 +0000 (07:28 -0800)]
Revert "Have AMS.setFocusedActivityLocked() move the focus stack to the front"

This reverts commit af0e44885992b0675d7881c391caeff88414695f.

Unblock the release while I figure-out how the change broke things...

Bug: 19505341
Bug: 19507107

9 years agoMerge "Import translations. DO NOT MERGE"
Geoff Mendal [Wed, 25 Feb 2015 15:35:22 +0000 (15:35 +0000)]
Merge "Import translations. DO NOT MERGE"

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 25 Feb 2015 15:33:55 +0000 (07:33 -0800)]
Import translations. DO NOT MERGE

Change-Id: Ie511cef0bf2d54e3ca9064a2391955b2cf301ddd
Auto-generated-cl: translation import

9 years agoMerge "Import translations. DO NOT MERGE"
Geoff Mendal [Wed, 25 Feb 2015 15:04:41 +0000 (15:04 +0000)]
Merge "Import translations. DO NOT MERGE"

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 25 Feb 2015 15:01:14 +0000 (07:01 -0800)]
Import translations. DO NOT MERGE

Change-Id: I897dff4093f9cce29524a64a9cc4fc08a6655e57
Auto-generated-cl: translation import

9 years agoMerge "Import translations. DO NOT MERGE"
Geoff Mendal [Wed, 25 Feb 2015 14:53:11 +0000 (14:53 +0000)]
Merge "Import translations. DO NOT MERGE"

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 25 Feb 2015 14:46:25 +0000 (06:46 -0800)]
Import translations. DO NOT MERGE

Change-Id: Iaf416dc2326ddaf2601b5c37d0e86b2b6fb8e307
Auto-generated-cl: translation import

9 years agoMerge "Import translations. DO NOT MERGE"
Geoff Mendal [Wed, 25 Feb 2015 14:42:55 +0000 (14:42 +0000)]
Merge "Import translations. DO NOT MERGE"

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 25 Feb 2015 14:40:41 +0000 (06:40 -0800)]
Import translations. DO NOT MERGE

Change-Id: I5e23004d3660fc0ce296391f908e6a042e8da16d
Auto-generated-cl: translation import

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 25 Feb 2015 14:25:08 +0000 (06:25 -0800)]
Import translations. DO NOT MERGE

Change-Id: If17993f8a25da1cb9a868150bb787d8c1b9810bd
Auto-generated-cl: translation import

9 years agoam c2cbbb89: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
Geoff Mendal [Wed, 25 Feb 2015 14:13:06 +0000 (14:13 +0000)]
am c2cbbb89: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev

* commit 'c2cbbb89061d45dfe4ec84c3bf5304e76ac6ef64':
  Import translations. DO NOT MERGE

9 years agoam a4f54454: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Wed, 25 Feb 2015 14:13:00 +0000 (14:13 +0000)]
am a4f54454: (-s ours) Import translations. DO NOT MERGE

* commit 'a4f544540ebe27aca15305dd8f5bda5b5d10283b':
  Import translations. DO NOT MERGE

9 years agoMerge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
Geoff Mendal [Wed, 25 Feb 2015 14:09:54 +0000 (14:09 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 25 Feb 2015 14:08:29 +0000 (06:08 -0800)]
Import translations. DO NOT MERGE

Change-Id: I84339eebbf7a8e2332e85a104b85ec740a25d6f1
Auto-generated-cl: translation import

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 25 Feb 2015 14:02:34 +0000 (06:02 -0800)]
Import translations. DO NOT MERGE

Change-Id: I5974f01d8313faa999068ffd844ecbafb9ab4321
Auto-generated-cl: translation import

9 years agoMerge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
Geoff Mendal [Wed, 25 Feb 2015 13:45:20 +0000 (13:45 +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 [Wed, 25 Feb 2015 13:44:54 +0000 (13:44 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 25 Feb 2015 13:41:18 +0000 (07:41 -0600)]
Import translations. DO NOT MERGE

Change-Id: I077436f56f383af0746ee1c7037ba8bef0d1d6d6
Auto-generated-cl: translation import

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 25 Feb 2015 13:41:09 +0000 (05:41 -0800)]
Import translations. DO NOT MERGE

Change-Id: Ib4c512a4856bdce8518bf1ee1a36ca5fc19a324b
Auto-generated-cl: translation import

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 25 Feb 2015 13:35:06 +0000 (05:35 -0800)]
Import translations. DO NOT MERGE

Change-Id: I14e100832a693f7e5cfa8d53edd90ebb1745c064
Auto-generated-cl: translation import

9 years agoam 9afbbb2e: am 8ffb574a: am f7224396: am c427b721: am 41418826: Merge "docs: Android...
Joe Fernandez [Wed, 25 Feb 2015 13:27:07 +0000 (13:27 +0000)]
am 9afbbb2e: am 8ffb574a: am f7224396: am c427b721: am 41418826: Merge "docs: Android for Work developer landing page" into lmp-docs

* commit '9afbbb2e600936ef7a402fecd0402a3e59cf864e':
  docs: Android for Work developer landing page

9 years agoMerge "Prevent regular processes from accessing the password history"
Adrian Roos [Wed, 25 Feb 2015 13:27:02 +0000 (13:27 +0000)]
Merge "Prevent regular processes from accessing the password history"

9 years agoam d7cddbd2: am 7391b0a1: am e64301e6: am 790b1bc8: am d3cd0948: docs: New doc for...
Andrew Solovay [Wed, 25 Feb 2015 13:27:03 +0000 (13:27 +0000)]
am d7cddbd2: am 7391b0a1: am e64301e6: am 790b1bc8: am d3cd0948: docs: New doc for creating an AfW Work Policy Controller

* commit 'd7cddbd2d595cd5ee2cb9e7e05af8a760f265f84':
  docs: New doc for creating an AfW Work Policy Controller

9 years agoam 9ac09b6c: am 93df7f07: am 032e931a: am 6ffe1058: am a2ae6c9d: Merge "docs: New...
Andrew Solovay [Wed, 25 Feb 2015 13:26:58 +0000 (13:26 +0000)]
am 9ac09b6c: am 93df7f07: am 032e931a: am 6ffe1058: am a2ae6c9d: Merge "docs: New "implementing app restrictions" doc" into lmp-docs

* commit '9ac09b6c553060d0104aa8fb3f38f4dfd81a8957':
  docs: New "implementing app restrictions" doc

9 years agoam 661b54ae: am 7fc5b5a1: am a9ad0fc7: am f2525ed3: am ea2a0648: Explain behavior...
Chris Craik [Wed, 25 Feb 2015 13:26:53 +0000 (13:26 +0000)]
am 661b54ae: am 7fc5b5a1: am a9ad0fc7: am f2525ed3: am ea2a0648: Explain behavior of boundless ripple projection

* commit '661b54ae2a55461aa70c07d069550b911c14f800':
  Explain behavior of boundless ripple projection

9 years agoam 8ffb574a: am f7224396: am c427b721: am 41418826: Merge "docs: Android for Work...
Joe Fernandez [Wed, 25 Feb 2015 13:16:20 +0000 (13:16 +0000)]
am 8ffb574a: am f7224396: am c427b721: am 41418826: Merge "docs: Android for Work developer landing page" into lmp-docs

* commit '8ffb574a5087b2099cef5f629568375caa0ddc9c':
  docs: Android for Work developer landing page

9 years agoam 7391b0a1: am e64301e6: am 790b1bc8: am d3cd0948: docs: New doc for creating an...
Andrew Solovay [Wed, 25 Feb 2015 13:16:15 +0000 (13:16 +0000)]
am 7391b0a1: am e64301e6: am 790b1bc8: am d3cd0948: docs: New doc for creating an AfW Work Policy Controller

* commit '7391b0a177f9ecf3c8e3a9657bbf1ae7000ce528':
  docs: New doc for creating an AfW Work Policy Controller

9 years agoam 93df7f07: am 032e931a: am 6ffe1058: am a2ae6c9d: Merge "docs: New "implementing...
Andrew Solovay [Wed, 25 Feb 2015 13:16:11 +0000 (13:16 +0000)]
am 93df7f07: am 032e931a: am 6ffe1058: am a2ae6c9d: Merge "docs: New "implementing app restrictions" doc" into lmp-docs

* commit '93df7f0740a6d2044c29227ac6f684c74aa49ff7':
  docs: New "implementing app restrictions" doc

9 years agoam 7fc5b5a1: am a9ad0fc7: am f2525ed3: am ea2a0648: Explain behavior of boundless...
Chris Craik [Wed, 25 Feb 2015 13:16:06 +0000 (13:16 +0000)]
am 7fc5b5a1: am a9ad0fc7: am f2525ed3: am ea2a0648: Explain behavior of boundless ripple projection

* commit '7fc5b5a129a3599c4a213117415e113a85d09745':
  Explain behavior of boundless ripple projection

9 years agoam f7224396: am c427b721: am 41418826: Merge "docs: Android for Work developer landin...
Joe Fernandez [Wed, 25 Feb 2015 13:09:56 +0000 (13:09 +0000)]
am f7224396: am c427b721: am 41418826: Merge "docs: Android for Work developer landing page" into lmp-docs

* commit 'f7224396ee8416630b9387995a79faae1ee68b7c':
  docs: Android for Work developer landing page

9 years agoam e64301e6: am 790b1bc8: am d3cd0948: docs: New doc for creating an AfW Work Policy...
Andrew Solovay [Wed, 25 Feb 2015 13:09:33 +0000 (13:09 +0000)]
am e64301e6: am 790b1bc8: am d3cd0948: docs: New doc for creating an AfW Work Policy Controller

* commit 'e64301e639e73f346a78584af2727bc98f3d81ae':
  docs: New doc for creating an AfW Work Policy Controller

9 years agoam 032e931a: am 6ffe1058: am a2ae6c9d: Merge "docs: New "implementing app restriction...
Andrew Solovay [Wed, 25 Feb 2015 13:09:29 +0000 (13:09 +0000)]
am 032e931a: am 6ffe1058: am a2ae6c9d: Merge "docs: New "implementing app restrictions" doc" into lmp-docs

* commit '032e931a806d21d5fa190d1d28f8d65ee0fb4926':
  docs: New "implementing app restrictions" doc

9 years agoam a9ad0fc7: am f2525ed3: am ea2a0648: Explain behavior of boundless ripple projection
Chris Craik [Wed, 25 Feb 2015 13:09:24 +0000 (13:09 +0000)]
am a9ad0fc7: am f2525ed3: am ea2a0648: Explain behavior of boundless ripple projection

* commit 'a9ad0fc793e3479e678441f2ed7abd47994ab74d':
  Explain behavior of boundless ripple projection

9 years agoam c427b721: am 41418826: Merge "docs: Android for Work developer landing page" into...
Joe Fernandez [Wed, 25 Feb 2015 08:06:01 +0000 (08:06 +0000)]
am c427b721: am 41418826: Merge "docs: Android for Work developer landing page" into lmp-docs

* commit 'c427b721b681b19f40e45ed82ae0c628f3f5b528':
  docs: Android for Work developer landing page

9 years agoMerge "Paste as plain text by Ctrl-Shift-V"
Keisuke Kuroyanagi [Wed, 25 Feb 2015 08:00:29 +0000 (08:00 +0000)]
Merge "Paste as plain text by Ctrl-Shift-V"

9 years agoam 41418826: Merge "docs: Android for Work developer landing page" into lmp-docs
Joe Fernandez [Wed, 25 Feb 2015 07:59:48 +0000 (07:59 +0000)]
am 41418826: Merge "docs: Android for Work developer landing page" into lmp-docs

* commit '414188262311ec48235095a5dec622b24f7e69ef':
  docs: Android for Work developer landing page

9 years agoMerge "docs: Android for Work developer landing page" into lmp-docs
Joe Fernandez [Wed, 25 Feb 2015 07:52:29 +0000 (07:52 +0000)]
Merge "docs: Android for Work developer landing page" into lmp-docs

9 years agoam 790b1bc8: am d3cd0948: docs: New doc for creating an AfW Work Policy Controller
Andrew Solovay [Wed, 25 Feb 2015 07:49:37 +0000 (07:49 +0000)]
am 790b1bc8: am d3cd0948: docs: New doc for creating an AfW Work Policy Controller

* commit '790b1bc864d9066ff691b0e12a4e14ef85566c50':
  docs: New doc for creating an AfW Work Policy Controller

9 years agoam d3cd0948: docs: New doc for creating an AfW Work Policy Controller
Andrew Solovay [Wed, 25 Feb 2015 07:42:44 +0000 (07:42 +0000)]
am d3cd0948: docs: New doc for creating an AfW Work Policy Controller

* commit 'd3cd0948c8c4662c8711433b756c82fbe2f7a3ad':
  docs: New doc for creating an AfW Work Policy Controller