OSDN Git Service

android-x86/frameworks-base.git
9 years agoam 438723e6: am a801d349: am 9621b793: am e4e3fcec: Merge "Make READ_VOICEMAIL/WRITE_...
Yorke Lee [Fri, 17 Oct 2014 23:35:38 +0000 (23:35 +0000)]
am 438723e6: am a801d349: am 9621b793: am e4e3fcec: Merge "Make READ_VOICEMAIL/WRITE_VOICEMAIL system permissions" into lmp-dev

* commit '438723e6a8484ed4edd26494d389ef211febf85a':
  Make READ_VOICEMAIL/WRITE_VOICEMAIL system permissions

9 years agoam a801d349: am 9621b793: am e4e3fcec: Merge "Make READ_VOICEMAIL/WRITE_VOICEMAIL...
Yorke Lee [Fri, 17 Oct 2014 23:30:55 +0000 (23:30 +0000)]
am a801d349: am 9621b793: am e4e3fcec: Merge "Make READ_VOICEMAIL/WRITE_VOICEMAIL system permissions" into lmp-dev

* commit 'a801d34911bfb0a1e662fdf124d7c02fb4ffaf27':
  Make READ_VOICEMAIL/WRITE_VOICEMAIL system permissions

9 years agoam 9621b793: am e4e3fcec: Merge "Make READ_VOICEMAIL/WRITE_VOICEMAIL system permissio...
Yorke Lee [Fri, 17 Oct 2014 23:24:53 +0000 (23:24 +0000)]
am 9621b793: am e4e3fcec: Merge "Make READ_VOICEMAIL/WRITE_VOICEMAIL system permissions" into lmp-dev

* commit '9621b79396303037a86eb2639035b12080c858bf':
  Make READ_VOICEMAIL/WRITE_VOICEMAIL system permissions

9 years agoam 0ee9f361: am 0b5af04a: am ebb38bcc: am cd2b54e6: Merge "Accessibility no longer...
Svetoslav [Fri, 17 Oct 2014 23:19:57 +0000 (23:19 +0000)]
am 0ee9f361: am 0b5af04a: am ebb38bcc: am cd2b54e6: Merge "Accessibility no longer overrides strong encryption." into lmp-dev

* commit '0ee9f36140530cf8ee60613f4f057c2ec95fe498':
  Accessibility no longer overrides strong encryption.

9 years agoam e4e3fcec: Merge "Make READ_VOICEMAIL/WRITE_VOICEMAIL system permissions" into...
Yorke Lee [Fri, 17 Oct 2014 23:19:31 +0000 (23:19 +0000)]
am e4e3fcec: Merge "Make READ_VOICEMAIL/WRITE_VOICEMAIL system permissions" into lmp-dev

* commit 'e4e3fcec415cdc9739f32ce1eaaec67666e5454d':
  Make READ_VOICEMAIL/WRITE_VOICEMAIL system permissions

9 years agoMerge "Make READ_VOICEMAIL/WRITE_VOICEMAIL system permissions" into lmp-dev
Yorke Lee [Fri, 17 Oct 2014 23:16:33 +0000 (23:16 +0000)]
Merge "Make READ_VOICEMAIL/WRITE_VOICEMAIL system permissions" into lmp-dev

9 years agoam 0b5af04a: am ebb38bcc: am cd2b54e6: Merge "Accessibility no longer overrides stron...
Svetoslav [Fri, 17 Oct 2014 23:14:57 +0000 (23:14 +0000)]
am 0b5af04a: am ebb38bcc: am cd2b54e6: Merge "Accessibility no longer overrides strong encryption." into lmp-dev

* commit '0b5af04a8b202a2f274bb90c4fa982c813c40a20':
  Accessibility no longer overrides strong encryption.

9 years agoam dd64fc43: am effd416e: am 83fae208: am 3cd840f4: Merge "AAPT: Fix an issue where...
Adam Lesinski [Fri, 17 Oct 2014 23:12:28 +0000 (23:12 +0000)]
am dd64fc43: am effd416e: am 83fae208: am 3cd840f4: Merge "AAPT: Fix an issue where a resource name was incorrectly derived on Windows" into lmp-dev

* commit 'dd64fc43a6c560d3c545132adc16cd4a079f9600':
  AAPT: Fix an issue where a resource name was incorrectly derived on Windows

9 years agoam ebb38bcc: am cd2b54e6: Merge "Accessibility no longer overrides strong encryption...
Svetoslav [Fri, 17 Oct 2014 23:09:55 +0000 (23:09 +0000)]
am ebb38bcc: am cd2b54e6: Merge "Accessibility no longer overrides strong encryption." into lmp-dev

* commit 'ebb38bcc03a0f770d371b2ed997570572df7aed1':
  Accessibility no longer overrides strong encryption.

9 years agoam effd416e: am 83fae208: am 3cd840f4: Merge "AAPT: Fix an issue where a resource...
Adam Lesinski [Fri, 17 Oct 2014 23:07:23 +0000 (23:07 +0000)]
am effd416e: am 83fae208: am 3cd840f4: Merge "AAPT: Fix an issue where a resource name was incorrectly derived on Windows" into lmp-dev

* commit 'effd416ee3c05c6c378614995fdbe514c8423a48':
  AAPT: Fix an issue where a resource name was incorrectly derived on Windows

9 years agoam cd2b54e6: Merge "Accessibility no longer overrides strong encryption." into lmp-dev
Svetoslav [Fri, 17 Oct 2014 23:04:12 +0000 (23:04 +0000)]
am cd2b54e6: Merge "Accessibility no longer overrides strong encryption." into lmp-dev

* commit 'cd2b54e6e546099e028f9e41966ab7cf1deedd3c':
  Accessibility no longer overrides strong encryption.

9 years agoam 83fae208: am 3cd840f4: Merge "AAPT: Fix an issue where a resource name was incorre...
Adam Lesinski [Fri, 17 Oct 2014 23:01:44 +0000 (23:01 +0000)]
am 83fae208: am 3cd840f4: Merge "AAPT: Fix an issue where a resource name was incorrectly derived on Windows" into lmp-dev

* commit '83fae208fee402d8a6a51362f99660f9a49bd5a4':
  AAPT: Fix an issue where a resource name was incorrectly derived on Windows

