git.osdn.net Git - android-x86/frameworks-base.git/log

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

commit | commitdiff | tree

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.

commit | commitdiff | tree

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.

commit | commitdiff | tree

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.

commit | commitdiff | tree

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

commit | commitdiff | tree

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.

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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.

commit | commitdiff | tree

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

am a6b7c5a7: am 4142d9b0: am 7d96dc6d: Merge "Fix getStorageEncryptionStatus() in DevicePolicyManager" into lmp-dev

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

commit | commitdiff | tree

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.

commit | commitdiff | tree

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.

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

am 5100b72c: am fafb6c70: am dd886683: docs: Notifications changes for L

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

commit | commitdiff | tree

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

am c371b0af: am 583cf69c: am 6bd081ca: docs: Displaying a Now Playing Card

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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.

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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.

commit | commitdiff | tree

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.

commit | commitdiff | tree

Amith Yamasani [Fri, 17 Oct 2014 18:55:57 +0000 (18:55 +0000)]

Merge "Use the correct method to check if device is encrypted" into lmp-dev

commit | commitdiff | tree

Quddus Chong [Fri, 17 Oct 2014 18:53:57 +0000 (18:53 +0000)]

am fdb2d1f8: am c598a4a4: Merge "docs: Fixed sound and vibration section in Android 5.0 API overview." into lmp-dev

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

commit | commitdiff | tree

Dianne Hackborn [Fri, 17 Oct 2014 18:53:37 +0000 (18:53 +0000)]

am bab9b48e: am 52476989: Merge "SDK only: hide the old L API version constant." into lmp-dev

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

commit | commitdiff | tree

smain@google.com [Fri, 17 Oct 2014 18:53:30 +0000 (18:53 +0000)]

am a1012fb5: am fe511970: Merge "edits to the Lollipop highlights" into lmp-dev

* commit 'a1012fb5ad6fa07fccf5b9c791bd77579720c857':
edits to the Lollipop highlights

commit | commitdiff | tree

Vince Harron [Fri, 17 Oct 2014 18:53:22 +0000 (18:53 +0000)]

am 9d141d1d: am 6da9e548: Merge "Updated Android SDK/Studio system requirements" into lmp-dev

* commit '9d141d1d4c4fd33eb7013b2739bd2421620648ab':
Updated Android SDK/Studio system requirements

commit | commitdiff | tree

Quddus Chong [Fri, 17 Oct 2014 18:53:18 +0000 (18:53 +0000)]

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 '7f83b4a7b037b9ccc93cda95a9855a976382907a':
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.

commit | commitdiff | tree

Trevor Johns [Fri, 17 Oct 2014 18:53:14 +0000 (18:53 +0000)]

am 6e028eba: am ac21dbb4: Docs: Update "What\'s New" for L Final Preview samples

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

am 4142d9b0: am 7d96dc6d: Merge "Fix getStorageEncryptionStatus() in DevicePolicyManager" into lmp-dev

* commit '4142d9b01d6485afddf7567f1da9959361d6a687':
Fix getStorageEncryptionStatus() in DevicePolicyManager

commit | commitdiff | tree

Dirk Dougherty [Fri, 17 Oct 2014 18:52:57 +0000 (18:52 +0000)]

am f0c1af8e: am 22fa76da: Merge "Doc change: Add Lollipop to platform versions table." into lmp-dev

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

commit | commitdiff | tree

smain@google.com [Fri, 17 Oct 2014 18:52:54 +0000 (18:52 +0000)]

am 5957b633: am c8cef6cc: Merge "time to forget about honeycomb and gingerbread." into lmp-dev

* commit '5957b6339621d1c84669581bf6a9f68f3d9fbd95':
time to forget about honeycomb and gingerbread.

commit | commitdiff | tree

smain@google.com [Fri, 17 Oct 2014 18:52:50 +0000 (18:52 +0000)]

am 2ff9be11: am 8adb5fd1: Merge "fix links on preview page" into lmp-dev

