Rich Slogar
84994e876e
am db2ebca7: Merge "docs: note to install linux packages v2 update" into lmp-docs
...
* commit 'db2ebca7ed10a4d5d943e414a35d4734b9987e91':
docs: note to install linux packages v2 update
2015-02-25 23:17:23 +00:00
Rich Slogar
eedf6ad8ce
Merge "docs: remove exploring sdk link" into lmp-docs
2015-02-25 23:12:37 +00:00
Rich Slogar
db2ebca7ed
Merge "docs: note to install linux packages v2 update" into lmp-docs
2015-02-25 23:11:24 +00:00
Luan Nguyen
43836ac798
docs: Add steps to enable adb debugging on Wear device
...
bug: 19425073
Change-Id: Iead63dfe12c5187c5ed8e452fe7e934402ebd056
2015-02-25 15:09:29 -08:00
Dan Albert
72e7217d0b
am b7121d70: am b78cce6f: Merge "Update autogenerated gl functions."
...
* commit 'b7121d703067b440281f27a40b8273b17bef1e62':
Update autogenerated gl functions.
2015-02-25 23:07:47 +00:00
Dan Albert
b7121d7030
am b78cce6f: Merge "Update autogenerated gl functions."
...
* commit 'b78cce6f92e38b57a6a56183cdbafc054c5758fe':
Update autogenerated gl functions.
2015-02-25 23:00:52 +00:00
Roozbeh Pournader
5a5f1429de
Remove Roboto fonts and their build rules
...
They are now moved to external/roboto-fonts. Symlinks from deprecated
fonts to Roboto for compatibility reasons are still created here.
Change-Id: I9e1b88a4289d055ea187e241d6514f0b37c5ee1b
2015-02-25 14:52:35 -08:00
Dan Albert
b78cce6f92
Merge "Update autogenerated gl functions."
2015-02-25 22:50:25 +00:00
Filip Gruszczynski
cfb3185a27
am 0fbcc708: am 1e74b5d6: Merge "Burn in protection." into lmp-mr1-modular-dev
...
* commit '0fbcc7086fe742e641915ed5f097119d01613cb5':
Burn in protection.
2015-02-25 21:47:12 +00:00
Roozbeh Pournader
001f0b31b6
Merge "Document the limitations of Linkify addresses"
2015-02-25 21:43:50 +00:00
Roozbeh Pournader
1ff7196be9
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
2015-02-25 13:40:52 -08:00
Filip Gruszczynski
0fbcc7086f
am 1e74b5d6: Merge "Burn in protection." into lmp-mr1-modular-dev
...
* commit '1e74b5d6b0e964b7a9e58e64b45f50aec15b1178':
Burn in protection.
2015-02-25 21:40:38 +00:00
Filip Gruszczynski
1e74b5d6b0
Merge "Burn in protection." into lmp-mr1-modular-dev
2015-02-25 21:31:53 +00:00
Filip Gruszczynski
d2e8640c2c
Burn in protection.
...
Bug: 19373758
Change-Id: I7242f73acadd21bdee03262b4205c8af0734fccb
2015-02-25 12:22:49 -08:00
Fyodor Kupolov
47ed3195f9
Merge "Allow alternative policy description for secondary users"
2015-02-25 20:17:21 +00:00
Jeff Sharkey
4f886d3911
Merge "Relax Handler lint check slightly."
2015-02-25 20:12:33 +00:00
Jeff Sharkey
047d7f0c6d
Relax Handler lint check slightly.
...
This way we avoid yelling at support library APIs.
Change-Id: I20bab887fe8b1c7f4d197273ddedbcda48c5a429
2015-02-25 12:06:40 -08:00
Griff Hazen
4e01b4c3f4
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
2015-02-25 19:53:09 +00:00
Griff Hazen
892609ad34
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
2015-02-25 19:47:12 +00:00
Griff Hazen
aeffc9cebd
Merge "Always draw the circular emulator overlay with square dimensions" into lmp-mr1-modular-dev
2015-02-25 19:39:56 +00:00
Mark Salyzyn
a49ce66b06
am f7b68049: am 533758c1: am 0d8b97a4: Merge "jni: switch to ANDROID_LOG_* mode flags"
...
* commit 'f7b68049521b5f1c31894f5dad529f719098e987':
jni: switch to ANDROID_LOG_* mode flags
2015-02-25 19:26:57 +00:00
Mark Salyzyn
f7b6804952
am 533758c1: am 0d8b97a4: Merge "jni: switch to ANDROID_LOG_* mode flags"
...
* commit '533758c1fb2dcf5b50db46b60d26ecae72fc71ee':
jni: switch to ANDROID_LOG_* mode flags
2015-02-25 19:19:27 +00:00
Alan Viverette
a6d4484218
Merge "Create blank state in no-arg RotateDrawable constructor"
2015-02-25 19:15:40 +00:00
Mark Salyzyn
533758c1fb
am 0d8b97a4: Merge "jni: switch to ANDROID_LOG_* mode flags"
...
* commit '0d8b97a44e4cb5c5cfffd6421eb2cec1ebc00d2f':
jni: switch to ANDROID_LOG_* mode flags
2015-02-25 19:13:12 +00:00
Alan Viverette
f74869698a
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
2015-02-25 11:12:55 -08:00
Mark Salyzyn
0d8b97a44e
Merge "jni: switch to ANDROID_LOG_* mode flags"
2015-02-25 19:04:24 +00:00
Filip Gruszczynski
924a18baa2
am cf8c112e: am 01dd0e86: Merge "Force translucency from windowIsTranslucent on SwipeDismissLayout." into lmp-mr1-modular-dev
...
* commit 'cf8c112ed87752d79a869de9426b5c5a950b5c43':
Force translucency from windowIsTranslucent on SwipeDismissLayout.
2015-02-25 18:52:02 +00:00
Filip Gruszczynski
cf8c112ed8
am 01dd0e86: Merge "Force translucency from windowIsTranslucent on SwipeDismissLayout." into lmp-mr1-modular-dev
...
* commit '01dd0e86546a5bf815dd9a6e7cd4b7bf8e8f5719':
Force translucency from windowIsTranslucent on SwipeDismissLayout.
2015-02-25 18:44:57 +00:00
Filip Gruszczynski
01dd0e8654
Merge "Force translucency from windowIsTranslucent on SwipeDismissLayout." into lmp-mr1-modular-dev
2015-02-25 18:40:20 +00:00
Jim Miller
74160d8cdb
am b060f018: am 91aa1bdb: am 19847b07: am b46e4806: Merge "Remove TrustAgent whitelisting API" into lmp-mr1-dev
...
* commit 'b060f018effb27a79797e55f9eb6a592db2cb39a':
Remove TrustAgent whitelisting API
2015-02-25 18:30:10 +00:00
Jim Miller
b060f018ef
am 91aa1bdb: am 19847b07: am b46e4806: Merge "Remove TrustAgent whitelisting API" into lmp-mr1-dev
...
* commit '91aa1bdb57a82b59401afd88aaeb429ea4c73bac':
Remove TrustAgent whitelisting API
2015-02-25 18:23:20 +00:00
Chris Craik
14100ac9f8
Glop support for custom textured UVs, simplify drawBitmap(src,dst)
...
Front load the scaling-to-support-shaders to record time.
Change-Id: I861c82d9d16d3c5e063cf87230127eed0b3f9b54
2015-02-25 10:18:46 -08:00
Jim Miller
91aa1bdb57
am 19847b07: am b46e4806: Merge "Remove TrustAgent whitelisting API" into lmp-mr1-dev
...
* commit '19847b07e81b9b29e3574ce6ab8acf7a958a1a63':
Remove TrustAgent whitelisting API
2015-02-25 18:17:13 +00:00
Jim Miller
19847b07e8
am b46e4806: Merge "Remove TrustAgent whitelisting API" into lmp-mr1-dev
...
* commit 'b46e48067fd03b63fa5f5191651ac2a5d009e226':
Remove TrustAgent whitelisting API
2015-02-25 18:09:54 +00:00
Mark Salyzyn
18998c9852
jni: switch to ANDROID_LOG_* mode flags
...
Change-Id: I8aea5bf4faf79a96fa8485f7707e7484cd11d7a3
2015-02-25 18:07:21 +00:00
Jim Miller
b46e48067f
Merge "Remove TrustAgent whitelisting API" into lmp-mr1-dev
2015-02-25 18:04:58 +00:00
Fyodor Kupolov
eeea67b8c3
Extracted a separate class to run dexopt on packages
...
performDexOptLibsLI and related methods were extracted to PackageDexOptimizer
class. Minor refactoring of PackageManagerService.
This is a non-functional change. It should simplify further work to allow
storing OAT files inside package dir.
Change-Id: I3494a2da70605362bb6fb4625ffbee1cbe1cd457
2015-02-25 10:00:51 -08:00
Esteban Talavera
c718455cc1
Merge "Allow setting a Device Owner via ADB on unprovisioned device with preinstalled account"
2015-02-25 17:58:16 +00:00
John Spurlock
12485098d7
Merge "AudioService: Use the foreground broadcast queue for fired intents."
2015-02-25 17:48:39 +00:00
Esteban Talavera
4b7656f183
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
2015-02-25 17:48:39 +00:00
John Spurlock
fc0b168711
Merge "DND: Add a hidden DND tile to quick settings."
2015-02-25 17:47:58 +00:00
John Spurlock
3c4076a246
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
2015-02-25 12:46:13 -05:00
Geoff Mendal
f5b097e044
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
2015-02-25 17:27:19 +00:00
Geoff Mendal
f8952681a5
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
2015-02-25 17:27:07 +00:00
Geoff Mendal
c3470ec215
am ed6db520: (-s ours) am 6d471d04: (-s ours) am a4f54454: (-s ours) Import translations. DO NOT MERGE
...
* commit 'ed6db520b8a14786b7456e260ed72377f8900e88':
Import translations. DO NOT MERGE
2015-02-25 17:27:00 +00:00
Geoff Mendal
084f4a5039
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
2015-02-25 17:26:53 +00:00
Geoff Mendal
313fd897ea
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
2015-02-25 17:26:47 +00:00
Geoff Mendal
628ea742c8
am dd535604: (-s ours) am 53ddd69e: (-s ours) Import translations. DO NOT MERGE
...
* commit 'dd535604fc1e77da28a259a9e9e073efa5618f17':
Import translations. DO NOT MERGE
2015-02-25 17:26:40 +00:00
Joe Fernandez
3f6809452d
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
2015-02-25 17:26:33 +00:00
Andrew Solovay
571a1c8a52
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
2015-02-25 17:26:25 +00:00