9 years agoMerge "Accessibility no longer overrides strong encryption." into lmp-dev
Svetoslav [Fri, 17 Oct 2014 22:59:20 +0000 (22:59 +0000)]
Merge "Accessibility no longer overrides strong encryption." into lmp-dev

9 years agoam 3cd840f4: Merge "AAPT: Fix an issue where a resource name was incorrectly derived...
Adam Lesinski [Fri, 17 Oct 2014 22:56:10 +0000 (22:56 +0000)]
am 3cd840f4: Merge "AAPT: Fix an issue where a resource name was incorrectly derived on Windows" into lmp-dev

* commit '3cd840f4b5a2988700a6b366fa32f4565c319900':
  AAPT: Fix an issue where a resource name was incorrectly derived on Windows

9 years agoMerge "AAPT: Fix an issue where a resource name was incorrectly derived on Windows...
Adam Lesinski [Fri, 17 Oct 2014 22:50:48 +0000 (22:50 +0000)]
Merge "AAPT: Fix an issue where a resource name was incorrectly derived on Windows" into lmp-dev

9 years agoam cb1e32ac: am 44d51545: am 7d5c68e3: am 84b4791a: Merge "Modified lollipop Easter...
William Bourke [Fri, 17 Oct 2014 22:20:44 +0000 (22:20 +0000)]
am cb1e32ac: am 44d51545: am 7d5c68e3: am 84b4791a: Merge "Modified lollipop Easter egg for TV compatibility" into lmp-dev

* commit 'cb1e32ac2b5eb12ff89af5eb8074908b5f54d047':
  Modified lollipop Easter egg for TV compatibility

9 years agoam 4d7bf8aa: am f617da03: am 2cc44f2a: am 6dc5d683: docs: Android L release fixes
Joe Fernandez [Fri, 17 Oct 2014 22:20:38 +0000 (22:20 +0000)]
am 4d7bf8aa: am f617da03: am 2cc44f2a: am 6dc5d683: docs: Android L release fixes

* commit '4d7bf8aa16a314f7a2f5e0baf74aff74f291ac82':
  docs: Android L release fixes

9 years agoam 44d51545: am 7d5c68e3: am 84b4791a: Merge "Modified lollipop Easter egg for TV...
William Bourke [Fri, 17 Oct 2014 22:14:55 +0000 (22:14 +0000)]
am 44d51545: am 7d5c68e3: am 84b4791a: Merge "Modified lollipop Easter egg for TV compatibility" into lmp-dev

* commit '44d515457a55cdcd92257a711db8dd10f71f0175':
  Modified lollipop Easter egg for TV compatibility

9 years agoam f617da03: am 2cc44f2a: am 6dc5d683: docs: Android L release fixes
Joe Fernandez [Fri, 17 Oct 2014 22:14:50 +0000 (22:14 +0000)]
am f617da03: am 2cc44f2a: am 6dc5d683: docs: Android L release fixes

* commit 'f617da039d3c2b752ad0b856cfeebf0b1ff5fac4':
  docs: Android L release fixes

9 years agoam 7d5c68e3: am 84b4791a: Merge "Modified lollipop Easter egg for TV compatibility...
William Bourke [Fri, 17 Oct 2014 22:09:19 +0000 (22:09 +0000)]
am 7d5c68e3: am 84b4791a: Merge "Modified lollipop Easter egg for TV compatibility" into lmp-dev

* commit '7d5c68e31eea3848fd8fa75dfd9f7190ef1cd3a3':
  Modified lollipop Easter egg for TV compatibility

9 years agoam 2cc44f2a: am 6dc5d683: docs: Android L release fixes
Joe Fernandez [Fri, 17 Oct 2014 22:09:15 +0000 (22:09 +0000)]
am 2cc44f2a: am 6dc5d683: docs: Android L release fixes

* commit '2cc44f2adce51bbc7df4b96d12287628b8f903b3':
  docs: Android L release fixes

9 years agoam c9b7a8c0: am 1f5d55d1: am 1fede10c: am 09cce6f5: Merge "docs: Added new BILLING_RE...
Joe Fernandez [Fri, 17 Oct 2014 22:03:56 +0000 (22:03 +0000)]
am c9b7a8c0: am 1f5d55d1: am 1fede10c: am 09cce6f5: Merge "docs: Added new BILLING_RESPONSE_RESULT_SERVICE_UNAVAILABLE result" into lmp-dev

* commit 'c9b7a8c005df4b1f2c0f6ab55f0e1daf58cb32f6':
  docs: Added new BILLING_RESPONSE_RESULT_SERVICE_UNAVAILABLE result

9 years agoam 84b4791a: Merge "Modified lollipop Easter egg for TV compatibility" into lmp-dev
William Bourke [Fri, 17 Oct 2014 22:03:50 +0000 (22:03 +0000)]
am 84b4791a: Merge "Modified lollipop Easter egg for TV compatibility" into lmp-dev

* commit '84b4791aaf0384a334068a97c70fcda162cfadab':
  Modified lollipop Easter egg for TV compatibility

9 years agoam 6dc5d683: docs: Android L release fixes
Joe Fernandez [Fri, 17 Oct 2014 22:03:47 +0000 (22:03 +0000)]
am 6dc5d683: docs: Android L release fixes

* commit '6dc5d68399377eb8d6a3132c2af475d92ed8aca5':
  docs: Android L release fixes

9 years agoMerge "Modified lollipop Easter egg for TV compatibility" into lmp-dev
William Bourke [Fri, 17 Oct 2014 22:00:59 +0000 (22:00 +0000)]
Merge "Modified lollipop Easter egg for TV compatibility" into lmp-dev

9 years agoam 1f5d55d1: am 1fede10c: am 09cce6f5: Merge "docs: Added new BILLING_RESPONSE_RESULT...
Joe Fernandez [Fri, 17 Oct 2014 21:58:41 +0000 (21:58 +0000)]
am 1f5d55d1: am 1fede10c: am 09cce6f5: Merge "docs: Added new BILLING_RESPONSE_RESULT_SERVICE_UNAVAILABLE result" into lmp-dev