* commit '2ff9be116ff6e6ffea33cfae21921d34d66b7f72':
fix links on preview page

commit | commitdiff | tree

smain@google.com [Fri, 17 Oct 2014 18:52:46 +0000 (18:52 +0000)]

am dfcdfbd6: am f19f6397: Merge "edits to the lollipop highlights" into lmp-dev

* commit 'dfcdfbd64acc4d2135b28eb3d61d2a174748e55d':
edits to the lollipop highlights

commit | commitdiff | tree

Joe Fernandez [Fri, 17 Oct 2014 18:52:42 +0000 (18:52 +0000)]

am 7314b607: am e7cc9e80: Merge "docs: Android TV docs fixes for L SDK release" into lmp-dev

* commit '7314b6076ecef1b79f205016544268ffd38112f3':
docs: Android TV docs fixes for L SDK release

commit | commitdiff | tree

smain@google.com [Fri, 17 Oct 2014 18:52:21 +0000 (18:52 +0000)]

am d9b48e94: am 4561be01: Merge "add TV quality page to Develop landing carousel" into lmp-dev

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

am fafb6c70: am dd886683: docs: Notifications changes for L

* commit 'fafb6c708096d809ce6b8b57ac8c2293698cdf6a':
docs: Notifications changes for L

commit | commitdiff | tree

Joe Fernandez [Fri, 17 Oct 2014 18:52:13 +0000 (18:52 +0000)]

am f8d6891c: am 4deed3ec: Merge "docs: Android TV App Quality Requirements v2" into lmp-dev

* commit 'f8d6891c69d9ef716f1e7f4df206522cf6356e00':
docs: Android TV App Quality Requirements v2

am 583cf69c: am 6bd081ca: docs: Displaying a Now Playing Card

* commit '583cf69c00326a1d67d5ca8c8a0d9597ec50aa93':
docs: Displaying a Now Playing Card

commit | commitdiff | tree

Joe Fernandez [Fri, 17 Oct 2014 18:52:04 +0000 (18:52 +0000)]

am 770f57e0: am 321e7645: Merge "docs: Recents screen for tasks and activities" into lmp-dev

* commit '770f57e06837c8d2b7e42776b569b568d2360057':
docs: Recents screen for tasks and activities

commit | commitdiff | tree

smain@google.com [Fri, 17 Oct 2014 18:52:00 +0000 (18:52 +0000)]

am 4a0f162d: am c6400892: Merge "add Lollipop highlights and revision to 5.0 API overview intro" into lmp-dev

* commit '4a0f162df7ca0079b25b61cd4734340cbe5de7f4':
add Lollipop highlights and revision to 5.0 API overview intro

commit | commitdiff | tree

Joe Fernandez [Fri, 17 Oct 2014 18:51:56 +0000 (18:51 +0000)]

am 491fa057: am d664dc93: Merge "Android 5.0 changes to IME switching" into lmp-dev

* commit '491fa0570def75b1e056dc1c0954f07d2b524a7f':
Android 5.0 changes to IME switching

commit | commitdiff | tree

Joe Fernandez [Fri, 17 Oct 2014 18:51:52 +0000 (18:51 +0000)]

am be097523: am c49acf02: Merge "docs: Update Android TV home for L announcement" into lmp-dev

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

commit | commitdiff | tree

David Friedman [Fri, 17 Oct 2014 18:51:47 +0000 (18:51 +0000)]

am 4e5ebb99: am c2a556ff: Merge "Notificiations Design for Android L Release" into lmp-dev

* commit '4e5ebb994a7d96c86f598c499956f04a1256e6a7':
Notificiations Design for Android L Release

commit | commitdiff | tree

David Friedman [Fri, 17 Oct 2014 18:51:43 +0000 (18:51 +0000)]

am 981c97ec: am 597d3861: Merge "NDK-r10c release notes (change log) for publication to NDK page on DAC." into lmp-dev

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

commit | commitdiff | tree