* commit '1f5d55d135f1b3b3361dfe26cc4f15fd800e37c5':
  docs: Added new BILLING_RESPONSE_RESULT_SERVICE_UNAVAILABLE result

9 years agodocs: Android L release fixes
Joe Fernandez [Fri, 17 Oct 2014 20:57:15 +0000 (13:57 -0700)]
docs: Android L release fixes

- L Highlights fixes
b/18029526
- L API Overview fixes
b/18034482

Change-Id: I2e93ece18748c15a8fe10749e75008bf5ed9a7c0

9 years agoModified lollipop Easter egg for TV compatibility
William Bourke [Fri, 17 Oct 2014 18:13:11 +0000 (11:13 -0700)]
Modified lollipop Easter egg for TV compatibility

Bug: 17997922

Change-Id: I0e2e34245183cdd146ecca02ab09b2c4867770ec

9 years agoam 1fede10c: am 09cce6f5: Merge "docs: Added new BILLING_RESPONSE_RESULT_SERVICE_UNAV...
Joe Fernandez [Fri, 17 Oct 2014 21:51:51 +0000 (21:51 +0000)]
am 1fede10c: am 09cce6f5: Merge "docs: Added new BILLING_RESPONSE_RESULT_SERVICE_UNAVAILABLE result" into lmp-dev

* commit '1fede10c269f97f2a9dac48025dccce7e45cef9d':
  docs: Added new BILLING_RESPONSE_RESULT_SERVICE_UNAVAILABLE result

9 years agoAAPT: Fix an issue where a resource name was incorrectly derived on Windows
Adam Lesinski [Fri, 17 Oct 2014 21:40:17 +0000 (14:40 -0700)]
AAPT: Fix an issue where a resource name was incorrectly derived on Windows

Calling String8::getLeaf() will assume the system's file path separator,
however the source string was already converted to a unix path.
getLeaf() would therefore not find any occurence of '\' and would
return the full path.

Bug:18036805
Change-Id: Ic2bfac0cc553406740204a296327e266b05c0eff

9 years agoam 09cce6f5: Merge "docs: Added new BILLING_RESPONSE_RESULT_SERVICE_UNAVAILABLE resul...
Joe Fernandez [Fri, 17 Oct 2014 21:46:10 +0000 (21:46 +0000)]
am 09cce6f5: Merge "docs: Added new BILLING_RESPONSE_RESULT_SERVICE_UNAVAILABLE result" into lmp-dev

* commit '09cce6f509af58e3eeaf687b63e292c222a7d769':
  docs: Added new BILLING_RESPONSE_RESULT_SERVICE_UNAVAILABLE result

9 years agoMerge "docs: Added new BILLING_RESPONSE_RESULT_SERVICE_UNAVAILABLE result" into lmp-dev
Joe Fernandez [Fri, 17 Oct 2014 21:39:26 +0000 (21:39 +0000)]
Merge "docs: Added new BILLING_RESPONSE_RESULT_SERVICE_UNAVAILABLE result" into lmp-dev

9 years agoAccessibility no longer overrides strong encryption.
Svetoslav [Fri, 17 Oct 2014 18:38:06 +0000 (11:38 -0700)]
Accessibility no longer overrides strong encryption.

Updating the accessibility layer behavior to reflect the new
model where accessibility no longer overrides strong encryption.
Now enabling an accessibility service lowers the encryption
level but the user can bump it up in settings if desired.

bug:17881324

Change-Id: Ic60d760c267d3f934040a42e1963b179bd8b9f5f

9 years agodocs: Added new BILLING_RESPONSE_RESULT_SERVICE_UNAVAILABLE result
Andrew Solovay [Fri, 17 Oct 2014 21:05:22 +0000 (14:05 -0700)]
docs: Added new BILLING_RESPONSE_RESULT_SERVICE_UNAVAILABLE result

See first comment for doc staging directory.

bug: 18000631
Change-Id: I4dba47e0965947774adad86218369678311f4a0c

9 years agoam 0fac4f27: am 9881c0d8: am c97bc213: am f21746fc: Merge "docs: update location...
Joe Fernandez [Fri, 17 Oct 2014 20:29:01 +0000 (20:29 +0000)]
am 0fac4f27: am 9881c0d8: am c97bc213: am f21746fc: Merge "docs: update location of sample apps" into lmp-dev

* commit '0fac4f27c762058b5b955749e8be68ae8573a8e8':
  docs: update location of sample apps

9 years agoam 87a529c8: am 12c84b5d: Merge "Minor resource notation/compatibility fixes" into...
Adam Lesinski [Fri, 17 Oct 2014 20:28:47 +0000 (20:28 +0000)]
am 87a529c8: am 12c84b5d: Merge "Minor resource notation/compatibility fixes" into lmp-mr1-dev

* commit '87a529c899045cf2785b86e4e289dd6c6cf56c1a':
  Minor resource notation/compatibility fixes

9 years agoam 3e732ab2: am e1970346: am b5afeca3: am a865bb5d: Merge "Use the correct method...
Amith Yamasani [Fri, 17 Oct 2014 20:28:41 +0000 (20:28 +0000)]
am 3e732ab2: am e1970346: am b5afeca3: am a865bb5d: Merge "Use the correct method to check if device is encrypted" into lmp-dev

* commit '3e732ab2050507dbfde23ee0d050daae86d9d8bc':
  Use the correct method to check if device is encrypted

9 years agoam d2d4fa78: am 43d7ad3e: am e62a4a50: am af8de90f: Merge "fix 1% mystery bug on...
smain@google.com [Fri, 17 Oct 2014 20:28:36 +0000 (20:28 +0000)]
am d2d4fa78: am 43d7ad3e: am e62a4a50: am af8de90f: Merge "fix 1% mystery bug on preview image downloads. just remove the hashchange listener; no more back-navigation, eh." into lmp-dev

* commit 'd2d4fa78d3c0e6c376d4884dafc5b62a9e8a8f37':
  fix 1% mystery bug on preview image downloads. just remove the hashchange listener; no more back-navigation, eh.

9 years agoam 9881c0d8: am c97bc213: am f21746fc: Merge "docs: update location of sample apps...
Joe Fernandez [Fri, 17 Oct 2014 20:06:12 +0000 (20:06 +0000)]
am 9881c0d8: am c97bc213: am f21746fc: Merge "docs: update location of sample apps" into lmp-dev

* commit '9881c0d8f4334648a2dd691fe46db9e9a2e5fb53':
  docs: update location of sample apps

9 years agoam c97bc213: am f21746fc: Merge "docs: update location of sample apps" into lmp-dev
Joe Fernandez [Fri, 17 Oct 2014 20:01:04 +0000 (20:01 +0000)]
am c97bc213: am f21746fc: Merge "docs: update location of sample apps" into lmp-dev

* commit 'c97bc213481cef235b10a2d4d17caba7301cd3c5':
  docs: update location of sample apps

9 years agoam f21746fc: Merge "docs: update location of sample apps" into lmp-dev
Joe Fernandez [Fri, 17 Oct 2014 19:52:07 +0000 (19:52 +0000)]
am f21746fc: Merge "docs: update location of sample apps" into lmp-dev

* commit 'f21746fca8603ed5a4d328b804ad6de24226ef49':
  docs: update location of sample apps

9 years agoMerge "docs: update location of sample apps" into lmp-dev
Joe Fernandez [Fri, 17 Oct 2014 19:39:27 +0000 (19:39 +0000)]
Merge "docs: update location of sample apps" into lmp-dev

9 years agoam 12c84b5d: Merge "Minor resource notation/compatibility fixes" into lmp-mr1-dev
Adam Lesinski [Fri, 17 Oct 2014 19:21:43 +0000 (19:21 +0000)]
am 12c84b5d: Merge "Minor resource notation/compatibility fixes" into lmp-mr1-dev

* commit '12c84b5d9f30f3d31ab18fee719f3a1bf00ab957':
  Minor resource notation/compatibility fixes

9 years agoMerge "Minor resource notation/compatibility fixes" into lmp-mr1-dev
Adam Lesinski [Fri, 17 Oct 2014 19:17:18 +0000 (19:17 +0000)]
Merge "Minor resource notation/compatibility fixes" into lmp-mr1-dev

9 years agoam fb6436cb: am fee0385f: am fdb2d1f8: am c598a4a4: Merge "docs: Fixed sound and...
Quddus Chong [Fri, 17 Oct 2014 19:16:42 +0000 (19:16 +0000)]
am fb6436cb: am fee0385f: am fdb2d1f8: am c598a4a4: Merge "docs: Fixed sound and vibration section in Android 5.0 API overview." into lmp-dev

* commit 'fb6436cb47cd0756862134d1d2bd3eee5ea1ea3a':
  docs: Fixed sound and vibration section in Android 5.0 API overview.

9 years agoam 9baa4506: am 3182987e: am bab9b48e: am 52476989: Merge "SDK only: hide the old...
Dianne Hackborn [Fri, 17 Oct 2014 19:16:37 +0000 (19:16 +0000)]
am 9baa4506: am 3182987e: am bab9b48e: am 52476989: Merge "SDK only: hide the old L API version constant." into lmp-dev

* commit '9baa4506f1e7218d555d37a2057325c68492f080':
  SDK only: hide the old L API version constant.

9 years agoam e1970346: am b5afeca3: am a865bb5d: Merge "Use the correct method to check if...
Amith Yamasani [Fri, 17 Oct 2014 19:14:06 +0000 (19:14 +0000)]
am e1970346: am b5afeca3: am a865bb5d: Merge "Use the correct method to check if device is encrypted" into lmp-dev

* commit 'e1970346a43109a9bcf4037135425a918fc953d3':
  Use the correct method to check if device is encrypted

9 years agoam 43d7ad3e: am e62a4a50: am af8de90f: Merge "fix 1% mystery bug on preview image...
smain@google.com [Fri, 17 Oct 2014 19:14:01 +0000 (19:14 +0000)]
am 43d7ad3e: am e62a4a50: am af8de90f: Merge "fix 1% mystery bug on preview image downloads. just remove the hashchange listener; no more back-navigation, eh." into lmp-dev

* commit '43d7ad3e48e9323b3418c05170cbe4d1cff2b4a5':
  fix 1% mystery bug on preview image downloads. just remove the hashchange listener; no more back-navigation, eh.

9 years agoam c77dc669: am 99c8167a: am a1012fb5: am fe511970: Merge "edits to the Lollipop...
smain@google.com [Fri, 17 Oct 2014 19:11:58 +0000 (19:11 +0000)]
am c77dc669: am 99c8167a: am a1012fb5: am fe511970: Merge "edits to the Lollipop highlights" into lmp-dev

* commit 'c77dc6696f392288dd32956b6f14becdc379abc6':
  edits to the Lollipop highlights

9 years agoam d6a34c55: am cd5d6a68: am 9d141d1d: am 6da9e548: Merge "Updated Android SDK/Studio...
Vince Harron [Fri, 17 Oct 2014 19:11:53 +0000 (19:11 +0000)]
am d6a34c55: am cd5d6a68: am 9d141d1d: am 6da9e548: Merge "Updated Android SDK/Studio system requirements" into lmp-dev

* commit 'd6a34c55fc57b0d02fd3f734902c1d52107fbf48':
  Updated Android SDK/Studio system requirements

9 years agoam 9e868f02: am 5fe3c49a: am 7f83b4a7: am 15d2e768: Merge "docs: Updated Android...
Quddus Chong [Fri, 17 Oct 2014 19:11:47 +0000 (19:11 +0000)]
am 9e868f02: am 5fe3c49a: am 7f83b4a7: am 15d2e768: Merge "docs: Updated Android 5.0 API Overview to reflect that   setting the device to RINGER_MODE_NORMAL or RINGER_MODE_VIBRATE   causes the device to leave priority mode." into lmp-dev

* commit '9e868f020074f1387bd519954834da4db1bc9a79':
  docs: Updated Android 5.0 API Overview to reflect that   setting the device to RINGER_MODE_NORMAL or RINGER_MODE_VIBRATE   causes the device to leave priority mode.

9 years agoam dc62a2d6: am 8ac39738: am 6e028eba: am ac21dbb4: Docs: Update "What\'s New" for...
Trevor Johns [Fri, 17 Oct 2014 19:11:42 +0000 (19:11 +0000)]
am dc62a2d6: am 8ac39738: am 6e028eba: am ac21dbb4: Docs: Update "What\'s New" for L Final Preview samples