smain@google.com [Fri, 17 Oct 2014 18:51:39 +0000 (18:51 +0000)]

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 '238b4795468bf8ab93ab7c50b9855e8e84d2f49d':
update L preview landing page for 5.0 SDK launch includes new system images also update the DAC homepage announcement

commit | commitdiff | tree

Ricardo Cervera [Fri, 17 Oct 2014 18:51:23 +0000 (18:51 +0000)]

am f1425001: am 2e57c2c9: Merge "docs: Migrating material design info from the Preview site" into lmp-dev

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

commit | commitdiff | tree

Quddus Chong [Fri, 17 Oct 2014 18:51:18 +0000 (18:51 +0000)]

am 0fae717e: am 67b5c8eb: Merge "docs: Updates to Android 5.0 API Overview." into lmp-dev

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

commit | commitdiff | tree

Alan Viverette [Fri, 17 Oct 2014 18:50:41 +0000 (18:50 +0000)]

am 721fc2ad: Fix build

* commit '721fc2adf4d4d5b890b12cb2067db10e78888aba':
Fix build

commit | commitdiff | tree

smain@google.com [Fri, 17 Oct 2014 18:47:11 +0000 (18:47 +0000)]

Merge "fix 1% mystery bug on preview image downloads. just remove the hashchange listener; no more back-navigation, eh." into lmp-dev

commit | commitdiff | tree

smain@google.com [Fri, 17 Oct 2014 18:45:33 +0000 (11:45 -0700)]

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

Change-Id: I6c822336f33448d9ce01e710fbea2ab134fb8718

commit | commitdiff | tree

Amith Yamasani [Fri, 17 Oct 2014 18:16:58 +0000 (11:16 -0700)]

Use the correct method to check if device is encrypted

DPM's method will return false if encrypted by default password,
preventing the changing of encryption password to lockscreen password.

Check if the device is encrypted by some means, instead.

Also fix a SecurityException when Device Admin queries encryption state
(recent regression)

Bug: 17881324
Change-Id: Id897e61c5e254ab3f8dc569285428a73005303ea

commit | commitdiff | tree

Quddus Chong [Fri, 17 Oct 2014 18:37:29 +0000 (18:37 +0000)]

am c598a4a4: Merge "docs: Fixed sound and vibration section in Android 5.0 API overview." into lmp-dev

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

commit | commitdiff | tree

Alan Viverette [Fri, 17 Oct 2014 18:36:38 +0000 (11:36 -0700)]

Fix build

Change-Id: Idd7ae84c0d128bd40f0e7a83882e4ed4181e8a4d

commit | commitdiff | tree

Quddus Chong [Fri, 17 Oct 2014 18:32:01 +0000 (18:32 +0000)]

Merge "docs: Fixed sound and vibration section in Android 5.0 API overview." into lmp-dev

commit | commitdiff | tree

Alan Viverette [Fri, 17 Oct 2014 17:23:20 +0000 (17:23 +0000)]

am 2f68a204: Merge "Check type resolution on declared methods and fields in ViewDebug" into lmp-mr1-dev

* commit '2f68a204b2299029dd492ab25bd3bcfe7216bafc':
Check type resolution on declared methods and fields in ViewDebug

commit | commitdiff | tree

Alan Viverette [Fri, 17 Oct 2014 17:18:34 +0000 (17:18 +0000)]

Merge "Check type resolution on declared methods and fields in ViewDebug" into lmp-mr1-dev

commit | commitdiff | tree

Quddus Chong [Fri, 17 Oct 2014 17:08:41 +0000 (10:08 -0700)]

docs: Fixed sound and vibration section in Android 5.0 API overview.

Change-Id: Icb5379cb1c390c011c9ca8c1d585ebcaea8f92dc

commit | commitdiff | tree

Dianne Hackborn [Fri, 17 Oct 2014 17:15:29 +0000 (17:15 +0000)]

am 686a41ef: Merge "Add API level for MR1." into lmp-mr1-dev

* commit '686a41ef2b05b3fb1c5c5f44ec6270ab317ce9d5':
Add API level for MR1.

commit | commitdiff | tree