* commit 'dc62a2d6b13453e3e755fea482b0783c3c25c514':
  Docs: Update "What's New" for L Final Preview samples

9 years agoam 0e534383: am a6b7c5a7: am 4142d9b0: am 7d96dc6d: Merge "Fix getStorageEncryptionSt...
Jim Miller [Fri, 17 Oct 2014 19:11:36 +0000 (19:11 +0000)]
am 0e534383: am a6b7c5a7: am 4142d9b0: am 7d96dc6d: Merge "Fix getStorageEncryptionStatus() in DevicePolicyManager" into lmp-dev

* commit '0e5343833f74e2019f2466f0f854a99e9226279b':
  Fix getStorageEncryptionStatus() in DevicePolicyManager

9 years agoam e1fa68cd: am 20a7afd4: am f0c1af8e: am 22fa76da: Merge "Doc change: Add Lollipop...
Dirk Dougherty [Fri, 17 Oct 2014 19:11:31 +0000 (19:11 +0000)]
am e1fa68cd: am 20a7afd4: am f0c1af8e: am 22fa76da: Merge "Doc change: Add Lollipop to platform versions table." into lmp-dev

* commit 'e1fa68cd24c5a97a549c101f3eeacb70cafb8c9d':
  Doc change: Add Lollipop to platform versions table.

9 years agoam 63294fe7: am 84b4ad4b: am 5957b633: am c8cef6cc: Merge "time to forget about honey...
smain@google.com [Fri, 17 Oct 2014 19:11:10 +0000 (19:11 +0000)]
am 63294fe7: am 84b4ad4b: am 5957b633: am c8cef6cc: Merge "time to forget about honeycomb and gingerbread." into lmp-dev

* commit '63294fe7277be28845e03c08280cfafdd195d9cb':
  time to forget about honeycomb and gingerbread.

9 years agoam d11c89f7: am d8d62257: am 2ff9be11: am 8adb5fd1: Merge "fix links on preview page...
smain@google.com [Fri, 17 Oct 2014 19:11:05 +0000 (19:11 +0000)]
am d11c89f7: am d8d62257: am 2ff9be11: am 8adb5fd1: Merge "fix links on preview page" into lmp-dev

* commit 'd11c89f7b1132aa151c3eb991ddb829f8ca651bb':
  fix links on preview page

9 years agoam f4c4b593: am f51cc58c: am dfcdfbd6: am f19f6397: Merge "edits to the lollipop...
smain@google.com [Fri, 17 Oct 2014 19:11:00 +0000 (19:11 +0000)]
am f4c4b593: am f51cc58c: am dfcdfbd6: am f19f6397: Merge "edits to the lollipop highlights" into lmp-dev

* commit 'f4c4b593142f9bff6a10b0c13dd150b740b604f4':
  edits to the lollipop highlights

9 years agoam 09e67c86: am 702cb3b2: am 7314b607: am e7cc9e80: Merge "docs: Android TV docs...
Joe Fernandez [Fri, 17 Oct 2014 19:10:54 +0000 (19:10 +0000)]
am 09e67c86: am 702cb3b2: am 7314b607: am e7cc9e80: Merge "docs: Android TV docs fixes for L SDK release" into lmp-dev

* commit '09e67c86b9d17fb7ab8f9a5a7f4951ca13c40fa4':
  docs: Android TV docs fixes for L SDK release

9 years agoam 6ac00545: am 0f6eb938: am d9b48e94: am 4561be01: Merge "add TV quality page to...
smain@google.com [Fri, 17 Oct 2014 19:10:49 +0000 (19:10 +0000)]
am 6ac00545: am 0f6eb938: am d9b48e94: am 4561be01: Merge "add TV quality page to Develop landing carousel" into lmp-dev

* commit '6ac00545000f009e22b70bbfbae192d478494373':
  add TV quality page to Develop landing carousel

9 years agoam 81584ee6: am 5100b72c: am fafb6c70: am dd886683: docs: Notifications changes for L
Scott Rowe [Fri, 17 Oct 2014 19:10:38 +0000 (19:10 +0000)]
am 81584ee6: am 5100b72c: am fafb6c70: am dd886683: docs: Notifications changes for L

* commit '81584ee6ed1b0378847aaee0ae4091cb9fefe2a3':
  docs: Notifications changes for L

9 years agoam 38748ce7: am 5f13e2f0: am f8d6891c: am 4deed3ec: Merge "docs: Android TV App Quali...
Joe Fernandez [Fri, 17 Oct 2014 19:10:33 +0000 (19:10 +0000)]
am 38748ce7: am 5f13e2f0: am f8d6891c: am 4deed3ec: Merge "docs: Android TV App Quality Requirements v2" into lmp-dev

* commit '38748ce701ef261f17e6c29bd340fe5b039f44fb':
  docs: Android TV App Quality Requirements v2

9 years agoam 3d5d4b4c: am c371b0af: am 583cf69c: am 6bd081ca: docs: Displaying a Now Playing...
Scott Rowe [Fri, 17 Oct 2014 19:10:28 +0000 (19:10 +0000)]
am 3d5d4b4c: am c371b0af: am 583cf69c: am 6bd081ca: docs: Displaying a Now Playing Card

* commit '3d5d4b4cea5f00f0bbf24b174af2ce5e654943dc':
  docs: Displaying a Now Playing Card

9 years agoam d81ca1da: am 39f69b79: am 770f57e0: am 321e7645: Merge "docs: Recents screen for...
Joe Fernandez [Fri, 17 Oct 2014 19:10:23 +0000 (19:10 +0000)]
am d81ca1da: am 39f69b79: am 770f57e0: am 321e7645: Merge "docs: Recents screen for tasks and activities" into lmp-dev

* commit 'd81ca1da0546b4d0d9ff32918132e625e89d4e16':
  docs: Recents screen for tasks and activities

9 years agoam 9c60193a: am 53805450: am 4a0f162d: am c6400892: Merge "add Lollipop highlights...
smain@google.com [Fri, 17 Oct 2014 19:10:18 +0000 (19:10 +0000)]
am 9c60193a: am 53805450: am 4a0f162d: am c6400892: Merge "add Lollipop highlights and revision to 5.0 API overview intro" into lmp-dev