Dianne Hackborn [Fri, 17 Oct 2014 17:15:08 +0000 (17:15 +0000)]

am 52476989: Merge "SDK only: hide the old L API version constant." into lmp-dev

* commit '52476989b8afc0e96c2218625031ed550b12c79b':
SDK only: hide the old L API version constant.

commit | commitdiff | tree

Dianne Hackborn [Fri, 17 Oct 2014 17:12:00 +0000 (17:12 +0000)]

Merge "Add API level for MR1." into lmp-mr1-dev

commit | commitdiff | tree

Dianne Hackborn [Fri, 17 Oct 2014 17:11:23 +0000 (17:11 +0000)]

Merge "SDK only: hide the old L API version constant." into lmp-dev

commit | commitdiff | tree

smain@google.com [Fri, 17 Oct 2014 16:51:51 +0000 (16:51 +0000)]

am fe511970: Merge "edits to the Lollipop highlights" into lmp-dev

* commit 'fe51197084ab70ea48a9ddf13ecc0d0afe81d0ea':
edits to the Lollipop highlights

commit | commitdiff | tree

smain@google.com [Fri, 17 Oct 2014 16:47:32 +0000 (16:47 +0000)]

Merge "edits to the Lollipop highlights" into lmp-dev

commit | commitdiff | tree

John Spurlock [Fri, 17 Oct 2014 16:43:42 +0000 (16:43 +0000)]

am 6daac003: Merge "PowerUI: Uncategorize battery notifications as _SYSTEM." into lmp-mr1-dev

* commit '6daac00331fa79d8ab249ef148a8116e58ca9a56':
PowerUI: Uncategorize battery notifications as _SYSTEM.

commit | commitdiff | tree

smain@google.com [Fri, 17 Oct 2014 16:25:24 +0000 (09:25 -0700)]

edits to the Lollipop highlights

Change-Id: I1702946aca8c30528488465be422a9b68a9ae049

commit | commitdiff | tree

John Spurlock [Fri, 17 Oct 2014 16:39:19 +0000 (16:39 +0000)]

Merge "PowerUI: Uncategorize battery notifications as _SYSTEM." into lmp-mr1-dev

commit | commitdiff | tree

John Spurlock [Fri, 17 Oct 2014 16:20:48 +0000 (16:20 +0000)]

am 289d797a: QS: 7 day timeout for color-inversion tile.

* commit '289d797a6a748cfc7dcca8c815fab6c37061bf05':
QS: 7 day timeout for color-inversion tile.

commit | commitdiff | tree

John Spurlock [Fri, 17 Oct 2014 16:16:57 +0000 (12:16 -0400)]

PowerUI: Uncategorize battery notifications as _SYSTEM.

So they don't interrupt in priority mode.

Bug: 17691121
Change-Id: I51757c0275ec461a786d1e254b0e71f7b27b5029

commit | commitdiff | tree

Vince Harron [Fri, 17 Oct 2014 16:14:35 +0000 (16:14 +0000)]

am 6da9e548: Merge "Updated Android SDK/Studio system requirements" into lmp-dev

* commit '6da9e5481aa78fa3541f0546f237049f9d8e3b81':
Updated Android SDK/Studio system requirements

commit | commitdiff | tree

Vince Harron [Fri, 17 Oct 2014 16:12:05 +0000 (16:12 +0000)]

Merge "Updated Android SDK/Studio system requirements" into lmp-dev

commit | commitdiff | tree

Quddus Chong [Fri, 17 Oct 2014 16:10:02 +0000 (16:10 +0000)]

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 '15d2e768d67b23fc374895dac8024d40598ffc72':
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.

commit | commitdiff | tree

Trevor Johns [Fri, 17 Oct 2014 16:09:58 +0000 (16:09 +0000)]

am ac21dbb4: Docs: Update "What\'s New" for L Final Preview samples

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

commit | commitdiff | tree

Quddus Chong [Fri, 17 Oct 2014 16:08:43 +0000 (16:08 +0000)]

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 | commitdiff | tree