* commit '9c60193adfac4d5d8fde077544abd7c06a90ec22':
  add Lollipop highlights and revision to 5.0 API overview intro

9 years agoam 315a45e0: am 36d13e6a: am 491fa057: am d664dc93: Merge "Android 5.0 changes to...
Joe Fernandez [Fri, 17 Oct 2014 19:09:52 +0000 (19:09 +0000)]
am 315a45e0: am 36d13e6a: am 491fa057: am d664dc93: Merge "Android 5.0 changes to IME switching" into lmp-dev

* commit '315a45e085a14884e267c49498e94a316376e212':
  Android 5.0 changes to IME switching

9 years agoam e9f6f29b: am b07f08f1: am be097523: am c49acf02: Merge "docs: Update Android...
Joe Fernandez [Fri, 17 Oct 2014 19:09:47 +0000 (19:09 +0000)]
am e9f6f29b: am b07f08f1: am be097523: am c49acf02: Merge "docs:  Update Android TV home for L announcement" into lmp-dev

* commit 'e9f6f29b66ff26c649bd8794877128c29bb83c39':
  docs:  Update Android TV home for L announcement

9 years agoam 3d8eb0a5: am 9ce4e565: am 4e5ebb99: am c2a556ff: Merge "Notificiations Design...
David Friedman [Fri, 17 Oct 2014 19:09:42 +0000 (19:09 +0000)]
am 3d8eb0a5: am 9ce4e565: am 4e5ebb99: am c2a556ff: Merge "Notificiations Design for Android L Release" into lmp-dev

* commit '3d8eb0a5478b5362e50f3ff6e550cc45c5dfceef':
  Notificiations Design for Android L Release

9 years agoam 5ac64f0d: am 30be8be4: am 981c97ec: am 597d3861: Merge "NDK-r10c release notes...
David Friedman [Fri, 17 Oct 2014 19:09:36 +0000 (19:09 +0000)]
am 5ac64f0d: am 30be8be4: am 981c97ec: am 597d3861: Merge "NDK-r10c release notes (change log) for publication to NDK page on DAC." into lmp-dev

* commit '5ac64f0d860d4b5f682557a48547437f9ec7ac01':
  NDK-r10c release notes (change log) for publication to NDK page on DAC.

9 years agoam 9cdc6073: am fd756b9f: am 238b4795: am 271078f5: update L preview landing page...
smain@google.com [Fri, 17 Oct 2014 19:09:18 +0000 (19:09 +0000)]
am 9cdc6073: am fd756b9f: am 238b4795: am 271078f5: update L preview landing page for 5.0 SDK launch includes new system images also update the DAC homepage announcement

* commit '9cdc6073e159e286f5c04c23b0987862e24d8715':
  update L preview landing page for 5.0 SDK launch includes new system images also update the DAC homepage announcement

9 years agoam ce9676e7: am c1c31327: am f1425001: am 2e57c2c9: Merge "docs: Migrating material...
Ricardo Cervera [Fri, 17 Oct 2014 19:09:12 +0000 (19:09 +0000)]
am ce9676e7: am c1c31327: am f1425001: am 2e57c2c9: Merge "docs: Migrating material design info from the Preview site" into lmp-dev

* commit 'ce9676e71257798ed5cd4a147095f8f505c2b6da':
  docs: Migrating material design info from the Preview site

9 years agoam f8cdc978: am b14e07e3: am 0fae717e: am 67b5c8eb: Merge "docs: Updates to Android...
Quddus Chong [Fri, 17 Oct 2014 19:09:07 +0000 (19:09 +0000)]
am f8cdc978: am b14e07e3: am 0fae717e: am 67b5c8eb: Merge "docs: Updates to Android 5.0 API Overview." into lmp-dev

* commit 'f8cdc9784302e180b5999b2e84e296ef23f9892f':
  docs: Updates to Android 5.0 API Overview.

9 years agoam fee0385f: am fdb2d1f8: am c598a4a4: Merge "docs: Fixed sound and vibration section...
Quddus Chong [Fri, 17 Oct 2014 19:06:25 +0000 (19:06 +0000)]
am fee0385f: am fdb2d1f8: am c598a4a4: Merge "docs: Fixed sound and vibration section in Android 5.0 API overview." into lmp-dev

* commit 'fee0385f1c4af659b897ba2bfba7e4d9fa8f7ff1':
  docs: Fixed sound and vibration section in Android 5.0 API overview.

9 years agoam 3182987e: am bab9b48e: am 52476989: Merge "SDK only: hide the old L API version...
Dianne Hackborn [Fri, 17 Oct 2014 19:06:20 +0000 (19:06 +0000)]
am 3182987e: am bab9b48e: am 52476989: Merge "SDK only: hide the old L API version constant." into lmp-dev

* commit '3182987eb8bf93c77d2cde6d3483d39006aea28a':
  SDK only: hide the old L API version constant.

9 years agoam b5afeca3: am a865bb5d: Merge "Use the correct method to check if device is encrypt...
Amith Yamasani [Fri, 17 Oct 2014 19:05:25 +0000 (19:05 +0000)]
am b5afeca3: am a865bb5d: Merge "Use the correct method to check if device is encrypted" into lmp-dev

* commit 'b5afeca3d9ce3efb0ab9ab6536d4446ec73b416c':
  Use the correct method to check if device is encrypted

9 years agoam e62a4a50: am af8de90f: Merge "fix 1% mystery bug on preview image downloads. just...
smain@google.com [Fri, 17 Oct 2014 19:05:21 +0000 (19:05 +0000)]
am e62a4a50: am af8de90f: Merge "fix 1% mystery bug on preview image downloads. just remove the hashchange listener; no more back-navigation, eh." into lmp-dev

* commit 'e62a4a50cf2cc4c26f8616d09bed30e94a7699ca':
  fix 1% mystery bug on preview image downloads. just remove the hashchange listener; no more back-navigation, eh.

9 years agoam 99c8167a: am a1012fb5: am fe511970: Merge "edits to the Lollipop highlights" into...
smain@google.com [Fri, 17 Oct 2014 19:01:10 +0000 (19:01 +0000)]
am 99c8167a: am a1012fb5: am fe511970: Merge "edits to the Lollipop highlights" into lmp-dev

* commit '99c8167a1634a9347d08813190ac26bf7f05fb9b':
  edits to the Lollipop highlights

9 years agoam cd5d6a68: am 9d141d1d: am 6da9e548: Merge "Updated Android SDK/Studio system requi...
Vince Harron [Fri, 17 Oct 2014 19:01:04 +0000 (19:01 +0000)]
am cd5d6a68: am 9d141d1d: am 6da9e548: Merge "Updated Android SDK/Studio system requirements" into lmp-dev

* commit 'cd5d6a6826e21f131a9715538d22a888b7cb61b0':
  Updated Android SDK/Studio system requirements

9 years agoam 5fe3c49a: am 7f83b4a7: am 15d2e768: Merge "docs: Updated Android 5.0 API Overview...
Quddus Chong [Fri, 17 Oct 2014 19:01:00 +0000 (19:01 +0000)]
am 5fe3c49a: am 7f83b4a7: am 15d2e768: Merge "docs: Updated Android 5.0 API Overview to reflect that   setting the device to RINGER_MODE_NORMAL or RINGER_MODE_VIBRATE   causes the device to leave priority mode." into lmp-dev

* commit '5fe3c49a62894f52f1e3b62027fba2a5a2270592':
  docs: Updated Android 5.0 API Overview to reflect that   setting the device to RINGER_MODE_NORMAL or RINGER_MODE_VIBRATE   causes the device to leave priority mode.

9 years agoam 8ac39738: am 6e028eba: am ac21dbb4: Docs: Update "What\'s New" for L Final Preview...
Trevor Johns [Fri, 17 Oct 2014 19:00:55 +0000 (19:00 +0000)]
am 8ac39738: am 6e028eba: am ac21dbb4: Docs: Update "What\'s New" for L Final Preview samples

* commit '8ac3973862c87ecd166d4945878e5bffc9c25889':
  Docs: Update "What's New" for L Final Preview samples

9 years agoam a6b7c5a7: am 4142d9b0: am 7d96dc6d: Merge "Fix getStorageEncryptionStatus() in...
Jim Miller [Fri, 17 Oct 2014 19:00:49 +0000 (19:00 +0000)]
am a6b7c5a7: am 4142d9b0: am 7d96dc6d: Merge "Fix getStorageEncryptionStatus() in DevicePolicyManager" into lmp-dev

* commit 'a6b7c5a7b11af0671cde1b20e4c76c9d16113ef8':
  Fix getStorageEncryptionStatus() in DevicePolicyManager

9 years agoam 20a7afd4: am f0c1af8e: am 22fa76da: Merge "Doc change: Add Lollipop to platform...
Dirk Dougherty [Fri, 17 Oct 2014 19:00:45 +0000 (19:00 +0000)]
am 20a7afd4: am f0c1af8e: am 22fa76da: Merge "Doc change: Add Lollipop to platform versions table." into lmp-dev

* commit '20a7afd4b4fb0bc38ea3d4920f62e337c1011219':
  Doc change: Add Lollipop to platform versions table.

9 years agoam 84b4ad4b: am 5957b633: am c8cef6cc: Merge "time to forget about honeycomb and...
smain@google.com [Fri, 17 Oct 2014 19:00:40 +0000 (19:00 +0000)]
am 84b4ad4b: am 5957b633: am c8cef6cc: Merge "time to forget about honeycomb and gingerbread." into lmp-dev

* commit '84b4ad4b20c8e9f2caab05df6716590c84dde595':
  time to forget about honeycomb and gingerbread.

9 years agoam a865bb5d: Merge "Use the correct method to check if device is encrypted" into...
Amith Yamasani [Fri, 17 Oct 2014 19:00:36 +0000 (19:00 +0000)]
am a865bb5d: Merge "Use the correct method to check if device is encrypted" into lmp-dev

* commit 'a865bb5df834194dee339db615c17d7c7b63aaa3':
  Use the correct method to check if device is encrypted

9 years agoam d8d62257: am 2ff9be11: am 8adb5fd1: Merge "fix links on preview page" into lmp-dev
smain@google.com [Fri, 17 Oct 2014 19:00:35 +0000 (19:00 +0000)]
am d8d62257: am 2ff9be11: am 8adb5fd1: Merge "fix links on preview page" into lmp-dev

* commit 'd8d62257c3f7e2233792ce369e14de4214b7887b':
  fix links on preview page

9 years agoam f51cc58c: am dfcdfbd6: am f19f6397: Merge "edits to the lollipop highlights" into...
smain@google.com [Fri, 17 Oct 2014 19:00:30 +0000 (19:00 +0000)]
am f51cc58c: am dfcdfbd6: am f19f6397: Merge "edits to the lollipop highlights" into lmp-dev

* commit 'f51cc58c09efe79dd2152297f376c3dab0c321df':
  edits to the lollipop highlights

9 years agoam 702cb3b2: am 7314b607: am e7cc9e80: Merge "docs: Android TV docs fixes for L SDK...
Joe Fernandez [Fri, 17 Oct 2014 19:00:26 +0000 (19:00 +0000)]
am 702cb3b2: am 7314b607: am e7cc9e80: Merge "docs: Android TV docs fixes for L SDK release" into lmp-dev

* commit '702cb3b2f6b6d0eca9f8d40dc94142fcc6b53a35':
  docs: Android TV docs fixes for L SDK release

9 years agoam 0f6eb938: am d9b48e94: am 4561be01: Merge "add TV quality page to Develop landing...
smain@google.com [Fri, 17 Oct 2014 19:00:22 +0000 (19:00 +0000)]
am 0f6eb938: am d9b48e94: am 4561be01: Merge "add TV quality page to Develop landing carousel" into lmp-dev

* commit '0f6eb938937996bcd6e3f889da5d03859df5f0e8':
  add TV quality page to Develop landing carousel

9 years agoam 5100b72c: am fafb6c70: am dd886683: docs: Notifications changes for L
Scott Rowe [Fri, 17 Oct 2014 19:00:17 +0000 (19:00 +0000)]
am 5100b72c: am fafb6c70: am dd886683: docs: Notifications changes for L