John Spurlock [Fri, 17 Oct 2014 16:06:38 +0000 (12:06 -0400)]

QS: 7 day timeout for color-inversion tile.

Bug: 17631628
Change-Id: I4f8a6ce3ea1f79d696686760732c3e8216bfb6c4

commit | commitdiff | tree

Trevor Johns [Fri, 17 Oct 2014 16:00:38 +0000 (09:00 -0700)]

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

Change-Id: Idc414ffa3b391212136601bd0f65dbcab07efe1e

commit | commitdiff | tree

Quddus Chong [Fri, 17 Oct 2014 15:29:30 +0000 (08:29 -0700)]

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.

Change-Id: I9a7be4529f757417a62ca376df39bf01309e1e69

am 7d96dc6d: Merge "Fix getStorageEncryptionStatus() in DevicePolicyManager" into lmp-dev

* commit '7d96dc6d98774ff9b7cf1370f9a5508c4eac6a85':
Fix getStorageEncryptionStatus() in DevicePolicyManager

Merge "Fix getStorageEncryptionStatus() in DevicePolicyManager" into lmp-dev

commit | commitdiff | tree

Dirk Dougherty [Fri, 17 Oct 2014 09:25:33 +0000 (09:25 +0000)]

am 22fa76da: Merge "Doc change: Add Lollipop to platform versions table." into lmp-dev

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

commit | commitdiff | tree

Dirk Dougherty [Fri, 17 Oct 2014 09:21:28 +0000 (09:21 +0000)]

Merge "Doc change: Add Lollipop to platform versions table." into lmp-dev

commit | commitdiff | tree

Dirk Dougherty [Fri, 17 Oct 2014 09:16:58 +0000 (02:16 -0700)]

Doc change: Add Lollipop to platform versions table.

Change-Id: Iad84444396a3b2d24403e88398ca21933741b819

commit | commitdiff | tree

smain@google.com [Fri, 17 Oct 2014 09:15:23 +0000 (09:15 +0000)]

am c8cef6cc: Merge "time to forget about honeycomb and gingerbread." into lmp-dev

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

commit | commitdiff | tree

smain@google.com [Fri, 17 Oct 2014 09:15:20 +0000 (09:15 +0000)]

am 8adb5fd1: Merge "fix links on preview page" into lmp-dev

* commit '8adb5fd14dae51faeb5b85b8cbcfc0930094e73f':
fix links on preview page

commit | commitdiff | tree

smain@google.com [Fri, 17 Oct 2014 09:15:17 +0000 (09:15 +0000)]

am f19f6397: Merge "edits to the lollipop highlights" into lmp-dev

* commit 'f19f639773e64289ed7345b8a1ea4dd244aa4882':
edits to the lollipop highlights

commit | commitdiff | tree

smain@google.com [Fri, 17 Oct 2014 08:37:15 +0000 (08:37 +0000)]

Merge "time to forget about honeycomb and gingerbread." into lmp-dev

commit | commitdiff | tree

smain@google.com [Fri, 17 Oct 2014 08:35:12 +0000 (01:35 -0700)]

time to forget about honeycomb and gingerbread.

Change-Id: I74a1a62109f28b6ed08acee4761e25bfe8278257

commit | commitdiff | tree

smain@google.com [Fri, 17 Oct 2014 08:32:19 +0000 (08:32 +0000)]

Merge "fix links on preview page" into lmp-dev

commit | commitdiff | tree

smain@google.com [Fri, 17 Oct 2014 08:31:24 +0000 (01:31 -0700)]

fix links on preview page

Change-Id: If2c3380dcb3ecc2770ba84fd6599ba69ea0a33f2

commit | commitdiff | tree

smain@google.com [Fri, 17 Oct 2014 08:18:46 +0000 (08:18 +0000)]

Merge "edits to the lollipop highlights" into lmp-dev

commit | commitdiff | tree

smain@google.com [Fri, 17 Oct 2014 08:06:37 +0000 (01:06 -0700)]