* commit '5100b72cba49b0371ccead241e18420ebf8c3ee9':
  docs: Notifications changes for L

9 years agoam 5f13e2f0: am f8d6891c: am 4deed3ec: Merge "docs: Android TV App Quality Requiremen...
Joe Fernandez [Fri, 17 Oct 2014 19:00:12 +0000 (19:00 +0000)]
am 5f13e2f0: am f8d6891c: am 4deed3ec: Merge "docs: Android TV App Quality Requirements v2" into lmp-dev

* commit '5f13e2f0fb56976351d0decb314a9cac85e8d1ba':
  docs: Android TV App Quality Requirements v2

9 years agoam c371b0af: am 583cf69c: am 6bd081ca: docs: Displaying a Now Playing Card
Scott Rowe [Fri, 17 Oct 2014 19:00:08 +0000 (19:00 +0000)]
am c371b0af: am 583cf69c: am 6bd081ca: docs: Displaying a Now Playing Card

* commit 'c371b0afab75759a6c9bed9d0754aefe5cb4065b':
  docs: Displaying a Now Playing Card

9 years agoam 39f69b79: am 770f57e0: am 321e7645: Merge "docs: Recents screen for tasks and...
Joe Fernandez [Fri, 17 Oct 2014 19:00:03 +0000 (19:00 +0000)]
am 39f69b79: am 770f57e0: am 321e7645: Merge "docs: Recents screen for tasks and activities" into lmp-dev

* commit '39f69b7984591b57d560ffb0c3e147121543b7fd':
  docs: Recents screen for tasks and activities

9 years agoam 53805450: am 4a0f162d: am c6400892: Merge "add Lollipop highlights and revision...
smain@google.com [Fri, 17 Oct 2014 18:59:56 +0000 (18:59 +0000)]
am 53805450: am 4a0f162d: am c6400892: Merge "add Lollipop highlights and revision to 5.0 API overview intro" into lmp-dev

* commit '5380545023a7c7cbf690c732c3edab6d140d32fa':
  add Lollipop highlights and revision to 5.0 API overview intro

9 years agoam 36d13e6a: am 491fa057: am d664dc93: Merge "Android 5.0 changes to IME switching...
Joe Fernandez [Fri, 17 Oct 2014 18:59:51 +0000 (18:59 +0000)]
am 36d13e6a: am 491fa057: am d664dc93: Merge "Android 5.0 changes to IME switching" into lmp-dev

* commit '36d13e6ae8ccef31fde01118fd457f13f10d288f':
  Android 5.0 changes to IME switching

9 years agoam b07f08f1: am be097523: am c49acf02: Merge "docs: Update Android TV home for L...
Joe Fernandez [Fri, 17 Oct 2014 18:59:46 +0000 (18:59 +0000)]
am b07f08f1: am be097523: am c49acf02: Merge "docs:  Update Android TV home for L announcement" into lmp-dev

* commit 'b07f08f13751ae68e03501795d8f448c306a6180':
  docs:  Update Android TV home for L announcement

9 years agoam 9ce4e565: am 4e5ebb99: am c2a556ff: Merge "Notificiations Design for Android L...
David Friedman [Fri, 17 Oct 2014 18:59:42 +0000 (18:59 +0000)]
am 9ce4e565: am 4e5ebb99: am c2a556ff: Merge "Notificiations Design for Android L Release" into lmp-dev

* commit '9ce4e565204c0d8828a05928be8f8177031dc52d':
  Notificiations Design for Android L Release

9 years agoam 30be8be4: am 981c97ec: am 597d3861: Merge "NDK-r10c release notes (change log...
David Friedman [Fri, 17 Oct 2014 18:59:37 +0000 (18:59 +0000)]
am 30be8be4: am 981c97ec: am 597d3861: Merge "NDK-r10c release notes (change log) for publication to NDK page on DAC." into lmp-dev

* commit '30be8be4d4fd42a245aa481d4abf3ae299e9e17e':
  NDK-r10c release notes (change log) for publication to NDK page on DAC.

9 years agoam fd756b9f: am 238b4795: am 271078f5: update L preview landing page for 5.0 SDK...
smain@google.com [Fri, 17 Oct 2014 18:59:32 +0000 (18:59 +0000)]
am fd756b9f: am 238b4795: am 271078f5: update L preview landing page for 5.0 SDK launch includes new system images also update the DAC homepage announcement

* commit 'fd756b9ffdcd6a354878a885cce21c9ab2dfc7c4':
  update L preview landing page for 5.0 SDK launch includes new system images also update the DAC homepage announcement

9 years agoam c1c31327: am f1425001: am 2e57c2c9: Merge "docs: Migrating material design info...
Ricardo Cervera [Fri, 17 Oct 2014 18:59:22 +0000 (18:59 +0000)]
am c1c31327: am f1425001: am 2e57c2c9: Merge "docs: Migrating material design info from the Preview site" into lmp-dev

* commit 'c1c3132774a9a87e1a6dd625d6a284939652cc38':
  docs: Migrating material design info from the Preview site

9 years agoam b14e07e3: am 0fae717e: am 67b5c8eb: Merge "docs: Updates to Android 5.0 API Overvi...
Quddus Chong [Fri, 17 Oct 2014 18:59:16 +0000 (18:59 +0000)]
am b14e07e3: am 0fae717e: am 67b5c8eb: Merge "docs: Updates to Android 5.0 API Overview." into lmp-dev

* commit 'b14e07e34428e64d9a9525ea0322aa161b05efe6':
  docs: Updates to Android 5.0 API Overview.

9 years agoam af8de90f: Merge "fix 1% mystery bug on preview image downloads. just remove the...
smain@google.com [Fri, 17 Oct 2014 18:56:06 +0000 (18:56 +0000)]
am af8de90f: Merge "fix 1% mystery bug on preview image downloads. just remove the hashchange listener; no more back-navigation, eh." into lmp-dev

* commit 'af8de90fd604d3a677947e72b0000bd1075c3665':
  fix 1% mystery bug on preview image downloads. just remove the hashchange listener; no more back-navigation, eh.